feat/interop: create SystemConfigInterop (#10586)

* contracts-bedrock: create OptimismPortalInterop * contracts-bedrock: add conditional deployment of SystemConfigInterop * contracts-bedrock: drop initializeOptimismPortalInterop in Deploy script * contracts-bedrock: remove checkSystemConfigInterop from ChainAssertions * contracts-bedrock: drop initializeSystemConfigInterop in Deploy script * contracts-bedrock: drop deploySystemConfigInterop from Deploy script * contracts-bedrock: drop SystemConfigInterop from Types * contracts-bedrock: drop legacy import in ChainAssertions * contracts-bedrock: drop legacy fields in Deploy script * contracts-bedrock: drop unnecessary diffs * contracts-bedrock: add conditional deployment of SystemConfigInterop * contracts-bedrock: drop initializeOptimismPortalInterop in Deploy script * contracts-bedrock: create tests for SystemConfigInterop * contracts-bedrock: reorder dependencies in tests for SystemConfigInterop * contracts-bedrock: add SystemConfigInterop to tests Setup * contracts-bedrock: update tests for SystemConfigInterop * contracts-bedrock: restore Deploy script * contracts-bedrock: restore ChainAssertions * contracts-bedrock: restore Types * contracts-bedrock: drop SystemConfigInterop from Setup script * contracts-bedrock: update SystemConfigInterop * contracts-bedrock: add not vm check in SystemConfigInterop tests * contracts-bedrock: update tests for SystemConfigInterop * contracts-bedrock: define internal getter for systemConfigInterop in tests * contracts-bedrock: restrict visibility of function in tests for SystemConfig * contracts-bedrock: fix tests for SystemConfigInterop * contracts-bedrock: fix tests for SystemConfigInterop * contracts-bedrock: reinitialize for gas paying test for SystemConfigInterop * contracts-bedrock: reorder functions in tests for SystemConfigInterop * contracts-bedrock: use ConfigType.GAS_PAYING_TOKEN in tests for SystemConfigInterop * contracts-bedrock: use assumeNotForgeAddress in tests for SystemConfigInterop --------- Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
ethereum-optimism · May 24, 2024 · abe39e9 · abe39e9
1 parent 4c3f63d
commit abe39e9
Show file tree

Hide file tree

Showing 13 changed files with 1,098 additions and 20 deletions.
diff --git a/packages/contracts-bedrock/scripts/Deploy.s.sol b/packages/contracts-bedrock/scripts/Deploy.s.sol
@@ -29,6 +29,7 @@ import { L2OutputOracle } from "src/L1/L2OutputOracle.sol";
 import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC20Factory.sol";
 import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
 import { SystemConfig } from "src/L1/SystemConfig.sol";
+import { SystemConfigInterop } from "src/L1/SystemConfigInterop.sol";
 import { ResourceMetering } from "src/L1/ResourceMetering.sol";
 import { DataAvailabilityChallenge } from "src/L1/DataAvailabilityChallenge.sol";
 import { Constants } from "src/libraries/Constants.sol";
@@ -812,19 +813,20 @@ contract Deploy is Deployer {
     /// @notice Deploy the SystemConfig
     function deploySystemConfig() public broadcast returns (address addr_) {
         console.log("Deploying SystemConfig implementation");
-        SystemConfig config = new SystemConfig{ salt: _implSalt() }();
-
-        save("SystemConfig", address(config));
-        console.log("SystemConfig deployed at %s", address(config));
+        if (cfg.useInterop()) {
+            addr_ = address(new SystemConfigInterop{ salt: _implSalt() }());
+        } else {
+            addr_ = address(new SystemConfig{ salt: _implSalt() }());
+        }
+        save("SystemConfig", addr_);
+        console.log("SystemConfig deployed at %s", addr_);
 
         // Override the `SystemConfig` contract to the deployed implementation. This is necessary
         // to check the `SystemConfig` implementation alongside dependent contracts, which
         // are always proxies.
         Types.ContractSet memory contracts = _proxiesUnstrict();
-        contracts.SystemConfig = address(config);
+        contracts.SystemConfig = addr_;
         ChainAssertions.checkSystemConfig({ _contracts: contracts, _cfg: cfg, _isProxy: false });
-
-        addr_ = address(config);
     }
 
     /// @notice Deploy the L1StandardBridge

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
@@ -52,8 +52,12 @@
     "sourceCodeHash": "0xd6a894e371c2c7182b5960c507491f81c3775dda0efedd29475f7c30ca07b004"
   },
   "src/L1/SystemConfig.sol": {
-    "initCodeHash": "0x6160c9c96d0972e0761ab3b9d4f6d1b8543288c4c3aea9e132008a40e4c5d202",
-    "sourceCodeHash": "0xd27df6e227cc4728471641aec25a1fe6f79a12ce96d3ce6c1774d9411a54133e"
+    "initCodeHash": "0x3324c93485f594bccb2af1a0c5a3551948ae9b347baea371764ce8fe239c39be",
+    "sourceCodeHash": "0xaed39fb8a0ce4b8d7a97ead42074e0c672fa18a58a57227b9d32abe2c3600223"
+  },
+  "src/L1/SystemConfigInterop.sol": {
+    "initCodeHash": "0x710484da188ec16a0ade97d99ecd4f5e910bc87ad01e448db4cf3f0e5050aaee",
+    "sourceCodeHash": "0x40d708140ee6345e146e358c169a191dbbc991782560a2dcbf90ba45a82f7117"
   },
   "src/L2/BaseFeeVault.sol": {
     "initCodeHash": "0x2744d34573be83206d1b75d049d18a7bb37f9058e68c0803e5008c46b0dc2474",

diff --git a/packages/contracts-bedrock/snapshots/abi/SystemConfig.json b/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
@@ -697,7 +697,7 @@
         "type": "string"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {