op-deployer: Add support for Isthmus calls to OPCM (#12753)

op-chain-ops/interopgen/deploy.go

@@ -200,7 +200,7 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 
 	l1Host.SetTxOrigin(cfg.Deployer)
 
-	output, err := opcm.DeployOPChain(l1Host, opcm.DeployOPChainInput{
+	output, err := opcm.DeployOPChainV160(l1Host, opcm.DeployOPChainInputV160{
 		OpChainProxyAdminOwner:  cfg.ProxyAdminOwner,
 		SystemConfigOwner:       cfg.SystemConfigOwner,
 		Batcher:                 cfg.BatchSenderAddress,

op-deployer/pkg/deployer/opcm/deployOutput_v160.json

+[
+  {
+    "type": "function",
+    "name": "decodeOutput",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "indexed": false,
+        "type": "tuple",
+        "components": [
+          {
+            "name": "opChainProxyAdmin",
+            "type": "address"
+          },
+          {
+            "name": "addressManager",
+            "type": "address"
+          },
+          {
+            "name": "l1ERC721BridgeProxy",
+            "type": "address"
+          },
+          {
+            "name": "systemConfigProxy",
+            "type": "address"
+          },
+          {
+            "name": "optimismMintableERC20FactoryProxy",
+            "type": "address"
+          },
+          {
+            "name": "l1StandardBridgeProxy",
+            "type": "address"
+          },
+          {
+            "name": "l1CrossDomainMessengerProxy",
+            "type": "address"
+          },
+          {
+            "name": "optimismPortalProxy",
+            "type": "address"
+          },
+          {
+            "name": "disputeGameFactoryProxy",
+            "type": "address"
+          },
+          {
+            "name": "anchorStateRegistryProxy",
+            "type": "address"
+          },
+          {
+            "name": "anchorStateRegistryImpl",
+            "type": "address"
+          },
+          {
+            "name": "faultDisputeGame",
+            "type": "address",
+            "internalType": "contract FaultDisputeGame"
+          },
+          {
+            "name": "permissionedDisputeGame",
+            "type": "address"
+          },
+          {
+            "name": "delayedWETHPermissionedGameProxy",
+            "type": "address"
+          },
+          {
+            "name": "delayedWETHPermissionlessGameProxy",
+            "type": "address"
+          }
+        ]
+      }
+    ]
+  }
+]
\ No newline at end of file

op-deployer/pkg/deployer/opcm/opchain.go

@@ -6,6 +6,8 @@ import (
 	"math/big"
 	"strings"
 
+	_ "embed"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
@@ -23,7 +25,49 @@ var PermissionedGameStartingAnchorRoots = []byte{
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xde, 0xad, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 }
 
-type DeployOPChainInput struct {
+// opcmRolesBase is an internal struct used to pass the roles to OPCM. See opcmDeployInputV160 for more info.
+type opcmRolesBase struct {
+	OpChainProxyAdminOwner common.Address
+	SystemConfigOwner      common.Address
+	Batcher                common.Address
+	UnsafeBlockSigner      common.Address
+	Proposer               common.Address
+	Challenger             common.Address
+}
+
+type opcmDeployInputBase struct {
+	BasefeeScalar           uint32
+	BlobBasefeeScalar       uint32
+	L2ChainId               *big.Int
+	StartingAnchorRoots     []byte
+	SaltMixer               string
+	GasLimit                uint64
+	DisputeGameType         uint32
+	DisputeAbsolutePrestate common.Hash
+	DisputeMaxGameDepth     *big.Int
+	DisputeSplitDepth       *big.Int
+	DisputeClockExtension   uint64
+	DisputeMaxClockDuration uint64
+}
+
+// opcmDeployInputV160 is the input struct for the deploy method of the OPStackManager contract. We
+// define a separate struct here to match what the OPSM contract expects.
+type opcmDeployInputV160 struct {
+	opcmDeployInputBase
+	Roles opcmRolesBase
+}
+
+type opcmRolesIsthmus struct {
+	opcmRolesBase
+	FeeAdmin common.Address
+}
+
+type opcmDeployInputIsthmus struct {
+	opcmDeployInputBase
+	Roles opcmRolesIsthmus
+}
+
+type DeployOPChainInputV160 struct {
 	OpChainProxyAdminOwner common.Address
 	SystemConfigOwner      common.Address
 	Batcher                common.Address
@@ -47,14 +91,57 @@ type DeployOPChainInput struct {
 	AllowCustomDisputeParameters bool
 }
 
-func (input *DeployOPChainInput) InputSet() bool {
+func (input *DeployOPChainInputV160) InputSet() bool {
 	return true
 }
 
-func (input *DeployOPChainInput) StartingAnchorRoots() []byte {
+func (input *DeployOPChainInputV160) StartingAnchorRoots() []byte {
 	return PermissionedGameStartingAnchorRoots
 }
 
+func DeployOPChainInputV160DeployCalldata(input DeployOPChainInputV160) any {
+	return opcmDeployInputV160{
+		Roles: opcmRolesBase{
+			OpChainProxyAdminOwner: input.OpChainProxyAdminOwner,
+			SystemConfigOwner:      input.SystemConfigOwner,
+			Batcher:                input.Batcher,
+			UnsafeBlockSigner:      input.UnsafeBlockSigner,
+			Proposer:               input.Proposer,
+			Challenger:             input.Challenger,
+		},
+		opcmDeployInputBase: opcmDeployInputBase{
+			BasefeeScalar:           input.BasefeeScalar,
+			BlobBasefeeScalar:       input.BlobBaseFeeScalar,
+			L2ChainId:               input.L2ChainId,
+			StartingAnchorRoots:     input.StartingAnchorRoots(),
+			SaltMixer:               input.SaltMixer,
+			GasLimit:                input.GasLimit,
+			DisputeGameType:         input.DisputeGameType,
+			DisputeAbsolutePrestate: input.DisputeAbsolutePrestate,
+			DisputeMaxGameDepth:     new(big.Int).SetUint64(input.DisputeMaxGameDepth),
+			DisputeSplitDepth:       new(big.Int).SetUint64(input.DisputeSplitDepth),
+			DisputeClockExtension:   input.DisputeClockExtension,
+			DisputeMaxClockDuration: input.DisputeMaxClockDuration,
+		},
+	}
+}
+
+type DeployOPChainInputIsthmus struct {
+	DeployOPChainInputV160
+	SystemConfigFeeAdmin common.Address
+}
+
+func DeployOPChainInputIsthmusDeployCalldata(input DeployOPChainInputIsthmus) any {
+	v160Data := DeployOPChainInputV160DeployCalldata(input.DeployOPChainInputV160).(opcmDeployInputV160)
+	return opcmDeployInputIsthmus{
+		Roles: opcmRolesIsthmus{
+			opcmRolesBase: v160Data.Roles,
+			FeeAdmin:      input.SystemConfigFeeAdmin,
+		},
+		opcmDeployInputBase: v160Data.opcmDeployInputBase,
+	}
+}
+
 type DeployOPChainOutput struct {
 	OpChainProxyAdmin                 common.Address
 	AddressManager                    common.Address
@@ -82,12 +169,20 @@ type DeployOPChainScript struct {
 	Run func(input, output common.Address) error
 }
 
-func DeployOPChain(host *script.Host, input DeployOPChainInput) (DeployOPChainOutput, error) {
+func DeployOPChainV160(host *script.Host, input DeployOPChainInputV160) (DeployOPChainOutput, error) {
+	return deployOPChain(host, input)
+}
+
+func DeployOPChainIsthmus(host *script.Host, input DeployOPChainInputIsthmus) (DeployOPChainOutput, error) {
+	return deployOPChain(host, input)
+}
+
+func deployOPChain[T any](host *script.Host, input T) (DeployOPChainOutput, error) {
 	var dco DeployOPChainOutput
 	inputAddr := host.NewScriptAddress()
 	outputAddr := host.NewScriptAddress()
 
-	cleanupInput, err := script.WithPrecompileAtAddress[*DeployOPChainInput](host, inputAddr, &input)
+	cleanupInput, err := script.WithPrecompileAtAddress[*T](host, inputAddr, &input)
 	if err != nil {
 		return dco, fmt.Errorf("failed to insert DeployOPChainInput precompile: %w", err)
 	}
@@ -115,127 +210,46 @@ func DeployOPChain(host *script.Host, input DeployOPChainInput) (DeployOPChainOu
 	return dco, nil
 }
 
-// opcmRoles is an internal struct used to pass the roles to OPSM. See opcmDeployInput for more info.
-type opcmRoles struct {
-	OpChainProxyAdminOwner common.Address
-	SystemConfigOwner      common.Address
-	Batcher                common.Address
-	UnsafeBlockSigner      common.Address
-	Proposer               common.Address
-	Challenger             common.Address
-}
+// decodeOutputABIJSONV160 defines an ABI for a fake method called "decodeOutput" that returns the
+// DeployOutput struct. This allows the code in the deployer to decode directly into a struct
+// using Geth's ABI library.
+//
+//go:embed deployOutput_v160.json
+var decodeOutputABIJSONV160 string
 
-// opcmDeployInput is the input struct for the deploy method of the OPStackManager contract. We
-// define a separate struct here to match what the OPSM contract expects.
-type opcmDeployInput struct {
-	Roles                   opcmRoles
-	BasefeeScalar           uint32
-	BlobBasefeeScalar       uint32
-	L2ChainId               *big.Int
-	StartingAnchorRoots     []byte
-	SaltMixer               string
-	GasLimit                uint64
-	DisputeGameType         uint32
-	DisputeAbsolutePrestate common.Hash
-	DisputeMaxGameDepth     *big.Int
-	DisputeSplitDepth       *big.Int
-	DisputeClockExtension   uint64
-	DisputeMaxClockDuration uint64
+var decodeOutputABIV160 abi.ABI
+
+func DeployOPChainRawV160(
+	ctx context.Context,
+	l1 *ethclient.Client,
+	bcast broadcaster.Broadcaster,
+	deployer common.Address,
+	artifacts foundry.StatDirFs,
+	input DeployOPChainInputV160,
+) (DeployOPChainOutput, error) {
+	return deployOPChainRaw(ctx, l1, bcast, deployer, artifacts, input.OpcmProxy, DeployOPChainInputV160DeployCalldata(input))
 }
 
-// decodeOutputABIJSON defines an ABI for a fake method called "decodeOutput" that returns the
-// DeployOutput struct. This allows the code in the deployer to decode directly into a struct
-// using Geth's ABI library.
-const decodeOutputABIJSON = `
-[
-  {
-    "type": "function",
-    "name": "decodeOutput",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "output",
-        "indexed": false,
-		"type": "tuple",
-        "components": [
-          {
-            "name": "opChainProxyAdmin",
-            "type": "address"
-          },
-          {
-            "name": "addressManager",
-            "type": "address"
-          },
-          {
-            "name": "l1ERC721BridgeProxy",
-            "type": "address"
-          },
-          {
-            "name": "systemConfigProxy",
-            "type": "address"
-          },
-          {
-            "name": "optimismMintableERC20FactoryProxy",
-            "type": "address"
-          },
-          {
-            "name": "l1StandardBridgeProxy",
-            "type": "address"
-          },
-          {
-            "name": "l1CrossDomainMessengerProxy",
-            "type": "address"
-          },
-          {
-            "name": "optimismPortalProxy",
-            "type": "address"
-          },
-          {
-            "name": "disputeGameFactoryProxy",
-            "type": "address"
-          },
-          {
-            "name": "anchorStateRegistryProxy",
-            "type": "address"
-          },
-          {
-            "name": "anchorStateRegistryImpl",
-            "type": "address"
-          },
-          {
-            "name": "faultDisputeGame",
-            "type": "address",
-            "internalType": "contract FaultDisputeGame"
-          },
-          {
-            "name": "permissionedDisputeGame",
-            "type": "address"
-          },
-          {
-            "name": "delayedWETHPermissionedGameProxy",
-            "type": "address"
-          },
-          {
-            "name": "delayedWETHPermissionlessGameProxy",
-            "type": "address"
-          }
-        ]
-      }
-    ]
-  }
-]
-`
-
-var decodeOutputABI abi.ABI
+func DeployOPChainRawIsthmus(
+	ctx context.Context,
+	l1 *ethclient.Client,
+	bcast broadcaster.Broadcaster,
+	deployer common.Address,
+	artifacts foundry.StatDirFs,
+	input DeployOPChainInputIsthmus,
+) (DeployOPChainOutput, error) {
+	return deployOPChainRaw(ctx, l1, bcast, deployer, artifacts, input.OpcmProxy, DeployOPChainInputIsthmusDeployCalldata(input))
+}
 
 // DeployOPChainRaw deploys an OP Chain using a raw call to a pre-deployed OPSM contract.
-func DeployOPChainRaw(
+func deployOPChainRaw(
 	ctx context.Context,
 	l1 *ethclient.Client,
 	bcast broadcaster.Broadcaster,
 	deployer common.Address,
 	artifacts foundry.StatDirFs,
-	input DeployOPChainInput,
+	opcmProxyAddress common.Address,
+	input any,
 ) (DeployOPChainOutput, error) {
 	var out DeployOPChainOutput
 
@@ -246,28 +260,7 @@ func DeployOPChainRaw(
 	}
 
 	opcmABI := opcmArtifacts.ABI
-	calldata, err := opcmABI.Pack("deploy", opcmDeployInput{
-		Roles: opcmRoles{
-			OpChainProxyAdminOwner: input.OpChainProxyAdminOwner,
-			SystemConfigOwner:      input.SystemConfigOwner,
-			Batcher:                input.Batcher,
-			UnsafeBlockSigner:      input.UnsafeBlockSigner,
-			Proposer:               input.Proposer,
-			Challenger:             input.Challenger,
-		},
-		BasefeeScalar:           input.BasefeeScalar,
-		BlobBasefeeScalar:       input.BlobBaseFeeScalar,
-		L2ChainId:               input.L2ChainId,
-		StartingAnchorRoots:     input.StartingAnchorRoots(),
-		SaltMixer:               input.SaltMixer,
-		GasLimit:                input.GasLimit,
-		DisputeGameType:         input.DisputeGameType,
-		DisputeAbsolutePrestate: input.DisputeAbsolutePrestate,
-		DisputeMaxGameDepth:     new(big.Int).SetUint64(input.DisputeMaxGameDepth),
-		DisputeSplitDepth:       new(big.Int).SetUint64(input.DisputeSplitDepth),
-		DisputeClockExtension:   input.DisputeClockExtension,
-		DisputeMaxClockDuration: input.DisputeMaxClockDuration,
-	})
+	calldata, err := opcmABI.Pack("deploy", input)
 	if err != nil {
 		return out, fmt.Errorf("failed to pack deploy input: %w", err)
 	}
@@ -279,7 +272,7 @@ func DeployOPChainRaw(
 
 	bcast.Hook(script.Broadcast{
 		From:  deployer,
-		To:    input.OpcmProxy,
+		To:    opcmProxyAddress,
 		Input: calldata,
 		Value: (*hexutil.U256)(uint256.NewInt(0)),
 		// use hardcoded 19MM gas for now since this is roughly what we've seen this deployment cost.
@@ -313,7 +306,7 @@ func DeployOPChainRaw(
 			Output DeployOPChainOutput
 		}
 		var outData OutputData
-		if err := decodeOutputABI.UnpackIntoInterface(&outData, "decodeOutput", data.DeployOutput); err != nil {
+		if err := decodeOutputABIV160.UnpackIntoInterface(&outData, "decodeOutput", data.DeployOutput); err != nil {
 			return out, fmt.Errorf("failed to unpack DeployOutput: %w", err)
 		}
 
@@ -325,7 +318,7 @@ func DeployOPChainRaw(
 
 func init() {
 	var err error
-	decodeOutputABI, err = abi.JSON(strings.NewReader(decodeOutputABIJSON))
+	decodeOutputABIV160, err = abi.JSON(strings.NewReader(decodeOutputABIJSONV160))
 	if err != nil {
 		panic(fmt.Sprintf("failed to parse decodeOutput ABI: %v", err))
 	}

op-deployer/pkg/deployer/pipeline/opchain.go

@@ -29,21 +29,43 @@ func DeployOPChainLiveStrategy(ctx context.Context, env *Env, bundle ArtifactsBu
 		return fmt.Errorf("failed to get chain intent: %w", err)
 	}
 
-	input, err := makeDCI(intent, thisIntent, chainID, st)
-	if err != nil {
-		return fmt.Errorf("error making deploy OP chain input: %w", err)
+	var deployFunc func() (opcm.DeployOPChainOutput, error)
+	switch intent.L1ContractsLocator.Tag {
+	case standard.ContractsV160Tag, standard.ContractsV170Beta1L2Tag:
+		deployFunc = func() (opcm.DeployOPChainOutput, error) {
+			input, err := makeDCIV160(intent, thisIntent, chainID, st)
+			if err != nil {
+				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+			}
+
+			return opcm.DeployOPChainRawV160(ctx,
+				env.L1Client,
+				env.Broadcaster,
+				env.Deployer,
+				bundle.L1,
+				input,
+			)
+		}
+	default:
+		deployFunc = func() (opcm.DeployOPChainOutput, error) {
+			input, err := makeDCIIsthmus(intent, thisIntent, chainID, st)
+			if err != nil {
+				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+			}
+
+			return opcm.DeployOPChainRawIsthmus(ctx,
+				env.L1Client,
+				env.Broadcaster,
+				env.Deployer,
+				bundle.L1,
+				input,
+			)
+		}
 	}
 
 	var dco opcm.DeployOPChainOutput
 	lgr.Info("deploying OP chain using existing OPCM", "id", chainID.Hex(), "opcmAddress", st.ImplementationsDeployment.OpcmProxyAddress.Hex())
-	dco, err = opcm.DeployOPChainRaw(
-		ctx,
-		env.L1Client,
-		env.Broadcaster,
-		env.Deployer,
-		bundle.L1,
-		input,
-	)
+	dco, err = deployFunc()
 	if err != nil {
 		return fmt.Errorf("error deploying OP chain: %w", err)
 	}
@@ -158,19 +180,33 @@ func DeployOPChainGenesisStrategy(env *Env, intent *state.Intent, st *state.Stat
 		return fmt.Errorf("failed to get chain intent: %w", err)
 	}
 
-	input, err := makeDCI(intent, thisIntent, chainID, st)
-	if err != nil {
-		return fmt.Errorf("error making deploy OP chain input: %w", err)
+	var deployFunc func() (opcm.DeployOPChainOutput, error)
+	switch intent.L1ContractsLocator.Tag {
+	case standard.ContractsV160Tag, standard.ContractsV170Beta1L2Tag:
+		deployFunc = func() (opcm.DeployOPChainOutput, error) {
+			input, err := makeDCIV160(intent, thisIntent, chainID, st)
+			if err != nil {
+				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+			}
+
+			return opcm.DeployOPChainV160(env.L1ScriptHost, input)
+		}
+	default:
+		deployFunc = func() (opcm.DeployOPChainOutput, error) {
+			input, err := makeDCIIsthmus(intent, thisIntent, chainID, st)
+			if err != nil {
+				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+			}
+
+			return opcm.DeployOPChainIsthmus(env.L1ScriptHost, input)
+		}
 	}
 
 	env.L1ScriptHost.ImportState(st.L1StateDump.Data)
 
 	var dco opcm.DeployOPChainOutput
 	lgr.Info("deploying OP chain using local allocs", "id", chainID.Hex())
-	dco, err = opcm.DeployOPChain(
-		env.L1ScriptHost,
-		input,
-	)
+	dco, err = deployFunc()
 	if err != nil {
 		return fmt.Errorf("error deploying OP chain: %w", err)
 	}
@@ -190,7 +226,7 @@ type ChainProofParams struct {
 	DangerouslyAllowCustomDisputeParameters bool        `json:"dangerouslyAllowCustomDisputeParameters" toml:"dangerouslyAllowCustomDisputeParameters"`
 }
 
-func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInput, error) {
+func makeDCIV160(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInputV160, error) {
 	proofParams, err := jsonutil.MergeJSON(
 		ChainProofParams{
 			DisputeGameType:         standard.DisputeGameType,
@@ -204,10 +240,10 @@ func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common
 		thisIntent.DeployOverrides,
 	)
 	if err != nil {
-		return opcm.DeployOPChainInput{}, fmt.Errorf("error merging proof params from overrides: %w", err)
+		return opcm.DeployOPChainInputV160{}, fmt.Errorf("error merging proof params from overrides: %w", err)
 	}
 
-	return opcm.DeployOPChainInput{
+	return opcm.DeployOPChainInputV160{
 		OpChainProxyAdminOwner:       thisIntent.Roles.L1ProxyAdminOwner,
 		SystemConfigOwner:            thisIntent.Roles.SystemConfigOwner,
 		Batcher:                      thisIntent.Roles.Batcher,
@@ -230,6 +266,18 @@ func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common
 	}, nil
 }
 
+func makeDCIIsthmus(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInputIsthmus, error) {
+	dci, err := makeDCIV160(intent, thisIntent, chainID, st)
+	if err != nil {
+		return opcm.DeployOPChainInputIsthmus{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+	}
+
+	return opcm.DeployOPChainInputIsthmus{
+		DeployOPChainInputV160: dci,
+		SystemConfigFeeAdmin:   common.Address{'D', 'E', 'A', 'D'},
+	}, nil
+}
+
 func makeChainState(chainID common.Hash, dco opcm.DeployOPChainOutput) *state.ChainState {
 	return &state.ChainState{
 		ID:                                        chainID,

op-deployer/pkg/deployer/standard/standard.go

@@ -26,6 +26,9 @@ const (
 	DisputeSplitDepth               uint64 = 30
 	DisputeClockExtension           uint64 = 10800
 	DisputeMaxClockDuration         uint64 = 302400
+
+	ContractsV160Tag        = "op-contracts/v1.6.0"
+	ContractsV170Beta1L2Tag = "op-contracts/v1.7.0-beta.1+l2-contracts"
 )
 
 var DisputeAbsolutePrestate = common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c")
@@ -40,9 +43,9 @@ var L1VersionsSepolia L1Versions
 
 var L1VersionsMainnet L1Versions
 
-var DefaultL1ContractsTag = "op-contracts/v1.6.0"
+var DefaultL1ContractsTag = ContractsV160Tag
 
-var DefaultL2ContractsTag = "op-contracts/v1.7.0-beta.1+l2-contracts"
+var DefaultL2ContractsTag = ContractsV170Beta1L2Tag
 
 type L1Versions struct {
 	Releases map[string]L1VersionsReleases `toml:"releases"`