fix: tests

Author: agusduha

op-deployer/pkg/deployer/devfeatures.go

@@ -17,6 +17,9 @@ var (
 
 	// DeployV2DisputeGames enables deployment of V2 dispute game contracts.
 	DeployV2DisputeGames = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000100")
+
+	// CustomGasToken enables the custom gas token.
+	CustomGasToken = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000001000")
 )
 
 // IsDevFeatureEnabled checks if a specific development feature is enabled in a feature bitmap.

op-deployer/pkg/deployer/integration_test/apply_test.go

@@ -244,7 +244,7 @@ func TestEndToEndApply(t *testing.T) {
 		}
 		// CGT config for OPCM
 		intent.GlobalDeployOverrides = map[string]interface{}{
-			"devFeatureBitmap": common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000100"),
+			"devFeatureBitmap": deployer.CustomGasToken,
 		}
 
 		require.NoError(t, deployer.ApplyPipeline(ctx, deployer.ApplyPipelineOpts{

packages/contracts-bedrock/snapshots/semver-lock.json

@@ -20,16 +20,16 @@
     "sourceCodeHash": "0xfca613b5d055ffc4c3cbccb0773ddb9030abedc1aa6508c9e2e7727cc0cd617b"
   },
   "src/L1/OPContractsManager.sol:OPContractsManager": {
-    "initCodeHash": "0x90527840505f5c7a74e2c4492dda6fa7f73c90ef68fa5a36bed2ce874b2ea226",
-    "sourceCodeHash": "0xf022e035aedf6c7979160ef59d18dd9faa8450879eca55447858709c8c521eb0"
+    "initCodeHash": "0x6dfe2a337e7690287b571c360dc972101fb2c93ab17b2bcd2cb1ef5e6b858e59",
+    "sourceCodeHash": "0x4e2237a9a11581b3ea9800fe636e201f99d9e4166f026824dfd79fc8f2c1de11"
   },
   "src/L1/OPContractsManagerStandardValidator.sol:OPContractsManagerStandardValidator": {
     "initCodeHash": "0xcc5dacb9e1c2b9395aa5f9c300f03c18af1ff5a9efd6a7ce4d5135dfbe7b1e2b",
     "sourceCodeHash": "0x0c63dc35ccf59cc583fbbfc0f2251ba95d026c11540f08806a48cb3934e73ae4"
   },
   "src/L1/OptimismPortal2.sol:OptimismPortal2": {
-    "initCodeHash": "0x5bf576ea7f566e402a997204988471fc9b971410aa9dff8fe810b10baf6b7456",
-    "sourceCodeHash": "0xcde7f2a838d13bf3bd2140a686d0c31472b637ab84d18ee46963977f036f80eb"
+    "initCodeHash": "0x2c01bc6c0a55a1a27263224e05c1b28703ff85c61075bae7ab384b3043820ed2",
+    "sourceCodeHash": "0x16fb96f4d29a10d03b3b9c70edf56df51e97c2a1a3f0ba36aae79469b446ad5c"
   },
   "src/L1/OptimismPortalInterop.sol:OptimismPortalInterop": {
     "initCodeHash": "0x087281cd2a48e882648c09fa90bfcca7487d222e16300f9372deba6b2b8ccfad",
@@ -44,8 +44,8 @@
     "sourceCodeHash": "0xbf344c4369b8cb00ec7a3108f72795747f3bc59ab5b37ac18cf21e72e2979dbf"
   },
   "src/L1/SystemConfig.sol:SystemConfig": {
-    "initCodeHash": "0x6e1e3cf76f08916bf6a3aed2b68772bd5ade935db4f0f876e682dc7a586334fb",
-    "sourceCodeHash": "0x006e3560f8b2e17133eb10a116916798ddc4345a7b006f8504dab69e810adb1c"
+    "initCodeHash": "0x7c560a18cde0e6139c263d61fec2e8be53dc171ccd7f791b56e100bcd90237f8",
+    "sourceCodeHash": "0x04ef4b7b4248fb06b098370f3e12434aa16723c23efcef73b77bf07e3475c124"
   },
   "src/L2/BaseFeeVault.sol:BaseFeeVault": {
     "initCodeHash": "0x9b664e3d84ad510091337b4aacaa494b142512e2f6f7fbcdb6210ed62ca9b885",
@@ -251,4 +251,4 @@
     "initCodeHash": "0x2bfce526f82622288333d53ca3f43a0a94306ba1bab99241daa845f8f4b18bd4",
     "sourceCodeHash": "0xf49d7b0187912a6bb67926a3222ae51121e9239495213c975b3b4b217ee57a1b"
   }
-}
+}

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

@@ -1823,9 +1823,9 @@ contract OPContractsManager is ISemver {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 3.5.0
+    /// @custom:semver 3.6.0
     function version() public pure virtual returns (string memory) {
-        return "3.5.0";
+        return "3.6.0";
     }
 
     OPContractsManagerGameTypeAdder public immutable opcmGameTypeAdder;

packages/contracts-bedrock/test/invariants/CustomGasToken.t.sol

@@ -8,6 +8,7 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { DevFeatures } from "src/libraries/DevFeatures.sol";
 
 // Contracts
 import { ILiquidityController } from "interfaces/L2/ILiquidityController.sol";
@@ -102,7 +103,7 @@ contract NativeAssetLiquidity_Fundooor is StdUtils {
         _amount = bound(_amount, 0, address(this).balance);
 
         // action: fund _amount
-        nativeAssetLiquidity.fund{ value: _amount }();
+        vm.deal(address(nativeAssetLiquidity), _amount);
 
         // postcondition: nil here (in the invariant tests)
         // update ghost variables
@@ -189,7 +190,7 @@ contract CustomGasToken_Invariants_Test is CommonTest {
 
     /// @notice Test setup.
     function setUp() public override {
-        enableCustomGasToken();
+        skipIfDevFeatureDisabled(DevFeatures.CUSTOM_GAS_TOKEN);
         super.setUp();
 
         randomActor = new RandomActor();