Merge pull request #4747 from ethereum-optimism/jm/test-new-bridge-iface

test(ctb): Add bridge tests for the new bridge interface

packages/contracts-bedrock/.gas-snapshot

 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 261344)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 75851)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348207)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 112639)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348229)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112660)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40502)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348296)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 112728)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348318)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112749)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40853)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88513)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 74998)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36156)
@@ -92,23 +92,25 @@ L1ERC721Bridge_Test:test_finalizeBridgeERC721_notFromRemoteMessenger_reverts() (
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_notViaLocalMessenger_reverts() (gas: 16093)
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_selfToken_reverts() (gas: 17593)
 L1ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 323814)
-L1StandardBridge_DepositERC20To_Test:test_depositERC20To_succeeds() (gas: 624908)
-L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 622587)
+L1StandardBridge_BridgeETHTo_Test:test_bridgeETHTo_succeeds() (gas: 419609)
+L1StandardBridge_BridgeETH_Test:test_bridgeETH_succeeds() (gas: 406785)
+L1StandardBridge_DepositERC20To_Test:test_depositERC20To_succeeds() (gas: 625056)
+L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 622735)
 L1StandardBridge_DepositERC20_TestFail:test_depositERC20_notEoa_reverts() (gas: 22320)
-L1StandardBridge_DepositETHTo_Test:test_depositETHTo_succeeds() (gas: 359219)
-L1StandardBridge_DepositETH_Test:test_depositETH_succeeds() (gas: 405236)
+L1StandardBridge_DepositETHTo_Test:test_depositETHTo_succeeds() (gas: 419642)
+L1StandardBridge_DepositETH_Test:test_depositETH_succeeds() (gas: 406880)
 L1StandardBridge_DepositETH_TestFail:test_depositETH_notEoa_reverts() (gas: 40780)
-L1StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 48788)
+L1StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 51674)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_incorrectValue_reverts() (gas: 34207)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_sendToMessenger_reverts() (gas: 34288)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_sendToSelf_reverts() (gas: 34257)
-L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal_succeeds() (gas: 496088)
+L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal_succeeds() (gas: 496417)
 L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notMessenger_reverts() (gas: 31148)
 L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notOtherBridge_reverts() (gas: 31504)
-L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal_succeeds() (gas: 61815)
+L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal_succeeds() (gas: 62166)
 L1StandardBridge_Getter_Test:test_getters_succeeds() (gas: 32151)
 L1StandardBridge_Initialize_Test:test_initialize_succeeds() (gas: 22005)
-L1StandardBridge_Receive_Test:test_receive_succeeds() (gas: 520249)
+L1StandardBridge_Receive_Test:test_receive_succeeds() (gas: 520338)
 L2CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 8389)
 L2CrossDomainMessenger_Test:test_pause_notOwner_reverts() (gas: 10837)
 L2CrossDomainMessenger_Test:test_pause_succeeds() (gas: 31846)
@@ -164,18 +166,20 @@ L2OutputOracleUpgradeable_Test:test_initValuesOnProxy_succeeds() (gas: 26093)
 L2OutputOracleUpgradeable_Test:test_initializeImpl_alreadyInitialized_reverts() (gas: 15149)
 L2OutputOracleUpgradeable_Test:test_initializeProxy_alreadyInitialized_reverts() (gas: 20131)
 L2OutputOracleUpgradeable_Test:test_upgrading_succeeds() (gas: 180413)
-L2StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 36076)
-L2StandardBridge_Test:test_finalizeBridgeETH_incorrectValue_reverts() (gas: 23865)
-L2StandardBridge_Test:test_finalizeBridgeETH_sendToMessenger_reverts() (gas: 23960)
-L2StandardBridge_Test:test_finalizeBridgeETH_sendToSelf_reverts() (gas: 23826)
-L2StandardBridge_Test:test_finalizeDeposit_depositingERC20_succeeds() (gas: 90619)
-L2StandardBridge_Test:test_finalizeDeposit_depositingETH_succeeds() (gas: 89451)
-L2StandardBridge_Test:test_initialize_succeeds() (gas: 24270)
-L2StandardBridge_Test:test_receive_succeeds() (gas: 177206)
-L2StandardBridge_Test:test_withdrawTo_withdrawingERC20_succeeds() (gas: 386492)
-L2StandardBridge_Test:test_withdraw_insufficientValue_reverts() (gas: 19649)
-L2StandardBridge_Test:test_withdraw_notEOA_reverts() (gas: 251799)
-L2StandardBridge_Test:test_withdraw_withdrawingERC20_succeeds() (gas: 384536)
+L2StandardBridge_BridgeERC20To_Test:test_bridgeERC20To_succeeds() (gas: 387969)
+L2StandardBridge_BridgeERC20To_Test:test_withdrawTo_withdrawingERC20_succeeds() (gas: 388200)
+L2StandardBridge_BridgeERC20_Test:test_bridgeERC20_succeeds() (gas: 383692)
+L2StandardBridge_BridgeERC20_Test:test_withdraw_notEOA_reverts() (gas: 251790)
+L2StandardBridge_BridgeERC20_Test:test_withdraw_withdrawingERC20_succeeds() (gas: 383877)
+L2StandardBridge_Bridge_Test:test_finalizeBridgeETH_incorrectValue_reverts() (gas: 23798)
+L2StandardBridge_Bridge_Test:test_finalizeBridgeETH_sendToMessenger_reverts() (gas: 23960)
+L2StandardBridge_Bridge_Test:test_finalizeBridgeETH_sendToSelf_reverts() (gas: 23848)
+L2StandardBridge_Bridge_Test:test_finalizeDeposit_depositingERC20_succeeds() (gas: 90989)
+L2StandardBridge_Bridge_Test:test_finalizeDeposit_depositingETH_succeeds() (gas: 89821)
+L2StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 43155)
+L2StandardBridge_Test:test_initialize_succeeds() (gas: 24247)
+L2StandardBridge_Test:test_receive_succeeds() (gas: 177145)
+L2StandardBridge_Test:test_withdraw_insufficientValue_reverts() (gas: 19615)
 L2ToL1MessagePasserTest:test_burn_succeeds() (gas: 112572)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromContract_succeeds() (gas: 70423)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromEOA_succeeds() (gas: 75874)
@@ -385,7 +389,7 @@ SequencerFeeVault_Test:test_constructor_succeeds() (gas: 5504)
 SequencerFeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 5420)
 SequencerFeeVault_Test:test_receive_succeeds() (gas: 17336)
 SequencerFeeVault_Test:test_withdraw_notEnough_reverts() (gas: 9309)
-SequencerFeeVault_Test:test_withdraw_succeeds() (gas: 159816)
+SequencerFeeVault_Test:test_withdraw_succeeds() (gas: 163169)
 SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 61966)
 SystemConfig_Setters_TestFail:test_setBatcherHash_notOwner_reverts() (gas: 10545)
 SystemConfig_Setters_TestFail:test_setGasConfig_notOwner_reverts() (gas: 10532)

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

@@ -126,7 +126,6 @@ contract L1StandardBridge is StandardBridge, Semver {
         uint256 _amount,
         bytes calldata _extraData
     ) external onlyOtherBridge {
-        emit ERC20WithdrawalFinalized(_l1Token, _l2Token, _from, _to, _amount, _extraData);
         finalizeBridgeERC20(_l1Token, _l2Token, _from, _to, _amount, _extraData);
     }
 
@@ -242,7 +241,6 @@ contract L1StandardBridge is StandardBridge, Semver {
         uint256 _amount,
         bytes calldata _extraData
     ) external payable onlyOtherBridge {
-        emit ETHWithdrawalFinalized(_from, _to, _amount, _extraData);
         finalizeBridgeETH(_from, _to, _amount, _extraData);
     }
 
@@ -270,7 +268,6 @@ contract L1StandardBridge is StandardBridge, Semver {
         uint32 _minGasLimit,
         bytes memory _extraData
     ) internal {
-        emit ETHDepositInitiated(_from, _to, msg.value, _extraData);
         _initiateBridgeETH(_from, _to, msg.value, _minGasLimit, _extraData);
     }
 
@@ -294,7 +291,74 @@ contract L1StandardBridge is StandardBridge, Semver {
         uint32 _minGasLimit,
         bytes memory _extraData
     ) internal {
-        emit ERC20DepositInitiated(_l1Token, _l2Token, _from, _to, _amount, _extraData);
         _initiateBridgeERC20(_l1Token, _l2Token, _from, _to, _amount, _minGasLimit, _extraData);
     }
+
+    /**
+     * @notice Emits the legacy ETHDepositInitiated event followed by the ETHBridgeInitiated event.
+     *         This is necessary for backwards compatibility with the legacy bridge.
+     *
+     * @inheritdoc StandardBridge
+     */
+    function _emitETHBridgeInitiated(
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal override {
+        emit ETHDepositInitiated(_from, _to, _amount, _extraData);
+        super._emitETHBridgeInitiated(_from, _to, _amount, _extraData);
+    }
+
+    /**
+     * @notice Emits the legacy ETHWithdrawalFinalized event followed by the ETHBridgeFinalized
+     *         event. This is necessary for backwards compatibility with the legacy bridge.
+     *
+     * @inheritdoc StandardBridge
+     */
+    function _emitETHBridgeFinalized(
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal override {
+        emit ETHWithdrawalFinalized(_from, _to, _amount, _extraData);
+        super._emitETHBridgeFinalized(_from, _to, _amount, _extraData);
+    }
+
+    /**
+     * @notice Emits the legacy ERC20DepositInitiated event followed by the ERC20BridgeInitiated
+     *         event. This is necessary for backwards compatibility with the legacy bridge.
+     *
+     * @inheritdoc StandardBridge
+     */
+    function _emitERC20BridgeInitiated(
+        address _localToken,
+        address _remoteToken,
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal override {
+        emit ERC20DepositInitiated(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+        super._emitERC20BridgeInitiated(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+    }
+
+    /**
+     * @notice Emits the legacy ERC20WithdrawalFinalized event followed by the ERC20BridgeFinalized
+     *         event. This is necessary for backwards compatibility with the legacy bridge.
+     *
+     * @inheritdoc StandardBridge
+     */
+    function _emitERC20BridgeFinalized(
+        address _localToken,
+        address _remoteToken,
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal override {
+        emit ERC20WithdrawalFinalized(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+        super._emitERC20BridgeFinalized(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+    }
 }

packages/contracts-bedrock/contracts/L2/L2StandardBridge.sol

@@ -148,8 +148,6 @@ contract L2StandardBridge is StandardBridge, Semver {
         } else {
             finalizeBridgeERC20(_l2Token, _l1Token, _from, _to, _amount, _extraData);
         }
-
-        emit DepositFinalized(_l1Token, _l2Token, _from, _to, _amount, _extraData);
     }
 
     /**
@@ -187,7 +185,87 @@ contract L2StandardBridge is StandardBridge, Semver {
         } else {
             _initiateBridgeERC20(_l2Token, l1Token, _from, _to, _amount, _minGasLimit, _extraData);
         }
+    }
+
+    /**
+     * @notice Emits the legacy WithdrawalInitiated event followed by the ETHBridgeInitiated event.
+     *         This is necessary for backwards compatibility with the legacy bridge.
+     *
+     * @inheritdoc StandardBridge
+     */
+    function _emitETHBridgeInitiated(
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal override {
+        emit WithdrawalInitiated(
+            address(0),
+            Predeploys.LEGACY_ERC20_ETH,
+            _from,
+            _to,
+            _amount,
+            _extraData
+        );
+        super._emitETHBridgeInitiated(_from, _to, _amount, _extraData);
+    }
+
+    /**
+     * @notice Emits the legacy DepositFinalized event followed by the ETHBridgeFinalized event.
+     *         This is necessary for backwards compatibility with the legacy bridge.
+     *
+     * @inheritdoc StandardBridge
+     */
+    function _emitETHBridgeFinalized(
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal override {
+        emit DepositFinalized(
+            address(0),
+            Predeploys.LEGACY_ERC20_ETH,
+            _from,
+            _to,
+            _amount,
+            _extraData
+        );
+        super._emitETHBridgeFinalized(_from, _to, _amount, _extraData);
+    }
+
+    /**
+     * @notice Emits the legacy WithdrawalInitiated event followed by the ERC20BridgeInitiated
+     *         event. This is necessary for backwards compatibility with the legacy bridge.
+     *
+     * @inheritdoc StandardBridge
+     */
+    function _emitERC20BridgeInitiated(
+        address _localToken,
+        address _remoteToken,
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal override {
+        emit WithdrawalInitiated(_remoteToken, _localToken, _from, _to, _amount, _extraData);
+        super._emitERC20BridgeInitiated(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+    }
 
-        emit WithdrawalInitiated(l1Token, _l2Token, _from, _to, _amount, _extraData);
+    /**
+     * @notice Emits the legacy DepositFinalized event followed by the ERC20BridgeFinalized event.
+     *         This is necessary for backwards compatibility with the legacy bridge.
+     *
+     * @inheritdoc StandardBridge
+     */
+    function _emitERC20BridgeFinalized(
+        address _localToken,
+        address _remoteToken,
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal override {
+        emit DepositFinalized(_remoteToken, _localToken, _from, _to, _amount, _extraData);
+        super._emitERC20BridgeFinalized(_localToken, _remoteToken, _from, _to, _amount, _extraData);
     }
 }

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

@@ -71,34 +71,37 @@ contract L1StandardBridge_Receive_Test is Bridge_Initializer {
 
 contract L1StandardBridge_Receive_TestFail {}
 
-contract L1StandardBridge_DepositETH_Test is Bridge_Initializer {
-    // depositETH
-    // - emits ETHDepositInitiated
-    // - calls optimismPortal.depositTransaction
-    // - only EOA
-    // - ETH ends up in the optimismPortal
-    function test_depositETH_succeeds() external {
+contract PreBridgeETH is Bridge_Initializer {
+    function _preBridgeETH(bool isLegacy) internal {
         assertEq(address(op).balance, 0);
         uint256 nonce = L1Messenger.messageNonce();
         uint256 version = 0; // Internal constant in the OptimismPortal: DEPOSIT_VERSION
         address l1MessengerAliased = AddressAliasHelper.applyL1ToL2Alias(address(L1Messenger));
 
-        vm.expectEmit(true, true, true, true, address(L1Bridge));
-        emit ETHDepositInitiated(alice, alice, 500, hex"ff");
-
-        vm.expectEmit(true, true, true, true, address(L1Bridge));
-        emit ETHBridgeInitiated(alice, alice, 500, hex"ff");
-
         bytes memory message = abi.encodeWithSelector(
             StandardBridge.finalizeBridgeETH.selector,
             alice,
             alice,
             500,
-            hex"ff"
+            hex"dead"
         );
 
+        if (isLegacy) {
+            vm.expectCall(
+                address(L1Bridge),
+                500,
+                abi.encodeWithSelector(L1Bridge.depositETH.selector, 50000, hex"dead")
+            );
+        } else {
+            vm.expectCall(
+                address(L1Bridge),
+                500,
+                abi.encodeWithSelector(L1Bridge.bridgeETH.selector, 50000, hex"dead")
+            );
+        }
         vm.expectCall(
             address(L1Messenger),
+            500,
             abi.encodeWithSelector(
                 CrossDomainMessenger.sendMessage.selector,
                 address(L2Bridge),
@@ -120,6 +123,7 @@ contract L1StandardBridge_DepositETH_Test is Bridge_Initializer {
         uint64 baseGas = L1Messenger.baseGas(message, 50000);
         vm.expectCall(
             address(op),
+            500,
             abi.encodeWithSelector(
                 OptimismPortal.depositTransaction.selector,
                 address(L2Messenger),
@@ -138,6 +142,12 @@ contract L1StandardBridge_DepositETH_Test is Bridge_Initializer {
             innerMessage
         );
 
+        vm.expectEmit(true, true, true, true, address(L1Bridge));
+        emit ETHDepositInitiated(alice, alice, 500, hex"dead");
+
+        vm.expectEmit(true, true, true, true, address(L1Bridge));
+        emit ETHBridgeInitiated(alice, alice, 500, hex"dead");
+
         // OptimismPortal emits a TransactionDeposited event on `depositTransaction` call
         vm.expectEmit(true, true, true, true, address(op));
         emit TransactionDeposited(l1MessengerAliased, address(L2Messenger), version, opaqueData);
@@ -151,7 +161,33 @@ contract L1StandardBridge_DepositETH_Test is Bridge_Initializer {
         emit SentMessageExtension1(address(L1Bridge), 500);
 
         vm.prank(alice, alice);
-        L1Bridge.depositETH{ value: 500 }(50000, hex"ff");
+    }
+}
+
+contract L1StandardBridge_DepositETH_Test is PreBridgeETH {
+    // depositETH
+    // - emits ETHDepositInitiated
+    // - emits ETHBridgeInitiated
+    // - calls optimismPortal.depositTransaction
+    // - only EOA
+    // - ETH ends up in the optimismPortal
+    function test_depositETH_succeeds() external {
+        _preBridgeETH({ isLegacy: true });
+        L1Bridge.depositETH{ value: 500 }(50000, hex"dead");
+        assertEq(address(op).balance, 500);
+    }
+}
+
+contract L1StandardBridge_BridgeETH_Test is PreBridgeETH {
+    // BridgeETH
+    // - emits ETHDepositInitiated
+    // - emits ETHBridgeInitiated
+    // - calls optimismPortal.depositTransaction
+    // - only EOA
+    // - ETH ends up in the optimismPortal
+    function test_bridgeETH_succeeds() external {
+        _preBridgeETH({ isLegacy: false });
+        L1Bridge.bridgeETH{ value: 500 }(50000, hex"dead");
         assertEq(address(op).balance, 500);
     }
 }
@@ -167,29 +203,26 @@ contract L1StandardBridge_DepositETH_TestFail is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_DepositETHTo_Test is Bridge_Initializer {
-    // depositETHTo
-    // - emits ETHDepositInitiated
-    // - calls optimismPortal.depositTransaction
-    // - EOA or contract can call
-    // - ETH ends up in the optimismPortal
-    function test_depositETHTo_succeeds() external {
+contract PreBridgeETHTo is Bridge_Initializer {
+    function _preBridgeETHTo(bool isLegacy) internal {
         assertEq(address(op).balance, 0);
         uint256 nonce = L1Messenger.messageNonce();
         uint256 version = 0; // Internal constant in the OptimismPortal: DEPOSIT_VERSION
         address l1MessengerAliased = AddressAliasHelper.applyL1ToL2Alias(address(L1Messenger));
 
-        vm.expectEmit(true, true, true, true, address(L1Bridge));
-        emit ETHDepositInitiated(alice, bob, 600, hex"dead");
-
-        vm.expectEmit(true, true, true, true, address(L1Bridge));
-        emit ETHBridgeInitiated(alice, bob, 600, hex"dead");
-
-        // depositETHTo on the L1 bridge should be called
-        vm.expectCall(
-            address(L1Bridge),
-            abi.encodeWithSelector(L1Bridge.depositETHTo.selector, bob, 1000, hex"dead")
-        );
+        if (isLegacy) {
+            vm.expectCall(
+                address(L1Bridge),
+                600,
+                abi.encodeWithSelector(L1Bridge.depositETHTo.selector, bob, 60000, hex"dead")
+            );
+        } else {
+            vm.expectCall(
+                address(L1Bridge),
+                600,
+                abi.encodeWithSelector(L1Bridge.bridgeETHTo.selector, bob, 60000, hex"dead")
+            );
+        }
 
         bytes memory message = abi.encodeWithSelector(
             StandardBridge.finalizeBridgeETH.selector,
@@ -207,7 +240,7 @@ contract L1StandardBridge_DepositETHTo_Test is Bridge_Initializer {
                 CrossDomainMessenger.sendMessage.selector,
                 address(L2Bridge),
                 message,
-                1000
+                60000
             )
         );
 
@@ -217,11 +250,11 @@ contract L1StandardBridge_DepositETHTo_Test is Bridge_Initializer {
             address(L1Bridge),
             address(L2Bridge),
             600,
-            1000,
+            60000,
             message
         );
 
-        uint64 baseGas = L1Messenger.baseGas(message, 1000);
+        uint64 baseGas = L1Messenger.baseGas(message, 60000);
         vm.expectCall(
             address(op),
             abi.encodeWithSelector(
@@ -242,13 +275,19 @@ contract L1StandardBridge_DepositETHTo_Test is Bridge_Initializer {
             innerMessage
         );
 
+        vm.expectEmit(true, true, true, true, address(L1Bridge));
+        emit ETHDepositInitiated(alice, bob, 600, hex"dead");
+
+        vm.expectEmit(true, true, true, true, address(L1Bridge));
+        emit ETHBridgeInitiated(alice, bob, 600, hex"dead");
+
         // OptimismPortal emits a TransactionDeposited event on `depositTransaction` call
         vm.expectEmit(true, true, true, true, address(op));
         emit TransactionDeposited(l1MessengerAliased, address(L2Messenger), version, opaqueData);
 
         // SentMessage event emitted by the CrossDomainMessenger
         vm.expectEmit(true, true, true, true, address(L1Messenger));
-        emit SentMessage(address(L2Bridge), address(L1Bridge), message, nonce, 1000);
+        emit SentMessage(address(L2Bridge), address(L1Bridge), message, nonce, 60000);
 
         // SentMessageExtension1 event emitted by the CrossDomainMessenger
         vm.expectEmit(true, true, true, true, address(L1Messenger));
@@ -256,7 +295,33 @@ contract L1StandardBridge_DepositETHTo_Test is Bridge_Initializer {
 
         // deposit eth to bob
         vm.prank(alice, alice);
-        L1Bridge.depositETHTo{ value: 600 }(bob, 1000, hex"dead");
+    }
+}
+
+contract L1StandardBridge_DepositETHTo_Test is PreBridgeETHTo {
+    // depositETHTo
+    // - emits ETHDepositInitiated
+    // - calls optimismPortal.depositTransaction
+    // - EOA or contract can call
+    // - ETH ends up in the optimismPortal
+    function test_depositETHTo_succeeds() external {
+        _preBridgeETHTo({ isLegacy: true });
+        L1Bridge.depositETHTo{ value: 600 }(bob, 60000, hex"dead");
+        assertEq(address(op).balance, 600);
+    }
+}
+
+contract L1StandardBridge_BridgeETHTo_Test is PreBridgeETHTo {
+    // BridgeETHTo
+    // - emits ETHDepositInitiated
+    // - emits ETHBridgeInitiated
+    // - calls optimismPortal.depositTransaction
+    // - only EOA
+    // - ETH ends up in the optimismPortal
+    function test_bridgeETHTo_succeeds() external {
+        _preBridgeETHTo({ isLegacy: false });
+        L1Bridge.bridgeETHTo{ value: 600 }(bob, 60000, hex"dead");
+        assertEq(address(op).balance, 600);
     }
 }
 

packages/contracts-bedrock/contracts/universal/StandardBridge.sol

@@ -301,7 +301,9 @@ abstract contract StandardBridge {
         require(_to != address(this), "StandardBridge: cannot send to self");
         require(_to != address(MESSENGER), "StandardBridge: cannot send to messenger");
 
-        emit ETHBridgeFinalized(_from, _to, _amount, _extraData);
+        // Emit the correct events. By default this will be _amount, but child
+        // contracts may override this function in order to emit legacy events as well.
+        _emitETHBridgeFinalized(_from, _to, _amount, _extraData);
 
         bool success = SafeCall.call(_to, gasleft(), _amount, hex"");
         require(success, "StandardBridge: ETH transfer failed");
@@ -340,7 +342,9 @@ abstract contract StandardBridge {
             IERC20(_localToken).safeTransfer(_to, _amount);
         }
 
-        emit ERC20BridgeFinalized(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+        // Emit the correct events. By default this will be ERC20BridgeFinalized, but child
+        // contracts may override this function in order to emit legacy events as well.
+        _emitERC20BridgeFinalized(_localToken, _remoteToken, _from, _to, _amount, _extraData);
     }
 
     /**
@@ -366,7 +370,9 @@ abstract contract StandardBridge {
             "StandardBridge: bridging ETH must include sufficient ETH value"
         );
 
-        emit ETHBridgeInitiated(_from, _to, _amount, _extraData);
+        // Emit the correct events. By default this will be _amount, but child
+        // contracts may override this function in order to emit legacy events as well.
+        _emitETHBridgeInitiated(_from, _to, _amount, _extraData);
 
         MESSENGER.sendMessage{ value: _amount }(
             address(OTHER_BRIDGE),
@@ -414,7 +420,9 @@ abstract contract StandardBridge {
             deposits[_localToken][_remoteToken] = deposits[_localToken][_remoteToken] + _amount;
         }
 
-        emit ERC20BridgeInitiated(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+        // Emit the correct events. By default this will be ERC20BridgeInitiated, but child
+        // contracts may override this function in order to emit legacy events as well.
+        _emitERC20BridgeInitiated(_localToken, _remoteToken, _from, _to, _amount, _extraData);
 
         MESSENGER.sendMessage(
             address(OTHER_BRIDGE),
@@ -463,4 +471,83 @@ abstract contract StandardBridge {
     {
         return _otherToken == OptimismMintableERC20(_mintableToken).l1Token();
     }
+
+    /** @notice Emits the ETHBridgeInitiated event and if necessary the appropriate legacy event
+     *          when an ETH bridge is finalized on this chain.
+     *
+     * @param _from      Address of the sender.
+     * @param _to        Address of the receiver.
+     * @param _amount    Amount of ETH sent.
+     * @param _extraData Extra data sent with the transaction.
+     */
+    function _emitETHBridgeInitiated(
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal virtual {
+        emit ETHBridgeInitiated(_from, _to, _amount, _extraData);
+    }
+
+    /**
+     * @notice Emits the ETHBridgeFinalized and if necessary the appropriate legacy event when an
+     *         ETH bridge is finalized on this chain.
+     *
+     * @param _from      Address of the sender.
+     * @param _to        Address of the receiver.
+     * @param _amount    Amount of ETH sent.
+     * @param _extraData Extra data sent with the transaction.
+     */
+    function _emitETHBridgeFinalized(
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal virtual {
+        emit ETHBridgeFinalized(_from, _to, _amount, _extraData);
+    }
+
+    /**
+     * @notice Emits the ERC20BridgeInitiated event and if necessary the appropriate legacy
+     *         event when an ERC20 bridge is initiated to the other chain.
+     *
+     * @param _localToken  Address of the ERC20 on this chain.
+     * @param _remoteToken Address of the ERC20 on the remote chain.
+     * @param _from        Address of the sender.
+     * @param _to          Address of the receiver.
+     * @param _amount      Amount of the ERC20 sent.
+     * @param _extraData   Extra data sent with the transaction.
+     */
+    function _emitERC20BridgeInitiated(
+        address _localToken,
+        address _remoteToken,
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal virtual {
+        emit ERC20BridgeInitiated(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+    }
+
+    /**
+     * @notice Emits the ERC20BridgeFinalized event and if necessary the appropriate legacy
+     *         event when an ERC20 bridge is initiated to the other chain.
+     *
+     * @param _localToken  Address of the ERC20 on this chain.
+     * @param _remoteToken Address of the ERC20 on the remote chain.
+     * @param _from        Address of the sender.
+     * @param _to          Address of the receiver.
+     * @param _amount      Amount of the ERC20 sent.
+     * @param _extraData   Extra data sent with the transaction.
+     */
+    function _emitERC20BridgeFinalized(
+        address _localToken,
+        address _remoteToken,
+        address _from,
+        address _to,
+        uint256 _amount,
+        bytes memory _extraData
+    ) internal virtual {
+        emit ERC20BridgeFinalized(_localToken, _remoteToken, _from, _to, _amount, _extraData);
+    }
 }

packages/sdk/tasks/deposit-erc20.ts

@@ -340,29 +340,44 @@ task('deposit-erc20', 'Deposits WETH9 onto L2.')
     )
 
     console.log('Finalizing withdrawal...')
-    const finalize = await messenger.finalizeMessage(withdraw)
+    // TODO: Update SDK to properly estimate gas
+    const finalize = await messenger.finalizeMessage(withdraw, {
+      overrides: { gasLimit: 500_000 },
+    })
     const finalizeReceipt = await finalize.wait()
+    console.log('finalizeReceipt:', finalizeReceipt)
     console.log(`Took ${Math.floor(Date.now() / 1000) - now} seconds`)
 
     for (const log of finalizeReceipt.logs) {
       switch (log.address) {
         case OptimismPortal.address: {
           const parsed = OptimismPortal.interface.parseLog(log)
-          console.log(`Log ${parsed.name} from ${log.address}`)
+          console.log(`Log ${parsed.name} from OptimismPortal (${log.address})`)
           console.log(parsed.args)
           console.log()
           break
         }
         case L1CrossDomainMessenger.address: {
           const parsed = L1CrossDomainMessenger.interface.parseLog(log)
-          console.log(`Log ${parsed.name} from ${log.address}`)
+          console.log(
+            `Log ${parsed.name} from L1CrossDomainMessenger (${log.address})`
+          )
           console.log(parsed.args)
           console.log()
           break
         }
         case L1StandardBridge.address: {
           const parsed = L1StandardBridge.interface.parseLog(log)
-          console.log(`Log ${parsed.name} from ${log.address}`)
+          console.log(
+            `Log ${parsed.name} from L1StandardBridge (${log.address})`
+          )
+          console.log(parsed.args)
+          console.log()
+          break
+        }
+        case WETH9.address: {
+          const parsed = WETH9.interface.parseLog(log)
+          console.log(`Log ${parsed.name} from WETH9 (${log.address})`)
           console.log(parsed.args)
           console.log()
           break
@@ -378,7 +393,9 @@ task('deposit-erc20', 'Deposits WETH9 onto L2.')
 
     const expectedBalance = preBalance.add(utils.parseEther('1'))
     if (!expectedBalance.eq(postBalance)) {
-      throw new Error('Balance mismatch')
+      throw new Error(
+        `Balance mismatch, expected: ${expectedBalance}, actual: ${postBalance}`
+      )
     }
     console.log('Withdrawal success')
   })

packages/sdk/tasks/deposit-eth.ts

@@ -374,7 +374,10 @@ task('deposit-eth', 'Deposits ether to L2.')
             console.log(parsed.name)
             console.log(parsed.args)
             console.log()
-            if (parsed.name !== 'ETHBridgeFinalized') {
+            if (
+              parsed.name !== 'ETHBridgeFinalized' &&
+              parsed.name !== 'ETHWithdrawalFinalized'
+            ) {
               throw new Error('Wrong event name from L1StandardBridge')
             }
             if (!parsed.args.amount.eq(withdrawAmount)) {