Skip to content

Conversation

@stevennevins
Copy link
Contributor

Description

Follow up to #18181, to clean up all references to V1 dispute games and make the v2 games the canonical dispute games.

Tests

Updates to existing test coverage for rename

Additional context

n/a

Metadata

Completes #18584

@stevennevins stevennevins force-pushed the feat/remove-v1-dispute-games branch from d2e19fe to f816ff4 Compare January 5, 2026 20:49
@codecov
Copy link

codecov bot commented Jan 5, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.75%. Comparing base (198df93) to head (c00f7cd).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #18714      +/-   ##
===========================================
+ Coverage    73.97%   81.75%   +7.78%     
===========================================
  Files          190      133      -57     
  Lines        11322     6921    -4401     
===========================================
- Hits          8375     5658    -2717     
+ Misses        2801     1263    -1538     
+ Partials       146        0     -146     
Flag Coverage Δ
cannon-go-tests-64 ?
contracts-bedrock-tests 81.75% <100.00%> (+4.14%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...es/contracts-bedrock/src/L1/OPContractsManager.sol 93.31% <100.00%> (+3.45%) ⬆️
...edrock/src/L1/opcm/OPContractsManagerContainer.sol 100.00% <ø> (ø)
...ts-bedrock/src/L1/opcm/OPContractsManagerUtils.sol 94.79% <100.00%> (ø)
...ntracts-bedrock/src/dispute/DisputeGameFactory.sol 100.00% <ø> (ø)
...contracts-bedrock/src/dispute/FaultDisputeGame.sol 98.79% <100.00%> (+98.79%) ⬆️
...ts-bedrock/src/dispute/PermissionedDisputeGame.sol 100.00% <100.00%> (+100.00%) ⬆️
...tracts-bedrock/src/dispute/zk/OptimisticZkGame.sol 81.43% <ø> (ø)

... and 55 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@stevennevins stevennevins marked this pull request as ready for review January 7, 2026 20:57
@stevennevins stevennevins requested review from a team as code owners January 7, 2026 20:57
@stevennevins stevennevins requested a review from ajsutton January 7, 2026 20:57
@stevennevins stevennevins force-pushed the feat/remove-v1-dispute-games branch from 0c7e380 to 96aab06 Compare January 7, 2026 21:26
@stevennevins stevennevins requested review from a team as code owners January 7, 2026 23:36
Remove legacy V1 dispute game contracts and update all references
to use V2 contracts. V2 is now the only implementation.

Deleted:
- src/dispute/FaultDisputeGame.sol (V1)
- src/dispute/PermissionedDisputeGame.sol (V1)
- interfaces/dispute/IFaultDisputeGame.sol (V1)
- interfaces/dispute/IPermissionedDisputeGame.sol (V1)

Updated all imports and references in:
- OPContractsManager and related deploy scripts
- AnchorStateRegistry
- Test files

Closes #18584
Move V2 dispute game contracts out of nested /v2/ folder and rename
to canonical names since V2 is now the only implementation.

File moves:
- src/dispute/v2/FaultDisputeGameV2.sol → src/dispute/FaultDisputeGame.sol
- src/dispute/v2/PermissionedDisputeGameV2.sol → src/dispute/PermissionedDisputeGame.sol
- interfaces/dispute/v2/IFaultDisputeGameV2.sol → interfaces/dispute/IFaultDisputeGame.sol
- interfaces/dispute/v2/IPermissionedDisputeGameV2.sol → interfaces/dispute/IPermissionedDisputeGame.sol

Renames:
- FaultDisputeGameV2 → FaultDisputeGame
- PermissionedDisputeGameV2 → PermissionedDisputeGame
- IFaultDisputeGameV2 → IFaultDisputeGame
- IPermissionedDisputeGameV2 → IPermissionedDisputeGame

Updated all imports and references across ~50 files.
Bytecode changed due to metadata differences from V2 contract removal.
…te snapshots

- Rename faultDisputeGameV2Impl → faultDisputeGameImpl in Implementations struct
- Rename permissionedDisputeGameV2Impl → permissionedDisputeGameImpl
- Rename V2 functions: _registerPermissionedGameV2 → _registerPermissionedGame
- Update setNewPermissionedGameImplV2 → setNewPermissionedGameImpl
- Update setNewPermissionlessGameImplV2 → setNewPermissionlessGameImpl
- Fix stale comment in FaultDisputeGame.sol (240 → 244 bytes)
- Regenerate ABI snapshots with correct struct member names
- Update Go files in op-deployer and op-chain-ops
@stevennevins stevennevins force-pushed the feat/remove-v1-dispute-games branch from 1a90d27 to c00f7cd Compare January 8, 2026 21:21
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