merge op-deployer/v0.4.2

op-chain-ops/genesis/config.go

@@ -418,10 +418,10 @@ func (d *UpgradeScheduleDeployConfig) ForkTimeOffset(fork rollup.ForkName) *uint
 		return (*uint64)(d.L2GenesisHoloceneTimeOffset)
 	case rollup.Isthmus:
 		return (*uint64)(d.L2GenesisIsthmusTimeOffset)
-	case rollup.Interop:
-		return (*uint64)(d.L2GenesisInteropTimeOffset)
 	case rollup.Jovian:
 		return (*uint64)(d.L2GenesisJovianTimeOffset)
+	case rollup.Interop:
+		return (*uint64)(d.L2GenesisInteropTimeOffset)
 	default:
 		panic(fmt.Sprintf("unknown fork: %s", fork))
 	}
@@ -445,10 +445,10 @@ func (d *UpgradeScheduleDeployConfig) SetForkTimeOffset(fork rollup.ForkName, of
 		d.L2GenesisHoloceneTimeOffset = (*hexutil.Uint64)(offset)
 	case rollup.Isthmus:
 		d.L2GenesisIsthmusTimeOffset = (*hexutil.Uint64)(offset)
-	case rollup.Interop:
-		d.L2GenesisInteropTimeOffset = (*hexutil.Uint64)(offset)
 	case rollup.Jovian:
 		d.L2GenesisJovianTimeOffset = (*hexutil.Uint64)(offset)
+	case rollup.Interop:
+		d.L2GenesisInteropTimeOffset = (*hexutil.Uint64)(offset)
 	default:
 		panic(fmt.Sprintf("unknown fork: %s", fork))
 	}
@@ -560,7 +560,6 @@ func (d *UpgradeScheduleDeployConfig) forks() []Fork {
 		{L2GenesisTimeOffset: d.L2GenesisGraniteTimeOffset, Name: string(L2AllocsGranite)},
 		{L2GenesisTimeOffset: d.L2GenesisHoloceneTimeOffset, Name: string(L2AllocsHolocene)},
 		{L2GenesisTimeOffset: d.L2GenesisIsthmusTimeOffset, Name: string(L2AllocsIsthmus)},
-		{L2GenesisTimeOffset: d.L2GenesisInteropTimeOffset, Name: string(L2AllocsInterop)},
 		{L2GenesisTimeOffset: d.L2GenesisJovianTimeOffset, Name: string(L2AllocsJovian)},
 	}
 }

op-chain-ops/genesis/config_test.go

@@ -211,8 +211,7 @@ func TestUpgradeScheduleDeployConfig_SolidityForkNumber(t *testing.T) {
 		{rollup.Granite, 4},
 		{rollup.Holocene, 5},
 		{rollup.Isthmus, 6},
-		{rollup.Interop, 7},
-		{rollup.Jovian, 8},
+		{rollup.Jovian, 7},
 	}
 	for _, tt := range tests {
 		var d UpgradeScheduleDeployConfig

op-chain-ops/genesis/layer_two.go

@@ -29,7 +29,6 @@ const (
 	L2AllocsGranite  L2AllocsMode = "granite"
 	L2AllocsHolocene L2AllocsMode = "holocene"
 	L2AllocsIsthmus  L2AllocsMode = "isthmus"
-	L2AllocsInterop  L2AllocsMode = "interop"
 	L2AllocsJovian   L2AllocsMode = "jovian"
 )
 

op-chain-ops/interopgen/deploy.go

@@ -101,7 +101,7 @@ func Deploy(logger log.Logger, fa *foundry.ArtifactsFS, srcFS *foundry.SourceMap
 		if err := l2Host.EnableCheats(); err != nil {
 			return nil, nil, fmt.Errorf("failed to enable cheats in L2 state %s: %w", l2ChainID, err)
 		}
-		if err := GenesisL2(l2Host, l2Cfg, deployments.L2s[l2ChainID], len(cfg.L2s) > 1); err != nil {
+		if err := GenesisL2(l2Host, l2Cfg, deployments.L2s[l2ChainID]); err != nil {
 			return nil, nil, fmt.Errorf("failed to apply genesis data to L2 %s: %w", l2ChainID, err)
 		}
 		l2Out, err := CompleteL2(l2Host, l2Cfg, l1GenesisBlock, deployments.L2s[l2ChainID])
@@ -283,7 +283,7 @@ func MigrateInterop(
 	}, nil
 }
 
-func GenesisL2(l2Host *script.Host, cfg *L2Config, deployment *L2Deployment, multichainDepSet bool) error {
+func GenesisL2(l2Host *script.Host, cfg *L2Config, deployment *L2Deployment) error {
 	genesisScript, err := opcm.NewL2GenesisScript(l2Host)
 	if err != nil {
 		return fmt.Errorf("failed to create L2 genesis script: %w", err)
@@ -307,9 +307,10 @@ func GenesisL2(l2Host *script.Host, cfg *L2Config, deployment *L2Deployment, mul
 		L1FeeVaultWithdrawalNetwork:              big.NewInt(int64(cfg.L1FeeVaultWithdrawalNetwork.ToUint8())),
 		GovernanceTokenOwner:                     cfg.GovernanceTokenOwner,
 		Fork:                                     big.NewInt(cfg.SolidityForkNumber(1)),
-		DeployCrossL2Inbox:                       multichainDepSet,
-		EnableGovernance:                         cfg.EnableGovernance,
-		FundDevAccounts:                          cfg.FundDevAccounts,
+		// Only include interop predeploys if it is activating at genesis
+		UseInterop:       cfg.L2GenesisInteropTimeOffset != nil && *cfg.L2GenesisInteropTimeOffset == 0,
+		EnableGovernance: cfg.EnableGovernance,
+		FundDevAccounts:  cfg.FundDevAccounts,
 	}); err != nil {
 		return fmt.Errorf("failed L2 genesis: %w", err)
 	}

op-deployer/pkg/deployer/bootstrap/flags.go

@@ -85,7 +85,6 @@ var (
 		Name:    L1ContractsReleaseFlagName,
 		Usage:   "L1 contracts release",
 		EnvVars: deployer.PrefixEnvVar("L1_CONTRACTS_RELEASE"),
-		Value:   "dev",
 	}
 	ProtocolVersionsOwnerFlag = &cli.StringFlag{
 		Name:    ProtocolVersionsOwnerFlagName,