Merge pull request ethereum-optimism#4696 from ethereum-optimism/fix/…

…wait-tasks contracts-bedrock: fix migration tasks
runmyself · Jan 17, 2023 · f04170e · f04170e
2 parents d8e328a + d0ec9af
commit f04170e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/packages/contracts-bedrock/tasks/wait-for-final-batch.ts b/packages/contracts-bedrock/tasks/wait-for-final-batch.ts
@@ -48,26 +48,31 @@ task('wait-for-final-batch', 'Waits for the final batch to be submitted')
     const wait = async (contract: Contract) => {
       let height = await l2Provider.getBlockNumber()
       let totalElements = await contract.getTotalElements()
-      // The genesis block was not batch submitted so subtract 1 from the height
-      // when comparing with the total elements
-      while (totalElements !== height - 1) {
+      console.log(`  - height: ${height}`)
+      console.log(`  - totalElements: ${totalElements}`)
+
+      while (totalElements.toNumber() !== height) {
         console.log('Total elements does not match')
-        console.log(`  - real height: ${height}`)
-        console.log(`  - height: ${height - 1}`)
+        console.log(`  - height: ${height}`)
         console.log(`  - totalElements: ${totalElements}`)
+        console.log(
+          `Waiting for ${height - totalElements} elements to be submitted`
+        )
         totalElements = await contract.getTotalElements()
         height = await l2Provider.getBlockNumber()
-        await sleep(2 * 1000)
+        await sleep(5 * 1000)
       }
     }
 
     console.log('Waiting for the CanonicalTransactionChain...')
     await wait(CanonicalTransactionChain)
     console.log('All transaction batches have been submitted')
+    console.log()
 
     console.log('Waiting for the StateCommitmentChain...')
     await wait(StateCommitmentChain)
     console.log('All state root batches have been submitted')
+    console.log()
 
     console.log('All batches have been submitted')
   })
diff --git a/packages/contracts-bedrock/tasks/wait-for-final-deposit.ts b/packages/contracts-bedrock/tasks/wait-for-final-deposit.ts
@@ -22,6 +22,7 @@ task('wait-for-final-deposit', 'Waits for the final deposit to be ingested')
     const l1Provider = new hre.ethers.providers.StaticJsonRpcProvider(
       args.l1RpcUrl
     )
+
     const l2Provider = new hre.ethers.providers.StaticJsonRpcProvider(
       args.l2RpcUrl
     )
@@ -63,6 +64,9 @@ task('wait-for-final-deposit', 'Waits for the final deposit to be ingested')
 
     console.log(`DTL shutoff block ${dtlShutoffBlock.toString()}`)
 
+    let pending = await CanonicalTransactionChain.getNumPendingQueueElements()
+    console.log(`${pending} deposits must be batch submitted`)
+
     // Now query the number of queue elements in the CTC
     const queueLength = await CanonicalTransactionChain.getQueueLength()
     console.log(`Total number of deposits: ${queueLength}`)
@@ -80,11 +84,10 @@ task('wait-for-final-deposit', 'Waits for the final deposit to be ingested')
 
       if (tx.queueOrigin === 'l1') {
         const queueIndex = BigNumber.from(tx.queueIndex).toNumber()
-        if (queueIndex === queueLength) {
+        if (queueIndex === queueLength - 1) {
           break
         }
         if (queueIndex < queueLength) {
-          console.log()
           throw new Error(
             `Missed the final deposit. queueIndex ${queueIndex}, queueLength ${queueLength}`
           )
@@ -94,4 +97,6 @@ task('wait-for-final-deposit', 'Waits for the final deposit to be ingested')
     }
 
     console.log('Final deposit has been ingested by l2geth')
+    pending = await CanonicalTransactionChain.getNumPendingQueueElements()
+    console.log(`${pending} deposits must be batch submitted`)
   })