fix: changing dispute game types.

ethereum-optimism · Oct 2, 2024 · c26adcf · c26adcf
1 parent 032d490
commit c26adcf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/op-chain-ops/deployer/opcm/opchain.go b/op-chain-ops/deployer/opcm/opchain.go
@@ -30,16 +30,17 @@ type DeployOPChainInput struct {
 	Proposer               common.Address
 	Challenger             common.Address
 
-	BasefeeScalar           uint32
-	BlobBaseFeeScalar       uint32
-	L2ChainId               *big.Int
-	OpcmProxy               common.Address
-	SaltMixer               string
-	GasLimit                uint64
+	BasefeeScalar     uint32
+	BlobBaseFeeScalar uint32
+	L2ChainId         *big.Int
+	OpcmProxy         common.Address
+	SaltMixer         string
+	GasLimit          uint64
+
 	DisputeGameType         uint32
 	DisputeAbsolutePrestate common.Hash
-	DisputeMaxGameDepth     uint64
-	DisputeSplitDepth       uint64
+	DisputeMaxGameDepth     *big.Int
+	DisputeSplitDepth       *big.Int
 	DisputeClockExtension   uint64
 	DisputeMaxClockDuration uint64
 }
@@ -134,8 +135,8 @@ type opcmDeployInput struct {
 	GasLimit                uint64
 	DisputeGameType         uint32
 	DisputeAbsolutePrestate common.Hash
-	DisputeMaxGameDepth     uint64
-	DisputeSplitDepth       uint64
+	DisputeMaxGameDepth     *big.Int
+	DisputeSplitDepth       *big.Int
 	DisputeClockExtension   uint64
 	DisputeMaxClockDuration uint64
 }

diff --git a/op-chain-ops/deployer/pipeline/opchain.go b/op-chain-ops/deployer/pipeline/opchain.go
@@ -43,8 +43,8 @@ func DeployOPChain(ctx context.Context, env *Env, artifactsFS foundry.StatDirFs,
 		GasLimit:                30_000_000,
 		DisputeGameType:         1, // PERMISSIONED_CANNON Game Type
 		DisputeAbsolutePrestate: common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c"),
-		DisputeMaxGameDepth:     73,
-		DisputeSplitDepth:       30,
+		DisputeMaxGameDepth:     big.NewInt(73),
+		DisputeSplitDepth:       big.NewInt(30),
 		DisputeClockExtension:   10800,  // 3 hours (input in seconds)
 		DisputeMaxClockDuration: 302400, // 3.5 days (input in seconds)
 	}

diff --git a/op-chain-ops/interopgen/configs.go b/op-chain-ops/interopgen/configs.go
@@ -80,8 +80,8 @@ type L2Config struct {
 	GasLimit                uint64
 	DisputeGameType         uint32
 	DisputeAbsolutePrestate common.Hash
-	DisputeMaxGameDepth     uint64
-	DisputeSplitDepth       uint64
+	DisputeMaxGameDepth     *big.Int
+	DisputeSplitDepth       *big.Int
 	DisputeClockExtension   uint64
 	DisputeMaxClockDuration uint64
 }

diff --git a/op-chain-ops/interopgen/recipe.go b/op-chain-ops/interopgen/recipe.go
@@ -254,8 +254,8 @@ func InteropL2DevConfig(l1ChainID, l2ChainID uint64, addrs devkeys.Addresses) (*
 		GasLimit:                30_000_000,
 		DisputeGameType:         1, // PERMISSIONED_CANNON Game Type
 		DisputeAbsolutePrestate: common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c"),
-		DisputeMaxGameDepth:     73,
-		DisputeSplitDepth:       30,
+		DisputeMaxGameDepth:     big.NewInt(73),
+		DisputeSplitDepth:       big.NewInt(30),
 		DisputeClockExtension:   10800,  // 3 hours (input in seconds)
 		DisputeMaxClockDuration: 302400, // 3.5 days (input in seconds)
 	}

diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -593,7 +593,7 @@ contract OPContractsManager is ISemver, Initializable {
         returns (bytes memory)
     {
         return abi.encode(
-            _input.disputeGameType, // Permissioned Cannon
+            _input.disputeGameType,
             _input.disputeAbsolutePrestate,
             _input.disputeMaxGameDepth,
             _input.disputeSplitDepth,