op-deployer: Backport deployer changes

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

@@ -21,8 +21,9 @@ type L1Deployments struct {
 }
 
 type L2GenesisInput struct {
-	L1Deployments L1Deployments
-	L2Config      genesis.L2InitializationConfig
+	L1Deployments      L1Deployments
+	L2Config           genesis.L2InitializationConfig
+	OverrideAllocsMode string
 }
 
 type L2GenesisScript struct {
@@ -33,8 +34,15 @@ func L2Genesis(l2Host *script.Host, input *L2GenesisInput) error {
 	l2Host.SetEnvVar("L2GENESIS_L1CrossDomainMessengerProxy", input.L1Deployments.L1CrossDomainMessengerProxy.String())
 	l2Host.SetEnvVar("L2GENESIS_L1StandardBridgeProxy", input.L1Deployments.L1StandardBridgeProxy.String())
 	l2Host.SetEnvVar("L2GENESIS_L1ERC721BridgeProxy", input.L1Deployments.L1ERC721BridgeProxy.String())
-	allocsMode := input.L2Config.UpgradeScheduleDeployConfig.AllocMode(uint64(time.Now().Unix()))
-	l2Host.SetEnvVar("FORK", string(allocsMode))
+
+	var allocsMode string
+	if input.OverrideAllocsMode == "" {
+		allocsMode = string(input.L2Config.UpgradeScheduleDeployConfig.AllocMode(uint64(time.Now().Unix())))
+	} else {
+		allocsMode = input.OverrideAllocsMode
+	}
+
+	l2Host.SetEnvVar("FORK", allocsMode)
 
 	deployConfig := &genesis.DeployConfig{
 		L2InitializationConfig: input.L2Config,

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

@@ -2,6 +2,7 @@ package pipeline
 
 import (
 	"fmt"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
 
@@ -48,13 +49,23 @@ func GenerateL2Genesis(pEnv *Env, intent *state.Intent, bundle ArtifactsBundle,
 		return fmt.Errorf("failed to create L2 script host: %w", err)
 	}
 
+	// This is an ugly hack to support holocene. The v1.7.0 predeploy contracts do not support setting the allocs
+	// mode as Holocene, even though there are no predeploy changes in Holocene. The v1.7.0 changes are the "official"
+	// release of the predeploy contracts, so we need to set the allocs mode to "granite" to avoid having to backport
+	// Holocene support into the predeploy contracts.
+	var overrideAllocsMode string
+	if intent.L2ContractsLocator.IsTag() && intent.L2ContractsLocator.Tag == standard.ContractsV170Beta1L2Tag {
+		overrideAllocsMode = "granite"
+	}
+
 	if err := opcm.L2Genesis(host, &opcm.L2GenesisInput{
 		L1Deployments: opcm.L1Deployments{
 			L1CrossDomainMessengerProxy: thisChainState.L1CrossDomainMessengerProxyAddress,
 			L1StandardBridgeProxy:       thisChainState.L1StandardBridgeProxyAddress,
 			L1ERC721BridgeProxy:         thisChainState.L1ERC721BridgeProxyAddress,
 		},
-		L2Config: initCfg.L2InitializationConfig,
+		L2Config:           initCfg.L2InitializationConfig,
+		OverrideAllocsMode: overrideAllocsMode,
 	}); err != nil {
 		return fmt.Errorf("failed to call L2Genesis script: %w", err)
 	}

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

@@ -31,6 +31,7 @@ const (
 	Eip1559Elasticity               uint64 = 6
 
 	ContractsV160Tag        = "op-contracts/v1.6.0"
+	ContractsV180Tag        = "op-contracts/v1.8.0-rc.4"
 	ContractsV170Beta1L2Tag = "op-contracts/v1.7.0-beta.1+l2-contracts"
 )
 
@@ -46,7 +47,7 @@ var L1VersionsSepolia L1Versions
 
 var L1VersionsMainnet L1Versions
 
-var DefaultL1ContractsTag = ContractsV160Tag
+var DefaultL1ContractsTag = ContractsV180Tag
 
 var DefaultL2ContractsTag = ContractsV170Beta1L2Tag
 

op-deployer/pkg/deployer/state/deploy_config.go

@@ -80,6 +80,7 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
 				L2GenesisEcotoneTimeOffset:  op_service.U64UtilPtr(0),
 				L2GenesisFjordTimeOffset:    op_service.U64UtilPtr(0),
 				L2GenesisGraniteTimeOffset:  op_service.U64UtilPtr(0),
+				L2GenesisHoloceneTimeOffset: op_service.U64UtilPtr(0),
 				UseInterop:                  intent.UseInterop,
 			},
 			L2CoreDeployConfig: genesis.L2CoreDeployConfig{