Skip to content

feat: Improve Game Args interface #18952

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
smartcontracts merged 3 commits into from
Jan 31, 2026
Merged

feat: Improve Game Args interface #18952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6acd164
feat: Game Args struct instead of raw bytes (#813)
0xiamflux Jan 27, 2026
0a6e397
fix: tests (#823)
0xiamflux Jan 28, 2026
f5ae94f
fix: add revert case for invalid game type (#825)
0xniha Jan 29, 2026
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
24 changes: 8 additions & 16 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 @@ -51,7 +51,6 @@ import (
"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
"github.com/ethereum-optimism/optimism/op-core/predeploys"
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
Expand Down Expand Up @@ -935,24 +934,12 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat

// Then test upgrade on the V2-deployed chain
t.Run("upgrade chain v2", func(t *testing.T) {
// ABI-encode game args for FaultDisputeGameConfig{absolutePrestate}
bytes32Type := deployer.Bytes32Type
addressType := deployer.AddressType

// FaultDisputeGameConfig just needs absolutePrestate (bytes32)
testPrestate := common.Hash{'P', 'R', 'E', 'S', 'T', 'A', 'T', 'E'}
cannonArgs, err := abi.Arguments{{Type: bytes32Type}}.Pack(testPrestate)
require.NoError(t, err)

// PermissionedDisputeGameConfig needs absolutePrestate, proposer, challenger
testProposer := common.Address{'P'}
testChallenger := common.Address{'C'}
permissionedArgs, err := abi.Arguments{
{Type: bytes32Type},
{Type: addressType},
{Type: addressType},
}.Pack(testPrestate, testProposer, testChallenger)
require.NoError(t, err)

upgradeConfig := embedded.UpgradeOPChainInput{
Prank: superchainProxyAdminOwner,
Expand All @@ -964,19 +951,24 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat
Enabled: true,
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypeCannon,
GameArgs: cannonArgs,
FaultDisputeGameConfig: &embedded.FaultDisputeGameConfig{
AbsolutePrestate: testPrestate,
},
},
{
Enabled: true,
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypePermissionedCannon,
GameArgs: permissionedArgs,
PermissionedDisputeGameConfig: &embedded.PermissionedDisputeGameConfig{
AbsolutePrestate: testPrestate,
Proposer: testProposer,
Challenger: testChallenger,
},
},
{
Enabled: false,
InitBond: big.NewInt(0),
GameType: embedded.GameTypeCannonKona,
GameArgs: []byte{}, // Disabled games don't need args
},
},
ExtraInstructions: []embedded.ExtraInstruction{
Expand Down
23 changes: 8 additions & 15 deletions op-deployer/pkg/deployer/integration_test/cli/manage_add_game_type_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum-optimism/optimism/op-service/testutils"
"github.com/ethereum-optimism/optimism/op-service/testutils/devnet"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/params"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -134,23 +133,12 @@ func TestManageAddGameTypeV2_Integration(t *testing.T) {
_, afactsFS := testutil.LocalArtifacts(t)
shared.RunPastUpgradesWithRPC(t, runner.l1RPC, afactsFS, lgr, 11155111, l1ProxyAdminOwner, systemConfigProxy)

bytes32Type := deployer.Bytes32Type
addressType := deployer.AddressType

// FaultDisputeGameConfig just needs absolutePrestate (bytes32)
testPrestate := common.Hash{'P', 'R', 'E', 'S', 'T', 'A', 'T', 'E'}
cannonArgs, err := abi.Arguments{{Type: bytes32Type}}.Pack(testPrestate)
require.NoError(t, err)

// PermissionedDisputeGameConfig needs absolutePrestate, proposer, challenger
testProposer := common.Address{'P'}
testChallenger := common.Address{'C'}
permissionedArgs, err := abi.Arguments{
{Type: bytes32Type},
{Type: addressType},
{Type: addressType},
}.Pack(testPrestate, testProposer, testChallenger)
require.NoError(t, err)

testConfig := embedded.UpgradeOPChainInput{
Prank: l1ProxyAdminOwner,
Expand All @@ -162,19 +150,24 @@ func TestManageAddGameTypeV2_Integration(t *testing.T) {
Enabled: true,
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypeCannon,
GameArgs: cannonArgs,
FaultDisputeGameConfig: &embedded.FaultDisputeGameConfig{
AbsolutePrestate: testPrestate,
},
},
{
Enabled: true,
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypePermissionedCannon,
GameArgs: permissionedArgs,
PermissionedDisputeGameConfig: &embedded.PermissionedDisputeGameConfig{
AbsolutePrestate: testPrestate,
Proposer: testProposer,
Challenger: testChallenger,
},
},
{
Enabled: false,
InitBond: big.NewInt(0),
GameType: embedded.GameTypeCannonKona,
GameArgs: []byte{}, // Disabled games don't need args
},
},
ExtraInstructions: []embedded.ExtraInstruction{
Expand Down
29 changes: 11 additions & 18 deletions op-deployer/pkg/deployer/integration_test/shared/shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@ import (
"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
"github.com/ethereum-optimism/optimism/op-chain-ops/opcmregistry"
"github.com/ethereum-optimism/optimism/op-chain-ops/script"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/upgrade/embedded"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
Expand Down Expand Up @@ -255,37 +253,32 @@ func buildV2OPCMUpgradeConfig(t *testing.T, prank, opcmAddr, systemConfigProxy c

// Build dispute game configs with dummy prestates
// CANNON and PERMISSIONED_CANNON are the standard game types
cannonArgs, err := abi.Arguments{{Type: deployer.Bytes32Type}}.Pack(opcmregistry.DummyCannonPrestate)
require.NoError(t, err)

permissionedArgs, err := abi.Arguments{
{Type: deployer.Bytes32Type},
{Type: deployer.AddressType},
{Type: deployer.AddressType},
}.Pack(opcmregistry.DummyCannonPrestate, common.Address{}, common.Address{})
require.NoError(t, err)

cannonKonaArgs, err := abi.Arguments{{Type: deployer.Bytes32Type}}.Pack(opcmregistry.DummyCannonKonaPrestate)
require.NoError(t, err)

disputeGameConfigs := []embedded.DisputeGameConfig{
{
Enabled: true,
InitBond: big.NewInt(0),
GameType: embedded.GameTypeCannon,
GameArgs: cannonArgs,
FaultDisputeGameConfig: &embedded.FaultDisputeGameConfig{
AbsolutePrestate: opcmregistry.DummyCannonPrestate,
},
},
{
Enabled: true,
InitBond: big.NewInt(0),
GameType: embedded.GameTypePermissionedCannon,
GameArgs: permissionedArgs,
PermissionedDisputeGameConfig: &embedded.PermissionedDisputeGameConfig{
AbsolutePrestate: opcmregistry.DummyCannonPrestate,
Proposer: common.Address{},
Challenger: common.Address{},
},
},
{
Enabled: true,
InitBond: big.NewInt(0),
GameType: embedded.GameTypeCannonKona,
GameArgs: cannonKonaArgs,
FaultDisputeGameConfig: &embedded.FaultDisputeGameConfig{
AbsolutePrestate: opcmregistry.DummyCannonKonaPrestate,
},
},
}

Expand Down
24 changes: 9 additions & 15 deletions op-deployer/pkg/deployer/manage/migrate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,25 +562,13 @@ func upgradeChainV1(t *testing.T, host *script.Host, proxyAdminOwner common.Addr
// Upgrades a chain via OPCM V2 to ensure the OptimismPortal is upgraded to OptimismPortalInterop.
func upgradeChainV2(t *testing.T, host *script.Host, proxyAdminOwner common.Address, systemConfigProxy common.Address, opcm common.Address) {
// ABI-encode game args for FaultDisputeGameConfig{absolutePrestate}
bytes32Type, err := abi.NewType("bytes32", "", nil)
require.NoError(t, err)
addressType, err := abi.NewType("address", "", nil)
require.NoError(t, err)

// FaultDisputeGameConfig just needs absolutePrestate (bytes32)
testPrestate := common.Hash{'P', 'R', 'E', 'S', 'T', 'A', 'T', 'E'}
cannonArgs, err := abi.Arguments{{Type: bytes32Type}}.Pack(testPrestate)
require.NoError(t, err)

// PermissionedDisputeGameConfig needs absolutePrestate, proposer, challenger
testProposer := common.Address{'P'}
testChallenger := common.Address{'C'}
permissionedArgs, err := abi.Arguments{
{Type: bytes32Type},
{Type: addressType},
{Type: addressType},
}.Pack(testPrestate, testProposer, testChallenger)
require.NoError(t, err)

upgradeConfig := embedded.UpgradeOPChainInput{
Prank: proxyAdminOwner,
Expand All @@ -592,19 +580,25 @@ func upgradeChainV2(t *testing.T, host *script.Host, proxyAdminOwner common.Addr
Enabled: true,
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypeCannon,
GameArgs: cannonArgs,
FaultDisputeGameConfig: &embedded.FaultDisputeGameConfig{
AbsolutePrestate: testPrestate,
},
},
{
Enabled: true,
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypePermissionedCannon,
GameArgs: permissionedArgs,
PermissionedDisputeGameConfig: &embedded.PermissionedDisputeGameConfig{
AbsolutePrestate: testPrestate,
Proposer: testProposer,
Challenger: testChallenger,
},
},
{
Enabled: false,
InitBond: big.NewInt(0),
GameType: embedded.GameTypeCannonKona,
GameArgs: []byte{}, // Disabled games don't need args
// Disabled games don't need args
},
},
ExtraInstructions: []embedded.ExtraInstruction{
Expand Down
Loading