From 959dd1fe94f63045ab1ea75147452d70a18d5f59 Mon Sep 17 00:00:00 2001 From: Matt Solomon Date: Thu, 26 Sep 2024 11:21:18 -0700 Subject: [PATCH 1/3] chore: set init bond default to 0 --- packages/contracts-bedrock/src/L1/OPContractsManager.sol | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol index 93b9b71b00c3..ca28390cb3f8 100644 --- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol +++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol @@ -330,7 +330,6 @@ contract OPContractsManager is ISemver, Initializable { output.disputeGameFactoryProxy.setImplementation( GameTypes.PERMISSIONED_CANNON, IDisputeGame(address(output.permissionedDisputeGame)) ); - output.disputeGameFactoryProxy.setInitBond(GameTypes.PERMISSIONED_CANNON, 0.08 ether); output.disputeGameFactoryProxy.transferOwnership(address(output.opChainProxyAdmin)); impl.logic = address(output.anchorStateRegistryImpl); From 71b7c54e03663c80bb3ad6a1baf844a513d03596 Mon Sep 17 00:00:00 2001 From: Matt Solomon Date: Thu, 26 Sep 2024 11:26:56 -0700 Subject: [PATCH 2/3] test: add initial bond test --- packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol index 9537f6339575..cfb81717ece8 100644 --- a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol +++ b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol @@ -496,8 +496,12 @@ contract DeployOPChain_Test is DeployOPChain_TestBase { assertEq(address(doo.permissionedDisputeGame().challenger()), challenger, "2600"); // TODO once we deploy the Permissionless Dispute Game - // assertEq(address(doo.faultDisputeGame().proposer()), proposer, "2700"); - // assertEq(address(doo.faultDisputeGame().challenger()), challenger, "2800"); + // assertEq(address(doo.faultDisputeGame().proposer()), proposer, "2610"); + // assertEq(address(doo.faultDisputeGame().challenger()), challenger, "2620"); + + // Verify that the initial bonds are zero. + assertEq(doo.disputeGameFactoryProxy().initBonds(GameTypes.CANNON), 0, "2700"); + assertEq(doo.disputeGameFactoryProxy().initBonds(GameTypes.PERMISSIONED_CANNON), 0, "2800"); // Most architecture assertions are handled within the OP Contracts Manager itself and therefore // we only assert on the things that are not visible onchain. From 7718c173d29271a4705f2e7e135d29d6be6e0123 Mon Sep 17 00:00:00 2001 From: Matt Solomon Date: Thu, 26 Sep 2024 11:48:10 -0700 Subject: [PATCH 3/3] chore: semver lock --- packages/contracts-bedrock/semver-lock.json | 4 ++-- packages/contracts-bedrock/src/L1/OPContractsManager.sol | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json index 808b66317094..e3e7c8989d52 100644 --- a/packages/contracts-bedrock/semver-lock.json +++ b/packages/contracts-bedrock/semver-lock.json @@ -32,8 +32,8 @@ "sourceCodeHash": "0xde4df0f9633dc0cdb1c9f634003ea5b0f7c5c1aebc407bc1b2f44c0ecf938649" }, "src/L1/OPContractsManager.sol": { - "initCodeHash": "0x08be0367ee031ee292b74aa9b6fc86c5d65cbbdadd455bb8120748eec79cf2d8", - "sourceCodeHash": "0x84fd2b583ddf44e900c58861ddda103f7bea793d71fb845f76ed28afd1e757bc" + "initCodeHash": "0x292d367322dc74744e8c98c463021e1abae77e57954eef8bac6e2081fcba5644", + "sourceCodeHash": "0xbfcc2032df842e50067d4b4a75ce66cc14cc34e67d35e37e2160215be57d8e2e" }, "src/L1/OptimismPortal.sol": { "initCodeHash": "0xbe2c0c81b3459014f287d8c89cdc0d27dde5d1f44e5d024fa1e4773ddc47c190", diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol index ca28390cb3f8..ed4d0675faf0 100644 --- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol +++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol @@ -124,8 +124,8 @@ contract OPContractsManager is ISemver, Initializable { // -------- Constants and Variables -------- - /// @custom:semver 1.0.0-beta.8 - string public constant version = "1.0.0-beta.8"; + /// @custom:semver 1.0.0-beta.9 + string public constant version = "1.0.0-beta.9"; /// @notice Represents the interface version so consumers know how to decode the DeployOutput struct /// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.