Skip to content
Merged
Changes from all commits
Commits
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: 9 additions & 15 deletions op-deployer/pkg/deployer/manage/migrate_test.go
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
Comment thread
0xniha marked this conversation as resolved.
},
},
ExtraInstructions: []embedded.ExtraInstruction{
Expand Down