Skip to content

test: use correct game type and pass correct extra instruction to UpgradeOPChain #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xiamflux merged 2 commits into from
Dec 18, 2025
Merged

test: use correct game type and pass correct extra instruction to UpgradeOPChain #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4577784
test: add missing extra instructions for OPCM v2 input
0xiamflux Dec 18, 2025
04fe180
fix: add correct game type for cannon kona
0xiamflux Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions op-deployer/pkg/deployer/integration_test/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
}
Expand Down Expand Up @@ -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),
Copy link
Copy Markdown
Member

@0xOneTony 0xOneTony Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why does this change?

Copy link
Copy Markdown
Author

@0xiamflux 0xiamflux Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In OPMC v2 enabled game types are required to have a non-zero init bond, 1 ether just seemed appropriate.

GameType: embedded.GameTypeCannon,
GameArgs: []byte{},
},
{
Enabled: true,
InitBond: big.NewInt(0),
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypePermissionedCannon,
GameArgs: []byte{},
},
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion op-deployer/pkg/deployer/upgrade/embedded/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down