Skip to content

fix: opcm2 opd test and sc checks#777

Merged
0xOneTony merged 1 commit intosc-feat/opcm2-upgrade-op-chainfrom
fix/opcm2-op-deployer-upgrade-test
Dec 19, 2025
Merged

fix: opcm2 opd test and sc checks#777
0xOneTony merged 1 commit intosc-feat/opcm2-upgrade-op-chainfrom
fix/opcm2-op-deployer-upgrade-test

Conversation

@0xOneTony
Copy link
Copy Markdown
Member

@0xOneTony 0xOneTony commented Dec 19, 2025

Note

Fixes OPCM V2 dev flag references and updates upgrade tests to ABI-encode dispute game args for V2.

  • Tests (op-deployer):
    • op-deployer/pkg/deployer/integration_test/apply_test.go:
      • Use deployer.OPCMV2DevFlag in feature checks and config assignments.
      • ABI-encode GameArgs for V2 upgrades using go-ethereum/accounts/abi:
        • GameTypeCannon: pack bytes32 absolute prestate.
        • GameTypePermissionedCannon: pack bytes32 prestate, address proposer, address challenger.
        • Keep args empty for disabled games.
  • CLI:
    • op-deployer/pkg/deployer/upgrade/flags.go: minor cleanup (remove TODO comment).
  • Contracts tests:
    • packages/contracts-bedrock/test/opcm/UpgradeSuperchainConfig.t.sol: remove unused IOPContractsManager import.

Written by Cursor Bugbot for commit 2af6887. This will update automatically on new commits. Configure here.

Comment on lines +949 to +950
testProposer := common.Address{'P'}
testChallenger := common.Address{'C'}
Copy link
Copy Markdown
Member Author

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

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.

@0xOneTony 0xOneTony merged commit fdd96c8 into sc-feat/opcm2-upgrade-op-chain Dec 19, 2025
2 checks passed
@0xiamflux 0xiamflux deleted the fix/opcm2-op-deployer-upgrade-test branch December 19, 2025 13:53
0xiamflux added a commit that referenced this pull request Dec 19, 2025
…-optimism#18593)

* WIP: opcmv2 upgrade op chain (#752)

* feat: upgrade op chain wip

* feat: add deployv2 wip

* fix: deployerv2 wip

* refactor: remove additional V2 version of scripts

* refactor: adds OPCM v2 support for UpgradeOPChain.s.sol

* refactor: adds OPCM v2 support for UpgradeSuperchainConfig.s.sol

* fix: uses correct json key for upgradeInput

* fix: uses correct feature flag for OPCM v2 in devfeatures.go

* chore: add json tag to ExtraInstruction

---------

Co-authored-by: Flux <175354924+0xiamflux@users.noreply.github.com>

* feat: adds intermediary struct for op-deployer upgrade (#759)

* feat: adds intermediary struct for op-deployer upgrade

* chore: moved upgrade scripts to v6_0_0

* chore: remove v2 go scripts

* refactor: make v2_0_0 upgrade path to support both OPCM v1 and v2

* feat: add support for both OPCM v1 and v2 on embedded upgrade

* refactor: make v6_0_0 fall back to v2_0_0

* refactor: add extra instructions for upgrade superchain input

* test: fix op-deployer tests

* chore: remove deploy OP chain test step

* test: use systemconfig proxy address

* fix: remove the unneeded proxyadmin in OPChainConfig in op-deployer

* refactor: revert v2_0_0 changes in favor of a new v6_0_0 that supports OPCMv2

* feat: add v6_0_0 upgrade

* fix: check for 0 len OPChainConfigs

* chore: pre-pr ready

* Merge pull request #764 from defi-wonderland/fix/opcm2-upgradeopchain-comments

fix: opcm2 upgradeopchain comments

* refactor: remove enshrined v7_0_0 upgrade in op-deployer (#766)

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

* test: add missing extra instructions for OPCM v2 input

* fix: add correct game type for cannon kona

* fix: opcm2 opd test and sc checks (#777)

* chore: set test timeout to 30s (#778)

---------

Co-authored-by: niha <205694301+0xniha@users.noreply.github.com>
Co-authored-by: 0xOneTony <112496816+0xOneTony@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants