contracts-bedrock: handle disabled cannon fork state#21621
Merged
Conversation
ajsutton
force-pushed
the
aj/fix/post-u19-fork-upgrade-tests
branch
from
5cc4c2a to
29455df
Compare
ajsutton
changed the title
ajsutton
force-pushed
the
aj/fix/post-u19-fork-upgrade-tests
branch
9 times, most recently
from
233d90f to
0d0cee4
Compare
ajsutton
force-pushed
the
aj/fix/post-u19-fork-upgrade-tests
branch
from
0d0cee4 to
c665ea9
Compare
mds1
reviewed
Jul 6, 2026
mds1
approved these changes
Jul 6, 2026
Ethnical
approved these changes
Jul 6, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
wwared
approved these changes
Jul 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updates the contracts fork test harness for post-U19 live network state.
U19 disables the legacy CANNON permissionless game on OP/Ink and leaves CANNON_KONA as the respected live game. The fork setup was still reading DelayedWETH and upgrade init bonds from CANNON, so fork upgrade tests could fail shared setup with invalid game configs.
This changes the harness to select the live permissionless game from AnchorStateRegistry first, fall back across known permissionless game types, and use a default nonzero permissionless init bond when simulating upgrade configs for a game type that is disabled on the live fork.
Validation:
mise exec -- forge buildmise exec -- just build-go-ffimise exec -- forge test --match-path test/L1/opcm/OPContractsManagerV2.t.sol --match-contract OPContractsManagerV2_Upgrade_Test(skips withoutFORK_TEST)Full live-network
just test-upgradevalidation is left to CI because no localETH_RPC_URLarchive RPC is configured in this shell.