Merge branch 'develop' into clabby/op-node/system-config-cleanup

.changeset/tough-avocados-dance.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Added a test for large deposit gaps

ops/docker/ci-builder/CHANGELOG.md

 # @eth-optimism/ci-builder
 
+## 0.4.0
+
+### Minor Changes
+
+- 05cc935b2: Bump foundry to 2ff99025abade470a795724c10648c800a41025e
+
 ## 0.3.8
 
 ### Patch Changes

ops/docker/ci-builder/Dockerfile

@@ -16,7 +16,7 @@ WORKDIR /opt/foundry
 # Only diff from upstream docker image is this clone instead
 # of COPY. We select a specific commit to use.
 RUN git clone https://github.com/foundry-rs/foundry.git . \
-    && git checkout c06b53287dc23c4e5b1b3e57c937a90114bbe166
+    && git checkout 2ff99025abade470a795724c10648c800a41025e
 
 RUN source $HOME/.profile && \
     cargo build --release && \

ops/docker/ci-builder/package.json

 {
   "name": "@eth-optimism/ci-builder",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "scripts": {},
   "license": "MIT",
   "dependencies": {}

ops/docker/foundry/CHANGELOG.md

 # @eth-optimism/foundry
 
+## 0.2.0
+
+### Minor Changes
+
+- 05cc935b2: Bump foundry to 2ff99025abade470a795724c10648c800a41025e
+
 ## 0.1.3
 
 ### Patch Changes

ops/docker/foundry/Dockerfile

@@ -9,7 +9,7 @@ WORKDIR /opt/foundry
 # Only diff from upstream docker image is this clone instead
 # of COPY. We select a specific commit to use.
 RUN git clone https://github.com/foundry-rs/foundry.git . \
-    && git checkout f540aa9ebde88dce720140b332412089c2ee85b6
+    && git checkout 2ff99025abade470a795724c10648c800a41025e
 
 RUN source $HOME/.profile && cargo build --release \
     && strip /opt/foundry/target/release/forge \

ops/docker/foundry/package.json

 {
   "name": "@eth-optimism/foundry",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "scripts": {},
   "license": "MIT",
   "dependencies": {}

packages/contracts-bedrock/.gas-snapshot

@@ -368,14 +368,14 @@ RLPWriter_Test:test_writeUint_smallint3_succeeds() (gas: 7311)
 RLPWriter_Test:test_writeUint_smallint4_succeeds() (gas: 7312)
 RLPWriter_Test:test_writeUint_smallint_succeeds() (gas: 7290)
 RLPWriter_Test:test_writeUint_zero_succeeds() (gas: 7802)
-ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 8965)
-ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas: 2008101)
-ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18152)
-ResourceMetering_Test:test_meter_updateParamsNoChange_succeeds() (gas: 13911)
-ResourceMetering_Test:test_meter_updateTenEmptyBlocks_succeeds() (gas: 20900)
-ResourceMetering_Test:test_meter_updateTwoEmptyBlocks_succeeds() (gas: 20923)
-ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 8017204)
-ResourceMetering_Test:test_meter_useMoreThanMax_reverts() (gas: 16023)
+ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 8983)
+ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas: 2008119)
+ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18148)
+ResourceMetering_Test:test_meter_updateParamsNoChange_succeeds() (gas: 13859)
+ResourceMetering_Test:test_meter_updateTenEmptyBlocks_succeeds() (gas: 20918)
+ResourceMetering_Test:test_meter_updateTwoEmptyBlocks_succeeds() (gas: 20941)
+ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 8017151)
+ResourceMetering_Test:test_meter_useMoreThanMax_reverts() (gas: 16045)
 Semver_Test:test_behindProxy_succeeds() (gas: 506725)
 Semver_Test:test_version_succeeds() (gas: 9396)
 SequencerFeeVault_Test:test_constructor_succeeds() (gas: 5504)

packages/contracts-bedrock/README.md

@@ -57,7 +57,7 @@ We work on this repository with a combination of [Hardhat](https://hardhat.org)
 1. Install Foundry by following [the instructions located here](https://getfoundry.sh/).
    A specific version must be used.
    ```shell
-   foundryup -C c06b53287dc23c4e5b1b3e57c937a90114bbe166
+   foundryup -C 2ff99025abade470a795724c10648c800a41025e
    ```
 2. Install node modules with yarn (v1) and Node.js (16+):
 

packages/contracts-bedrock/contracts/test/ResourceMetering.t.sol

@@ -108,4 +108,18 @@ contract ResourceMetering_Test is CommonTest {
         vm.expectRevert("ResourceMetering: cannot buy more gas than available gas limit");
         meter.use(target * elasticity + 1);
     }
+
+    // Demonstrates that the resource metering arithmetic can tolerate very large gaps between
+    // deposits.
+    function testFuzz_meter_largeBlockDiff_succeeds(uint64 _amount, uint256 _blockDiff) external {
+        // This test fails if the following line is commented out.
+        // At 12 seconds per block, this number is effectively unreachable.
+        vm.assume(_blockDiff < 433576281058164217753225238677900874458691);
+
+        uint64 target = uint64(uint256(meter.TARGET_RESOURCE_LIMIT()));
+        uint64 elasticity = uint64(uint256(meter.ELASTICITY_MULTIPLIER()));
+        vm.assume(_amount < target * elasticity);
+        vm.roll(initialBlockNum + _blockDiff);
+        meter.use(_amount);
+    }
 }

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')
   })

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`)
   })

packages/data-transport-layer/CHANGELOG.md

 # data transport layer
 
+## 0.5.51
+
+### Patch Changes
+
+- 4396e187d: Fixes a bug in the DTL that would cause it to not be able to sync beyond the deposit shutoff block.
+
 ## 0.5.50
 
 ### Patch Changes

packages/data-transport-layer/package.json

 {
   "private": true,
   "name": "@eth-optimism/data-transport-layer",
-  "version": "0.5.50",
+  "version": "0.5.51",
   "description": "[Optimism] Service for shuttling data from L1 into L2",
   "main": "dist/index",
   "types": "dist/index",

packages/data-transport-layer/src/services/l1-ingestion/service.ts

@@ -268,16 +268,16 @@ export class L1IngestionService extends BaseService<L1IngestionServiceOptions> {
           )
         }
 
-        // I prefer to do this in serial to avoid non-determinism. We could have a discussion about
-        // using Promise.all if necessary, but I don't see a good reason to do so unless parsing is
-        // really, really slow for all event types.
-        await this._syncEvents(
-          'CanonicalTransactionChain',
-          'TransactionEnqueued',
-          highestSyncedL1Block,
-          depositTargetL1Block,
-          handleEventsTransactionEnqueued
-        )
+        // We should not sync TransactionEnqueued events beyond the deposit shutoff block.
+        if (depositTargetL1Block >= highestSyncedL1Block) {
+          await this._syncEvents(
+            'CanonicalTransactionChain',
+            'TransactionEnqueued',
+            highestSyncedL1Block,
+            depositTargetL1Block,
+            handleEventsTransactionEnqueued
+          )
+        }
 
         await this._syncEvents(
           'CanonicalTransactionChain',