Set of batch submitter fixes

packages/batch-submitter/src/batch-submitter/batch-submitter.ts

@@ -138,10 +138,10 @@ export abstract class BatchSubmitter {
       await getContractFactory('Lib_AddressManager', this.signer)
     ).attach(this.addressManagerAddress)
     const sccAddress = await addressManager.getAddress(
-      'OVM_StateCommitmentChain'
+      'StateCommitmentChain'
     )
     const ctcAddress = await addressManager.getAddress(
-      'OVM_CanonicalTransactionChain'
+      'CanonicalTransactionChain'
     )
     return {
       ctcAddress,

packages/batch-submitter/src/batch-submitter/tx-batch-submitter.ts

@@ -573,12 +573,12 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
     )
 
     const addr = await manager.getAddress(
-      'OVM_ChainStorageContainer-CTC-batches'
+      'ChainStorageContainer-CTC-batches'
     )
 
     const container = new Contract(
       addr,
-      getNewContractInterface('iOVM_ChainStorageContainer'),
+      getNewContractInterface('IChainStorageContainer'),
       this.signer.provider
     )
 

packages/batch-submitter/test/batch-submitter/batch-submitter.spec.ts

@@ -142,11 +142,13 @@ describe('BatchSubmitter', () => {
       'OVM_CanonicalTransactionChain'
     )
 
+    Factory__OVM_CanonicalTransactionChain = Factory__OVM_CanonicalTransactionChain.connect(signer)
+
     Factory__OVM_StateCommitmentChain = await getContractFactory(
       'OVM_StateCommitmentChain'
     )
 
-    Factory__StateCommitmentChain = Factory__StateCommitmentChain.connect(signer)
+    Factory__OVM_StateCommitmentChain = Factory__OVM_StateCommitmentChain.connect(signer)
   })
 
   let OVM_CanonicalTransactionChain: CanonicalTransactionChainContract
@@ -158,16 +160,17 @@ describe('BatchSubmitter', () => {
         AddressManager.address,
         FORCE_INCLUSION_PERIOD_SECONDS
       )
+
     await unwrapped_OVM_CanonicalTransactionChain.init()
 
     await AddressManager.setAddress(
-      'OVM_CanonicalTransactionChain',
+      'CanonicalTransactionChain',
       unwrapped_OVM_CanonicalTransactionChain.address
     )
 
     OVM_CanonicalTransactionChain = new CanonicalTransactionChainContract(
       unwrapped_OVM_CanonicalTransactionChain.address,
-      getContractInterface('OVM_CanonicalTransactionChain'),
+      getContractInterface('CanonicalTransactionChain'),
       sequencer
     )
 
@@ -181,13 +184,13 @@ describe('BatchSubmitter', () => {
     await unwrapped_OVM_StateCommitmentChain.init()
 
     await AddressManager.setAddress(
-      'OVM_StateCommitmentChain',
+      'StateCommitmentChain',
       unwrapped_OVM_StateCommitmentChain.address
     )
 
     OVM_StateCommitmentChain = new Contract(
       unwrapped_OVM_StateCommitmentChain.address,
-      getContractInterface('OVM_StateCommitmentChain'),
+      getContractInterface('StateCommitmentChain'),
       sequencer
     )