Skip to content

fix: opcm2 opd test and sc checks #777

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
0xOneTony merged 1 commit into from
Dec 19, 2025
Merged

fix: opcm2 opd test and sc checks #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 30 additions & 8 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,6 +51,7 @@ 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 @@ -174,7 +175,7 @@ func TestEndToEndBootstrapApplyWithUpgrade(t *testing.T) {
devFeature common.Hash
}{
{"default", common.Hash{}},
{"opcm-v2", deployer.OpcmV2DevFlag},
{"opcm-v2", deployer.OPCMV2DevFlag},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down Expand Up @@ -222,8 +223,8 @@ func TestEndToEndBootstrapApplyWithUpgrade(t *testing.T) {
FaultGameClockExtension: standard.DisputeClockExtension,
FaultGameMaxClockDuration: standard.DisputeMaxClockDuration,
}
if deployer.IsDevFeatureEnabled(tt.devFeature, deployer.OpcmV2DevFlag) {
cfg.DevFeatureBitmap = deployer.OpcmV2DevFlag
if deployer.IsDevFeatureEnabled(tt.devFeature, deployer.OPCMV2DevFlag) {
cfg.DevFeatureBitmap = deployer.OPCMV2DevFlag
}

runEndToEndBootstrapAndApplyUpgradeTest(t, afactsFS, cfg)
Expand Down Expand Up @@ -861,7 +862,7 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat

// Then run the OPCM upgrade
t.Run("upgrade opcm", func(t *testing.T) {
if deployer.IsDevFeatureEnabled(implementationsConfig.DevFeatureBitmap, deployer.OpcmV2DevFlag) {
if deployer.IsDevFeatureEnabled(implementationsConfig.DevFeatureBitmap, deployer.OPCMV2DevFlag) {
t.Skip("Skipping OPCM upgrade for OPCM V2")
return
}
Expand All @@ -883,7 +884,7 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat
require.NoError(t, err, "OPCM upgrade should succeed")
})
t.Run("upgrade opcm v2", func(t *testing.T) {
if !deployer.IsDevFeatureEnabled(implementationsConfig.DevFeatureBitmap, deployer.OpcmV2DevFlag) {
if !deployer.IsDevFeatureEnabled(implementationsConfig.DevFeatureBitmap, deployer.OPCMV2DevFlag) {
t.Skip("Skipping OPCM V2 upgrade for non-OPCM V2 dev feature")
return
}
Expand Down Expand Up @@ -933,6 +934,27 @@ 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, 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'}
Comment on lines +949 to +950
Copy link
Copy Markdown
Member Author

@0xOneTony 0xOneTony Dec 19, 2025

Choose a reason for hiding this comment

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

Should this be something else?

Copy link
Copy Markdown

@0xiamflux 0xiamflux Dec 19, 2025

Choose a reason for hiding this comment

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

I think this is fine for testing purposes.

permissionedArgs, err := abi.Arguments{
{Type: bytes32Type},
{Type: addressType},
{Type: addressType},
}.Pack(testPrestate, testProposer, testChallenger)
require.NoError(t, err)

upgradeConfig := embedded.UpgradeOPChainInput{
Prank: superchainProxyAdminOwner,
Opcm: impls.OpcmV2,
Expand All @@ -943,19 +965,19 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat
Enabled: true,
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypeCannon,
GameArgs: []byte{},
GameArgs: cannonArgs,
},
{
Enabled: true,
InitBond: big.NewInt(1000000000000000000),
GameType: embedded.GameTypePermissionedCannon,
GameArgs: []byte{},
GameArgs: permissionedArgs,
},
{
Enabled: false,
InitBond: big.NewInt(0),
GameType: embedded.GameTypeCannonKona,
GameArgs: []byte{},
GameArgs: []byte{}, // Disabled games don't need args
},
},
ExtraInstructions: []embedded.ExtraInstruction{
Expand Down
1 change: 0 additions & 1 deletion op-deployer/pkg/deployer/upgrade/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ var Commands = cli.Commands{
}, oplog.CLIFlags(deployer.EnvVarPrefix)...),
Action: UpgradeCLI(v410.DefaultUpgrader),
},
// TODO: Add v5.0.0 test case
&cli.Command{
Name: "v5.0.0",
Usage: "upgrades a chain to version v5.0.0 (U17)",
Expand Down
1 change: 0 additions & 1 deletion packages/contracts-bedrock/test/opcm/UpgradeSuperchainConfig.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { UpgradeSuperchainConfig } from "scripts/deploy/UpgradeSuperchainConfig.

// Interfaces
import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { IOPContractsManager } from "interfaces/L1/IOPContractsManager.sol";
import { IOPContractsManagerV2 } from "interfaces/L1/opcm/IOPContractsManagerV2.sol";
import { IOPContractsManagerUtils } from "interfaces/L1/opcm/IOPContractsManagerUtils.sol";

Expand Down