Merge branch 'develop' into clabby/ctb/fee-vault-gas-hike

.changeset/fifty-schools-think.md

----
-'@eth-optimism/ci-builder': patch
----
-
-Bump foundry to edf15abd648bb96e2bcee342c1d72ec7d1066cd1

.changeset/pretty-pants-beam.md

----
-"@eth-optimism/indexer": patch
----
-
-build(deps): bump golang.org/x/text from 0.3.7 to 0.3.8 in /indexer

integration-tests/package.json

@@ -30,10 +30,10 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.5.4",
     "@eth-optimism/contracts": "^0.5.40",
-    "@eth-optimism/contracts-bedrock": "0.12.0",
+    "@eth-optimism/contracts-bedrock": "0.12.1",
     "@eth-optimism/contracts-periphery": "^1.0.7",
     "@eth-optimism/core-utils": "0.12.0",
-    "@eth-optimism/sdk": "1.10.3",
+    "@eth-optimism/sdk": "1.10.4",
     "@ethersproject/abstract-provider": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
     "@ethersproject/transactions": "^5.7.0",

op-chain-ops/genesis/setters.go

@@ -95,14 +95,10 @@ func WipePredeployStorage(db vm.StateDB) error {
 
 		// We need to make sure that we preserve nonces.
 		oldNonce := db.GetNonce(*addr)
-		oldBalance := db.GetBalance(*addr)
 		db.CreateAccount(*addr)
 		if oldNonce > 0 {
 			db.SetNonce(*addr, oldNonce)
 		}
-		if oldBalance.Cmp(common.Big0) != 0 {
-			db.AddBalance(*addr, oldBalance)
-		}
 	}
 
 	return nil

op-chain-ops/genesis/setters_test.go

+package genesis
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/trie"
+	"github.com/stretchr/testify/require"
+)
+
+func TestWipePredeployStorage(t *testing.T) {
+	rawDB := rawdb.NewMemoryDatabase()
+	rawStateDB := state.NewDatabaseWithConfig(rawDB, &trie.Config{
+		Preimages: true,
+		Cache:     1024,
+	})
+	stateDB, err := state.New(common.Hash{}, rawStateDB, nil)
+	require.NoError(t, err)
+
+	storeVal := common.Hash{31: 0xff}
+
+	for _, addr := range predeploys.Predeploys {
+		a := *addr
+		stateDB.SetState(a, storeVal, storeVal)
+		stateDB.SetBalance(a, big.NewInt(99))
+		stateDB.SetNonce(a, 99)
+	}
+
+	root, err := stateDB.Commit(false)
+	require.NoError(t, err)
+
+	err = stateDB.Database().TrieDB().Commit(root, true)
+	require.NoError(t, err)
+
+	require.NoError(t, WipePredeployStorage(stateDB))
+
+	for _, addr := range predeploys.Predeploys {
+		a := *addr
+		if FrozenStoragePredeploys[a] {
+			require.Equal(t, storeVal, stateDB.GetState(a, storeVal))
+		} else {
+			require.Equal(t, common.Hash{}, stateDB.GetState(a, storeVal))
+		}
+		require.Equal(t, big.NewInt(99), stateDB.GetBalance(a))
+		require.Equal(t, uint64(99), stateDB.GetNonce(a))
+	}
+}

ops/docker/ci-builder/CHANGELOG.md

 # @eth-optimism/ci-builder
 
+## 0.5.0
+
+### Minor Changes
+
+- 80f2271f5: Update foundry
+
+### Patch Changes
+
+- 035391a1f: Bump foundry to edf15abd648bb96e2bcee342c1d72ec7d1066cd1
+
 ## 0.4.0
 
 ### Minor 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 edf15abd648bb96e2bcee342c1d72ec7d1066cd1
+    && git checkout 8f3fca9c608d58981daaffe11e7f8076644cb753
 
 RUN source $HOME/.profile && \
     cargo build --release && \

ops/docker/ci-builder/package.json

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

packages/actor-tests/CHANGELOG.md

 # @eth-optimism/actor-tests
 
+## 0.0.21
+
+### Patch Changes
+
+- Updated dependencies [80f2271f5]
+  - @eth-optimism/contracts-bedrock@0.12.1
+  - @eth-optimism/sdk@1.10.4
+
 ## 0.0.20
 
 ### Patch Changes

packages/actor-tests/package.json

 {
   "name": "@eth-optimism/actor-tests",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "A library and suite of tests to stress test Optimism Bedrock.",
   "license": "MIT",
   "author": "",
@@ -18,9 +18,9 @@
     "test:coverage": "yarn test"
   },
   "dependencies": {
-    "@eth-optimism/contracts-bedrock": "0.12.0",
+    "@eth-optimism/contracts-bedrock": "0.12.1",
     "@eth-optimism/core-utils": "^0.12.0",
-    "@eth-optimism/sdk": "^1.10.3",
+    "@eth-optimism/sdk": "^1.10.4",
     "@types/chai": "^4.2.18",
     "@types/chai-as-promised": "^7.1.4",
     "async-mutex": "^0.3.2",

packages/chain-mon/CHANGELOG.md

 # @eth-optimism/drippie-mon
 
+## 0.1.3
+
+### Patch Changes
+
+- @eth-optimism/sdk@1.10.4
+
 ## 0.1.2
 
 ### Patch Changes

packages/chain-mon/package.json

 {
   "private": true,
   "name": "@eth-optimism/chain-mon",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "[Optimism] Chain monitoring services",
   "main": "dist/index",
   "types": "dist/index",
@@ -35,7 +35,7 @@
     "@eth-optimism/common-ts": "0.8.0",
     "@eth-optimism/contracts-periphery": "1.0.7",
     "@eth-optimism/core-utils": "0.12.0",
-    "@eth-optimism/sdk": "1.10.3",
+    "@eth-optimism/sdk": "1.10.4",
     "ethers": "^5.7.0",
     "@types/dateformat": "^5.0.0",
     "chai-as-promised": "^7.1.1",

packages/contracts-bedrock/.gas-snapshot

@@ -30,15 +30,15 @@ DeployerWhitelist_Test:test_storageSlots_succeeds() (gas: 33395)
 FeeVault_Test:test_constructor_succeeds() (gas: 10736)
 FeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 10713)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 261407)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 75936)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 76134)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348359)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 112814)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 113012)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348381)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112834)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40875)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 113032)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40409)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88535)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 75075)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36188)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36386)
 GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 169229)
 GasPriceOracle_Test:test_baseFee_succeeds() (gas: 8325)
 GasPriceOracle_Test:test_decimals_succeeds() (gas: 6167)
@@ -117,10 +117,10 @@ L1StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas:
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_incorrectValue_reverts() (gas: 34207)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_sendToMessenger_reverts() (gas: 34310)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_sendToSelf_reverts() (gas: 34279)
-L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal_succeeds() (gas: 496501)
-L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notMessenger_reverts() (gas: 31170)
-L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notOtherBridge_reverts() (gas: 31526)
-L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal_succeeds() (gas: 62188)
+L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal_succeeds() (gas: 496128)
+L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notMessenger_reverts() (gas: 31206)
+L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notOtherBridge_reverts() (gas: 31562)
+L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal_succeeds() (gas: 61722)
 L1StandardBridge_Getter_Test:test_getters_succeeds() (gas: 32173)
 L1StandardBridge_Initialize_Test:test_initialize_succeeds() (gas: 22050)
 L1StandardBridge_Receive_Test:test_receive_succeeds() (gas: 520273)
@@ -402,11 +402,11 @@ RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7280)
 RLPWriter_writeUint_Test:test_writeUint_zero_succeeds() (gas: 7749)
 ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 8983)
 ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas: 2008142)
-ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18171)
+ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18369)
 ResourceMetering_Test:test_meter_updateParamsNoChange_succeeds() (gas: 13903)
-ResourceMetering_Test:test_meter_updateTenEmptyBlocks_succeeds() (gas: 20963)
-ResourceMetering_Test:test_meter_updateTwoEmptyBlocks_succeeds() (gas: 20919)
-ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 8017218)
+ResourceMetering_Test:test_meter_updateTenEmptyBlocks_succeeds() (gas: 21161)
+ResourceMetering_Test:test_meter_updateTwoEmptyBlocks_succeeds() (gas: 21117)
+ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 8017416)
 ResourceMetering_Test:test_meter_useMoreThanMax_reverts() (gas: 16045)
 Semver_Test:test_behindProxy_succeeds() (gas: 506748)
 Semver_Test:test_version_succeeds() (gas: 9418)

packages/contracts-bedrock/CHANGELOG.md

 # @eth-optimism/contracts-bedrock
 
+## 0.12.1
+
+### Patch Changes
+
+- 80f2271f5: Update foundry
+
 ## 0.12.0
 
 ### Minor Changes

packages/contracts-bedrock/contracts/L1/L1StandardBridge.sol

@@ -107,28 +107,6 @@ contract L1StandardBridge is StandardBridge, Semver {
         _initiateETHDeposit(msg.sender, msg.sender, RECEIVE_DEFAULT_GAS_LIMIT, bytes(""));
     }
 
-    /**
-     * @custom:legacy
-     * @notice Finalizes a withdrawal of ERC20 tokens from L2.
-     *
-     * @param _l1Token   Address of the token on L1.
-     * @param _l2Token   Address of the corresponding token on L2.
-     * @param _from      Address of the withdrawer on L2.
-     * @param _to        Address of the recipient on L1.
-     * @param _amount    Amount of the ERC20 to withdraw.
-     * @param _extraData Optional data forwarded from L2.
-     */
-    function finalizeERC20Withdrawal(
-        address _l1Token,
-        address _l2Token,
-        address _from,
-        address _to,
-        uint256 _amount,
-        bytes calldata _extraData
-    ) external onlyOtherBridge {
-        finalizeBridgeERC20(_l1Token, _l2Token, _from, _to, _amount, _extraData);
-    }
-
     /**
      * @custom:legacy
      * @notice Deposits some amount of ETH into the sender's account on L2.
@@ -240,10 +218,32 @@ contract L1StandardBridge is StandardBridge, Semver {
         address _to,
         uint256 _amount,
         bytes calldata _extraData
-    ) external payable onlyOtherBridge {
+    ) external payable {
         finalizeBridgeETH(_from, _to, _amount, _extraData);
     }
 
+    /**
+     * @custom:legacy
+     * @notice Finalizes a withdrawal of ERC20 tokens from L2.
+     *
+     * @param _l1Token   Address of the token on L1.
+     * @param _l2Token   Address of the corresponding token on L2.
+     * @param _from      Address of the withdrawer on L2.
+     * @param _to        Address of the recipient on L1.
+     * @param _amount    Amount of the ERC20 to withdraw.
+     * @param _extraData Optional data forwarded from L2.
+     */
+    function finalizeERC20Withdrawal(
+        address _l1Token,
+        address _l2Token,
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes calldata _extraData
+    ) external {
+        finalizeBridgeERC20(_l1Token, _l2Token, _from, _to, _amount, _extraData);
+    }
+
     /**
      * @custom:legacy
      * @notice Retrieves the access of the corresponding L2 bridge contract.

packages/contracts-bedrock/contracts/L1/ResourceMetering.sol

@@ -92,8 +92,7 @@ abstract contract ResourceMetering is Initializable {
             // spam the L2 system. Fee scheme is very similar to EIP-1559 with minor changes.
             int256 gasUsedDelta = int256(uint256(params.prevBoughtGas)) - TARGET_RESOURCE_LIMIT;
             int256 baseFeeDelta = (int256(uint256(params.prevBaseFee)) * gasUsedDelta) /
-                TARGET_RESOURCE_LIMIT /
-                BASE_FEE_MAX_CHANGE_DENOMINATOR;
+                (TARGET_RESOURCE_LIMIT * BASE_FEE_MAX_CHANGE_DENOMINATOR);
 
             // Update base fee by adding the base fee delta and clamp the resulting value between
             // min and max.

packages/contracts-bedrock/package.json

 {
   "name": "@eth-optimism/contracts-bedrock",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Contracts for Optimism Specs",
   "main": "dist/index",
   "types": "dist/index",
@@ -79,7 +79,7 @@
     "dotenv": "^16.0.0",
     "ds-test": "https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5",
     "ethereum-waffle": "^3.0.0",
-    "forge-std": "https://github.com/foundry-rs/forge-std.git#a2edd39db95df7e9dd3f9ef9edc8c55fefddb6df",
+    "forge-std": "https://github.com/foundry-rs/forge-std.git#fd86115ed6aba8e234ee0fb86c12fe35eff0b2a0",
     "glob": "^7.1.6",
     "hardhat-deploy": "^0.11.4",
     "solhint": "^3.3.7",

packages/contracts-periphery/package.json

@@ -53,7 +53,7 @@
     "url": "https://github.com/ethereum-optimism/optimism.git"
   },
   "devDependencies": {
-    "@eth-optimism/contracts-bedrock": "0.12.0",
+    "@eth-optimism/contracts-bedrock": "0.12.1",
     "@eth-optimism/core-utils": "^0.12.0",
     "@eth-optimism/hardhat-deploy-config": "^0.2.5",
     "@ethersproject/hardware-wallets": "^5.7.0",

packages/message-relayer/CHANGELOG.md

 # @eth-optimism/message-relayer
 
+## 0.5.30
+
+### Patch Changes
+
+- @eth-optimism/sdk@1.10.4
+
 ## 0.5.29
 
 ### Patch Changes

packages/message-relayer/package.json

 {
   "private": true,
   "name": "@eth-optimism/message-relayer",
-  "version": "0.5.29",
+  "version": "0.5.30",
   "description": "[Optimism] Service for automatically relaying L2 to L1 transactions",
   "main": "dist/index",
   "types": "dist/index",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@eth-optimism/common-ts": "0.8.0",
     "@eth-optimism/core-utils": "0.12.0",
-    "@eth-optimism/sdk": "1.10.3",
+    "@eth-optimism/sdk": "1.10.4",
     "ethers": "^5.7.0"
   },
   "devDependencies": {

packages/sdk/CHANGELOG.md

 # @eth-optimism/sdk
 
+## 1.10.4
+
+### Patch Changes
+
+- Updated dependencies [80f2271f5]
+  - @eth-optimism/contracts-bedrock@0.12.1
+
 ## 1.10.3
 
 ### Patch Changes

packages/sdk/package.json

 {
   "name": "@eth-optimism/sdk",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "description": "[Optimism] Tools for working with Optimism",
   "main": "dist/index",
   "types": "dist/index",
@@ -50,7 +50,7 @@
   "dependencies": {
     "@eth-optimism/contracts": "0.5.40",
     "@eth-optimism/core-utils": "0.12.0",
-    "@eth-optimism/contracts-bedrock": "0.12.0",
+    "@eth-optimism/contracts-bedrock": "0.12.1",
     "lodash": "^4.17.21",
     "merkletreejs": "^0.2.27",
     "rlp": "^2.2.7"

yarn.lock

@@ -9518,9 +9518,9 @@ forever-agent@~0.6.1:
   version "1.2.0"
   resolved "https://github.com/foundry-rs/forge-std.git#53331f4cb2e313466f72440f3e73af048c454d02"
 
-"forge-std@https://github.com/foundry-rs/forge-std.git#a2edd39db95df7e9dd3f9ef9edc8c55fefddb6df":
+"forge-std@https://github.com/foundry-rs/forge-std.git#fd86115ed6aba8e234ee0fb86c12fe35eff0b2a0":
   version "1.4.0"
-  resolved "https://github.com/foundry-rs/forge-std.git#a2edd39db95df7e9dd3f9ef9edc8c55fefddb6df"
+  resolved "https://github.com/foundry-rs/forge-std.git#fd86115ed6aba8e234ee0fb86c12fe35eff0b2a0"
 
 form-data@^2.2.0:
   version "2.5.1"