diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go index 25383547f2a..63da290d7ab 100644 --- a/op-deployer/pkg/deployer/integration_test/apply_test.go +++ b/op-deployer/pkg/deployer/integration_test/apply_test.go @@ -217,10 +217,15 @@ func TestEndToEndBootstrapApplyWithUpgrade(t *testing.T) { CacheDir: testCacheDir, Logger: lgr, Challenger: common.Address{'C'}, + FaultGameMaxGameDepth: standard.DisputeMaxGameDepth, + FaultGameSplitDepth: standard.DisputeSplitDepth, + FaultGameClockExtension: standard.DisputeClockExtension, + FaultGameMaxClockDuration: standard.DisputeMaxClockDuration, } if deployer.IsDevFeatureEnabled(tt.devFeature, deployer.OpcmV2DevFlag) { cfg.DevFeatureBitmap = deployer.OpcmV2DevFlag } + runEndToEndBootstrapAndApplyUpgradeTest(t, afactsFS, cfg) }) } @@ -880,13 +885,13 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat DisputeGameConfigs: []embedded.DisputeGameConfig{ { Enabled: true, - InitBond: big.NewInt(0), + InitBond: big.NewInt(1000000000000000000), GameType: embedded.GameTypeCannon, GameArgs: []byte{}, }, { Enabled: true, - InitBond: big.NewInt(0), + InitBond: big.NewInt(1000000000000000000), GameType: embedded.GameTypePermissionedCannon, GameArgs: []byte{}, }, @@ -902,9 +907,14 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat Key: "PermittedProxyDeployment", Data: []byte("DelayedWETH"), }, + { + Key: "overrides.cfg.useCustomGasToken", + Data: make([]byte, 32), + }, }, }, } + upgradeConfigBytes, err := json.Marshal(upgradeConfig) require.NoError(t, err, "UpgradeOPChainV2Input should marshal to JSON") err = embedded.DefaultUpgrader.Upgrade(host, upgradeConfigBytes) diff --git a/op-deployer/pkg/deployer/upgrade/embedded/upgrade.go b/op-deployer/pkg/deployer/upgrade/embedded/upgrade.go index eeec2dafa58..b36d805e3f2 100644 --- a/op-deployer/pkg/deployer/upgrade/embedded/upgrade.go +++ b/op-deployer/pkg/deployer/upgrade/embedded/upgrade.go @@ -56,7 +56,7 @@ type GameType uint32 const ( GameTypeCannon GameType = 0 GameTypePermissionedCannon GameType = 1 - GameTypeCannonKona GameType = 2 + GameTypeCannonKona GameType = 8 ) // OPChainConfig represents the configuration for an OP Chain upgrade on OPCM v1.