Skip to content

Commit bf72a8c

Browse files
committed
fix: tests
1 parent 2da84c8 commit bf72a8c

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

op-deployer/pkg/deployer/devfeatures.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ var (
1717

1818
// DeployV2DisputeGames enables deployment of V2 dispute game contracts.
1919
DeployV2DisputeGames = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000100")
20+
21+
// CustomGasToken enables the custom gas token.
22+
CustomGasToken = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000001000")
2023
)
2124

2225
// IsDevFeatureEnabled checks if a specific development feature is enabled in a feature bitmap.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func TestEndToEndApply(t *testing.T) {
244244
}
245245
// CGT config for OPCM
246246
intent.GlobalDeployOverrides = map[string]interface{}{
247-
"devFeatureBitmap": common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000100"),
247+
"devFeatureBitmap": deployer.CustomGasToken,
248248
}
249249

250250
require.NoError(t, deployer.ApplyPipeline(ctx, deployer.ApplyPipelineOpts{

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
"sourceCodeHash": "0xfca613b5d055ffc4c3cbccb0773ddb9030abedc1aa6508c9e2e7727cc0cd617b"
2121
},
2222
"src/L1/OPContractsManager.sol:OPContractsManager": {
23-
"initCodeHash": "0x90527840505f5c7a74e2c4492dda6fa7f73c90ef68fa5a36bed2ce874b2ea226",
24-
"sourceCodeHash": "0xf022e035aedf6c7979160ef59d18dd9faa8450879eca55447858709c8c521eb0"
23+
"initCodeHash": "0x6dfe2a337e7690287b571c360dc972101fb2c93ab17b2bcd2cb1ef5e6b858e59",
24+
"sourceCodeHash": "0x4e2237a9a11581b3ea9800fe636e201f99d9e4166f026824dfd79fc8f2c1de11"
2525
},
2626
"src/L1/OPContractsManagerStandardValidator.sol:OPContractsManagerStandardValidator": {
2727
"initCodeHash": "0xcc5dacb9e1c2b9395aa5f9c300f03c18af1ff5a9efd6a7ce4d5135dfbe7b1e2b",
2828
"sourceCodeHash": "0x0c63dc35ccf59cc583fbbfc0f2251ba95d026c11540f08806a48cb3934e73ae4"
2929
},
3030
"src/L1/OptimismPortal2.sol:OptimismPortal2": {
31-
"initCodeHash": "0x5bf576ea7f566e402a997204988471fc9b971410aa9dff8fe810b10baf6b7456",
32-
"sourceCodeHash": "0xcde7f2a838d13bf3bd2140a686d0c31472b637ab84d18ee46963977f036f80eb"
31+
"initCodeHash": "0x2c01bc6c0a55a1a27263224e05c1b28703ff85c61075bae7ab384b3043820ed2",
32+
"sourceCodeHash": "0x16fb96f4d29a10d03b3b9c70edf56df51e97c2a1a3f0ba36aae79469b446ad5c"
3333
},
3434
"src/L1/OptimismPortalInterop.sol:OptimismPortalInterop": {
3535
"initCodeHash": "0x087281cd2a48e882648c09fa90bfcca7487d222e16300f9372deba6b2b8ccfad",
@@ -44,8 +44,8 @@
4444
"sourceCodeHash": "0xbf344c4369b8cb00ec7a3108f72795747f3bc59ab5b37ac18cf21e72e2979dbf"
4545
},
4646
"src/L1/SystemConfig.sol:SystemConfig": {
47-
"initCodeHash": "0x6e1e3cf76f08916bf6a3aed2b68772bd5ade935db4f0f876e682dc7a586334fb",
48-
"sourceCodeHash": "0x006e3560f8b2e17133eb10a116916798ddc4345a7b006f8504dab69e810adb1c"
47+
"initCodeHash": "0x7c560a18cde0e6139c263d61fec2e8be53dc171ccd7f791b56e100bcd90237f8",
48+
"sourceCodeHash": "0x04ef4b7b4248fb06b098370f3e12434aa16723c23efcef73b77bf07e3475c124"
4949
},
5050
"src/L2/BaseFeeVault.sol:BaseFeeVault": {
5151
"initCodeHash": "0x9b664e3d84ad510091337b4aacaa494b142512e2f6f7fbcdb6210ed62ca9b885",
@@ -251,4 +251,4 @@
251251
"initCodeHash": "0x2bfce526f82622288333d53ca3f43a0a94306ba1bab99241daa845f8f4b18bd4",
252252
"sourceCodeHash": "0xf49d7b0187912a6bb67926a3222ae51121e9239495213c975b3b4b217ee57a1b"
253253
}
254-
}
254+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,9 +1823,9 @@ contract OPContractsManager is ISemver {
18231823

18241824
// -------- Constants and Variables --------
18251825

1826-
/// @custom:semver 3.5.0
1826+
/// @custom:semver 3.6.0
18271827
function version() public pure virtual returns (string memory) {
1828-
return "3.5.0";
1828+
return "3.6.0";
18291829
}
18301830

18311831
OPContractsManagerGameTypeAdder public immutable opcmGameTypeAdder;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { CommonTest } from "test/setup/CommonTest.sol";
88

99
// Libraries
1010
import { Predeploys } from "src/libraries/Predeploys.sol";
11+
import { DevFeatures } from "src/libraries/DevFeatures.sol";
1112

1213
// Contracts
1314
import { ILiquidityController } from "interfaces/L2/ILiquidityController.sol";
@@ -102,7 +103,7 @@ contract NativeAssetLiquidity_Fundooor is StdUtils {
102103
_amount = bound(_amount, 0, address(this).balance);
103104

104105
// action: fund _amount
105-
nativeAssetLiquidity.fund{ value: _amount }();
106+
vm.deal(address(nativeAssetLiquidity), _amount);
106107

107108
// postcondition: nil here (in the invariant tests)
108109
// update ghost variables
@@ -189,7 +190,7 @@ contract CustomGasToken_Invariants_Test is CommonTest {
189190

190191
/// @notice Test setup.
191192
function setUp() public override {
192-
enableCustomGasToken();
193+
skipIfDevFeatureDisabled(DevFeatures.CUSTOM_GAS_TOKEN);
193194
super.setUp();
194195

195196
randomActor = new RandomActor();

0 commit comments

Comments
 (0)