Merge pull request #7692 from ethereum-optimism/fix/l2-reinit

contracts-bedrock: L2 contracts reinit

op-chain-ops/genesis/config.go

@@ -26,6 +26,11 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
+// initialzedValue represents the `Initializable` contract value. It should be kept in
+// sync with the constant in `Constants.sol`.
+// https://github.com/ethereum-optimism/optimism/blob/develop/packages/contracts-bedrock/src/libraries/Constants.sol
+const initializedValue = 3
+
 var (
 	ErrInvalidDeployConfig     = errors.New("invalid deploy config")
 	ErrInvalidImmutablesConfig = errors.New("invalid immutables config")
@@ -708,13 +713,13 @@ func NewL2StorageConfig(config *DeployConfig, block *types.Block) (state.Storage
 		"msgNonce": 0,
 	}
 	storage["L2CrossDomainMessenger"] = state.StorageValues{
-		"_initialized":     1,
+		"_initialized":     initializedValue,
 		"_initializing":    false,
 		"xDomainMsgSender": "0x000000000000000000000000000000000000dEaD",
 		"msgNonce":         0,
 	}
 	storage["L2StandardBridge"] = state.StorageValues{
-		"_initialized":  2,
+		"_initialized":  initializedValue,
 		"_initializing": false,
 		"messenger":     predeploys.L2CrossDomainMessengerAddr,
 	}
@@ -749,12 +754,12 @@ func NewL2StorageConfig(config *DeployConfig, block *types.Block) (state.Storage
 	}
 	storage["L2ERC721Bridge"] = state.StorageValues{
 		"messenger":     predeploys.L2CrossDomainMessengerAddr,
-		"_initialized":  2,
+		"_initialized":  initializedValue,
 		"_initializing": false,
 	}
 	storage["OptimismMintableERC20Factory"] = state.StorageValues{
 		"bridge":        predeploys.L2StandardBridgeAddr,
-		"_initialized":  2,
+		"_initialized":  initializedValue,
 		"_initializing": false,
 	}
 	return storage, nil

packages/contracts-bedrock/.gas-snapshot

@@ -229,16 +229,16 @@ L2CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 123957)
 L2CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 135812)
 L2CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 49230)
 L2CrossDomainMessenger_Test:test_xDomainSender_senderNotSet_reverts() (gas: 10590)
-L2ERC721Bridge_Test:test_bridgeERC721To_localTokenZeroAddress_reverts() (gas: 31431)
-L2ERC721Bridge_Test:test_bridgeERC721To_remoteTokenZeroAddress_reverts() (gas: 26832)
-L2ERC721Bridge_Test:test_bridgeERC721To_succeeds() (gas: 157134)
-L2ERC721Bridge_Test:test_bridgeERC721To_wrongOwner_reverts() (gas: 34467)
+L2ERC721Bridge_Test:test_bridgeERC721To_localTokenZeroAddress_reverts() (gas: 31453)
+L2ERC721Bridge_Test:test_bridgeERC721To_remoteTokenZeroAddress_reverts() (gas: 26854)
+L2ERC721Bridge_Test:test_bridgeERC721To_succeeds() (gas: 157156)
+L2ERC721Bridge_Test:test_bridgeERC721To_wrongOwner_reverts() (gas: 34489)
 L2ERC721Bridge_Test:test_bridgeERC721_fromContract_reverts() (gas: 27183)
 L2ERC721Bridge_Test:test_bridgeERC721_localTokenZeroAddress_reverts() (gas: 29305)
 L2ERC721Bridge_Test:test_bridgeERC721_remoteTokenZeroAddress_reverts() (gas: 24641)
 L2ERC721Bridge_Test:test_bridgeERC721_succeeds() (gas: 154746)
 L2ERC721Bridge_Test:test_bridgeERC721_wrongOwner_reverts() (gas: 34271)
-L2ERC721Bridge_Test:test_constructor_succeeds() (gas: 21027)
+L2ERC721Bridge_Test:test_constructor_succeeds() (gas: 21004)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_alreadyExists_reverts() (gas: 38661)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_interfaceNotCompliant_reverts() (gas: 246925)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_notFromRemoteMessenger_reverts() (gas: 27208)

packages/contracts-bedrock/semver-lock.json

@@ -13,9 +13,9 @@
   "src/L2/GasPriceOracle.sol": "0x88efffbd40f8d012d700a5d7fde0d92266f65e9d7006cd8f034bacaa036d0eb2",
   "src/L2/L1Block.sol": "0x1ed9aa36036ded00a0383692eca81a22f668d64e22af973559d2ccefc86825c0",
   "src/L2/L1FeeVault.sol": "0x6a7a9a262c0a4c9781d812ea343f984944a8dd2b45bc1967dfcc3805c0053518",
-  "src/L2/L2CrossDomainMessenger.sol": "0x9e30ea360d8f341f05f7f39b160b850238a425be7e71b6bf4c5c0286d14a1ea0",
-  "src/L2/L2ERC721Bridge.sol": "0x435a021a70b20baf6aeeb68fb9ec583f1a3188102c636a5f62c72c6d8070a3c5",
-  "src/L2/L2StandardBridge.sol": "0x58dd68e0490fed62f32bfcc0eaf60bd9c33947217023e47d2c08377d8d88ed95",
+  "src/L2/L2CrossDomainMessenger.sol": "0x8fe4a79b3e8dd4d53dcd437c1731503beec744836273c114960f1a60ff38a930",
+  "src/L2/L2ERC721Bridge.sol": "0xdbe75ee8c8163ed5164cc6b293e422c718303b46a8df91e832fa9e5c6a023fb6",
+  "src/L2/L2StandardBridge.sol": "0x284ebf5569c75d98f2d1920a276d1116524399355708c4a60ea5892283c56719",
   "src/L2/L2ToL1MessagePasser.sol": "0xafc710b4d320ef450586d96a61cbd58cac814cb3b0c4fdc280eace3efdcdf321",
   "src/L2/SequencerFeeVault.sol": "0x883e434a69b4789997a4a9a32060dbbd2e12db6f1970927f1310820336119575",
   "src/dispute/BlockOracle.sol": "0x7e724b1ee0116dfd744f556e6237af449c2f40c6426d6f1462ae2a47589283bb",

packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol

@@ -6,6 +6,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
 import { ISemver } from "src/universal/ISemver.sol";
 import { L2ToL1MessagePasser } from "src/L2/L2ToL1MessagePasser.sol";
+import { Constants } from "src/libraries/Constants.sol";
 
 /// @custom:proxied
 /// @custom:predeploy 0x4200000000000000000000000000000000000007
@@ -14,8 +15,8 @@ import { L2ToL1MessagePasser } from "src/L2/L2ToL1MessagePasser.sol";
 ///         L2 on the L2 side. Users are generally encouraged to use this contract instead of lower
 ///         level message passing contracts.
 contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {
-    /// @custom:semver 1.6.1
-    string public constant version = "1.6.1";
+    /// @custom:semver 1.7.0
+    string public constant version = "1.7.0";
 
     /// @notice Constructs the L2CrossDomainMessenger contract.
     /// @param _l1CrossDomainMessenger Address of the L1CrossDomainMessenger contract.
@@ -24,7 +25,7 @@ contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {
     }
 
     /// @notice Initializer.
-    function initialize() public reinitializer(2) {
+    function initialize() public reinitializer(Constants.INITIALIZER) {
         __CrossDomainMessenger_init();
     }
 

packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol

@@ -7,6 +7,8 @@ import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol";
 import { IOptimismMintableERC721 } from "src/universal/IOptimismMintableERC721.sol";
 import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
 import { ISemver } from "src/universal/ISemver.sol";
+import { Constants } from "src/libraries/Constants.sol";
+import { Predeploys } from "src/libraries/Predeploys.sol";
 
 /// @title L2ERC721Bridge
 /// @notice The L2 ERC721 bridge is a contract which works together with the L1 ERC721 bridge to
@@ -18,19 +20,18 @@ import { ISemver } from "src/universal/ISemver.sol";
 ///         wait for the one-week challenge period to elapse before their Optimism-native NFT
 ///         can be refunded on L2.
 contract L2ERC721Bridge is ERC721Bridge, ISemver {
-    /// @custom:semver 1.3.1
-    string public constant version = "1.3.1";
+    /// @custom:semver 1.4.0
+    string public constant version = "1.4.0";
 
     /// @notice Constructs the L2ERC721Bridge contract.
     /// @param _otherBridge Address of the ERC721 bridge on the other network.
     constructor(address _otherBridge) ERC721Bridge(_otherBridge) {
-        initialize({ _messenger: CrossDomainMessenger(address(0)) });
+        initialize();
     }
 
     /// @notice Initializes the contract.
-    /// @param _messenger   Address of the CrossDomainMessenger on this network.
-    function initialize(CrossDomainMessenger _messenger) public reinitializer(2) {
-        __ERC721Bridge_init({ _messenger: _messenger });
+    function initialize() public reinitializer(Constants.INITIALIZER) {
+        __ERC721Bridge_init({ _messenger: CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) });
     }
 
     /// @notice Completes an ERC721 bridge from the other domain and sends the ERC721 token to the

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

@@ -6,6 +6,7 @@ import { StandardBridge } from "src/universal/StandardBridge.sol";
 import { ISemver } from "src/universal/ISemver.sol";
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
+import { Constants } from "src/libraries/Constants.sol";
 
 /// @custom:proxied
 /// @custom:predeploy 0x4200000000000000000000000000000000000010
@@ -51,8 +52,8 @@ contract L2StandardBridge is StandardBridge, ISemver {
         bytes extraData
     );
 
-    /// @custom:semver 1.3.1
-    string public constant version = "1.3.1";
+    /// @custom:semver 1.4.0
+    string public constant version = "1.4.0";
 
     /// @notice Constructs the L2StandardBridge contract.
     /// @param _otherBridge Address of the L1StandardBridge.
@@ -61,7 +62,7 @@ contract L2StandardBridge is StandardBridge, ISemver {
     }
 
     /// @notice Initializer
-    function initialize() public reinitializer(2) {
+    function initialize() public reinitializer(Constants.INITIALIZER) {
         __StandardBridge_init({ _messenger: CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) });
     }
 

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

@@ -476,7 +476,7 @@ contract ERC721Bridge_Initializer is Bridge_Initializer {
 
         vm.prank(multisig);
         Proxy(payable(Predeploys.L2_ERC721_BRIDGE)).upgradeToAndCall(
-            address(l2BridgeImpl), abi.encodeCall(L2ERC721Bridge.initialize, (L2Messenger))
+            address(l2BridgeImpl), abi.encodeCall(L2ERC721Bridge.initialize, ())
         );
 
         // Set up a reference to the L2ERC721Bridge.