Merge pull request #8454 from ethereum-optimism/ctb/fix-spacer

contracts-bedrock: make spacer variable non-public

packages/contracts-bedrock/.gas-snapshot

@@ -8,4 +8,4 @@ GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (g
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 86629)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68462)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68911)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 153527)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 153571)
\ No newline at end of file

packages/contracts-bedrock/semver-lock.json

@@ -28,8 +28,8 @@
     "sourceCodeHash": "0xb99ee58a672ed59f6bf529a618d4949f198bfda7c65664c9b2a2657070756c69"
   },
   "src/L1/OptimismPortal.sol": {
-    "initCodeHash": "0xc79a302dde8780d8c640e9311a8f5f8959f05b42a60a6c869fb2c2c5a54f9062",
-    "sourceCodeHash": "0x8fe20e758082efde3a87ffc9d7570fd9237a2defd6a0b42f2fd8b4f260b8a1bf"
+    "initCodeHash": "0xc44238f1b97d7958baad77aea821de399cff040ab987c66946c1e3c6d6e20333",
+    "sourceCodeHash": "0x62908d2190dd0294ed4cde583e85233d8acfb118bae219957353746c5db3b4c3"
   },
   "src/L1/ProtocolVersions.sol": {
     "initCodeHash": "0x72cd467e8bcf019c02675d72ab762e088bcc9cc0f1a4e9f587fa4589f7fdd1b8",

packages/contracts-bedrock/snapshots/abi/OptimismPortal.json

@@ -509,19 +509,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "spacer_53_0_1",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "superchainConfig",

packages/contracts-bedrock/src/L1/OptimismPortal.sol

@@ -61,7 +61,7 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
     /// @custom:legacy
     /// @custom:spacer paused
     /// @notice Spacer for backwards compatibility.
-    bool public spacer_53_0_1;
+    bool private spacer_53_0_1;
 
     /// @notice The address of the Superchain Config contract.
     SuperchainConfig public superchainConfig;
@@ -101,8 +101,8 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 2.0.0
-    string public constant version = "2.0.0";
+    /// @custom:semver 2.1.0
+    string public constant version = "2.1.0";
 
     /// @notice Constructs the OptimismPortal contract.
     /// @param _l2Oracle Address of the L2OutputOracle contract.

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

@@ -155,7 +155,6 @@ contract Authorization_Test is CommonTest {
         _addSpec("OptimismPortal", _getSel("paused()"), false);
         _addSpec("OptimismPortal", OptimismPortal.proveWithdrawalTransaction.selector, true); // pauseable
         _addSpec("OptimismPortal", _getSel("provenWithdrawals(bytes32)"), false);
-        _addSpec("OptimismPortal", _getSel("spacer_53_0_1()"), false);
         _addSpec("OptimismPortal", _getSel("superchainConfig()"), false);
         _addSpec("OptimismPortal", _getSel("systemConfig()"), false);
         _addSpec("OptimismPortal", _getSel("version()"), false);