contracts-bedrock: storage, semver, gas

packages/contracts-bedrock/.gas-snapshot

-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352334)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2950496)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 540710)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4052903)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 442015)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3487764)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352322)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2950484)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 540698)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4052891)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 442003)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3487752)
 GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 42970)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 86629)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68474)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68911)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 143100)
\ No newline at end of file
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68462)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68899)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 153527)
\ No newline at end of file

packages/contracts-bedrock/.storage-layout

@@ -62,7 +62,8 @@
 | l2Sender             | address                                                    | 50   | 0      | 20    | src/L1/OptimismPortal.sol:OptimismPortal |
 | finalizedWithdrawals | mapping(bytes32 => bool)                                   | 51   | 0      | 32    | src/L1/OptimismPortal.sol:OptimismPortal |
 | provenWithdrawals    | mapping(bytes32 => struct OptimismPortal.ProvenWithdrawal) | 52   | 0      | 32    | src/L1/OptimismPortal.sol:OptimismPortal |
-| spacer_foo           | bool                                                       | 53   | 0      | 1     | src/L1/OptimismPortal.sol:OptimismPortal |
+| spacer_53_0_1        | bool                                                       | 53   | 0      | 1     | src/L1/OptimismPortal.sol:OptimismPortal |
+| superchainConfig     | contract SuperchainConfig                                  | 53   | 1      | 20    | src/L1/OptimismPortal.sol:OptimismPortal |
 
 =======================
 ➡ src/L1/SystemConfig.sol:SystemConfig

packages/contracts-bedrock/semver-lock.json

@@ -6,7 +6,7 @@
   "src/L1/L1ERC721Bridge.sol": "0x0e57251c77c052cec3a537b1dd4bb30eaff083a9d2b7bfb4cff342641ffd690d",
   "src/L1/L1StandardBridge.sol": "0xc63b9a99a8e61321930a848c67d950a26356343e12e4376a2b12e03e44e8d8da",
   "src/L1/L2OutputOracle.sol": "0xbc8acf3cdf2ea6107e2f9fad37e68a8f039f289d88b2ce002920c9ae00310450",
-  "src/L1/OptimismPortal.sol": "0xbef5b1ec8c160366b4dc0b089646c5374b2e5413d8c257b821a69a2f0e7cd1d1",
+  "src/L1/OptimismPortal.sol": "0x958ef49270149b9d602a1b93596ca72d5d7bacaddff488fd81b16e4a7019f53c",
   "src/L1/ProtocolVersions.sol": "0x6401853c57ca29e8e9bb38173b5ac9f0856395a325324a08eeb965cc831f0419",
   "src/L1/SuperchainConfig.sol": "0x316e49c6d1d34d3172916015a049039d04364aabe0f0ddfa29472354a1fe6ea9",
   "src/L1/SystemConfig.sol": "0xc24454da676297e0cd718ebf017933c5b1084e389e78ebe2a69d31053ea2f051",

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

@@ -63,8 +63,8 @@ contract Initializer_Test is Bridge_Initializer {
         contracts.push(
             InitializeableContract({
                 target: address(optimismPortal),
-                initCalldata: abi.encodeCall(optimismPortal.initialize, ()),
-                initializedSlotVal: loadInitializedSlot("OptimismPortal", true)
+                initCalldata: abi.encodeCall(optimismPortal.initialize, (superchainConfig)),
+                initializedSlotVal: deploy.loadInitializedSlot("OptimismPortal", true)
             })
         );
         // SystemConfig

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

@@ -896,7 +896,7 @@ contract OptimismPortalUpgradeable_Test is CommonTest {
 
     /// @dev Tests that the proxy cannot be initialized twice.
     function test_initialize_cannotInitProxy_reverts() external {
-        SuperchainConfig superchainConfig = SuperchainConfig(mustGetAddress("SuperchainConfig"));
+        SuperchainConfig superchainConfig = SuperchainConfig(deploy.mustGetAddress("SuperchainConfig"));
         vm.expectRevert("Initializable: contract is already initialized");
         optimismPortal.initialize(superchainConfig);
     }
@@ -904,7 +904,7 @@ contract OptimismPortalUpgradeable_Test is CommonTest {
     /// @dev Tests that the implementation cannot be initialized twice.
     function test_initialize_cannotInitImpl_reverts() external {
         address opImpl = deploy.mustGetAddress("OptimismPortal");
-        SuperchainConfig superchainConfig = SuperchainConfig(mustGetAddress("SuperchainConfig"));
+        SuperchainConfig superchainConfig = SuperchainConfig(deploy.mustGetAddress("SuperchainConfig"));
         vm.expectRevert("Initializable: contract is already initialized");
         OptimismPortal(payable(opImpl)).initialize(superchainConfig);
     }