Skip to content

fix: set pdg implementations to non-zero address on v2 codepath #806

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
0xiamflux merged 2 commits into from
Jan 21, 2026
Merged

fix: set pdg implementations to non-zero address on v2 codepath #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2bd142
fix: set fault and permission games implementations to non-zero addre…
0xiamflux Jan 20, 2026
9c4a77e
chore: make faultDisputeGame 0 on DeployOPChain
0xiamflux Jan 21, 2026
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
13 changes: 9 additions & 4 deletions packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";
import { GameTypes } from "src/dispute/lib/Types.sol";
import { GameTypes, GameType } from "src/dispute/lib/Types.sol";

contract DeployOPChain is Script {
/// @notice The default init bond for the dispute games.
Expand Down Expand Up @@ -223,9 +223,13 @@ contract DeployOPChain is Script {
/// @return output_ The output parameters.
function _fromOPCMV2OutputToOutput(IOPContractsManagerV2.ChainContracts memory _chainContracts)
internal
pure
view
returns (Output memory output_)
{
// PERMISSIONED_CANNON must be enabled.
address permissionedDgImpl =
address(_chainContracts.disputeGameFactory.gameImpls(GameTypes.PERMISSIONED_CANNON));

output_ = Output({
opChainProxyAdmin: _chainContracts.proxyAdmin,
addressManager: _chainContracts.addressManager,
Expand All @@ -238,10 +242,11 @@ contract DeployOPChain is Script {
ethLockboxProxy: _chainContracts.ethLockbox,
disputeGameFactoryProxy: _chainContracts.disputeGameFactory,
anchorStateRegistryProxy: _chainContracts.anchorStateRegistry,
// Explicitly set to address(0) maintaining consistency with OPCM v1 behavior.
faultDisputeGame: IFaultDisputeGame(address(0)),
permissionedDisputeGame: IPermissionedDisputeGame(address(0)),
permissionedDisputeGame: IPermissionedDisputeGame(permissionedDgImpl),
delayedWETHPermissionedGameProxy: _chainContracts.delayedWETH,
delayedWETHPermissionlessGameProxy: IDelayedWETH(payable(address(0)))
delayedWETHPermissionlessGameProxy: IDelayedWETH(payable(_chainContracts.delayedWETH))
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,40 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
assertEq(doo.disputeGameFactoryProxy.initBonds(GameTypes.CANNON), 0, "CANNON init bond");
}

/// @notice Tests that faultDisputeGame is set to address(0) and permissionedDisputeGame is set to the correct
/// implementation for GameTypes.PERMISSIONED_CANNON.
function test_run_faultDisputeGamePermissionedCannon_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.OPCM_V2);

_assertDisputeGames(GameTypes.PERMISSIONED_CANNON);
}

/// @notice Tests that faultDisputeGame is set to address(0) when disputeGameType is GameTypes.CANNON.
function test_run_faultDisputeGameCannon_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.OPCM_V2);

_assertDisputeGames(GameTypes.CANNON);
}

/// @notice Tests that faultDisputeGame is set to address(0) when disputeGameType is GameTypes.CANNON_KONA.
function test_run_faultDisputeGameCannonKona_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.OPCM_V2);

_assertDisputeGames(GameTypes.CANNON_KONA);
}

/// @notice Helper function that runs DeployOPChain.run and asserts DeployOPChain.Output.faultDisputeGame is set to
/// address(0) and DeployOPChain.Output.permissionedDisputeGame is set to the correct implementation.
function _assertDisputeGames(GameType _gameType) internal {
deployOPChainInput.disputeGameType = _gameType;

DeployOPChain.Output memory doo = deployOPChain.run(deployOPChainInput);

address expectedPermissioned = address(doo.disputeGameFactoryProxy.gameImpls(GameTypes.PERMISSIONED_CANNON));
assertEq(address(doo.permissionedDisputeGame), expectedPermissioned, "PDG impl");
assertEq(address(doo.faultDisputeGame), address(0), "FDG should be set to address(0)");
}

/// @notice Checks for additional assertions that are not covered by the basic non-zero and code checks in
/// `DeployOPChain.checkOutput`.
/// @param doo The output of the deployment.
Expand Down