From 3fdcf61d36ff3ca1d5efd52c1a1be9b7299c83d6 Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Wed, 15 Jan 2025 08:19:38 -0700 Subject: [PATCH 1/2] op-deployer: Default to holocene --- op-deployer/pkg/deployer/state/deploy_config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/op-deployer/pkg/deployer/state/deploy_config.go b/op-deployer/pkg/deployer/state/deploy_config.go index c9ad464cc9d4..e521c3d5214a 100644 --- a/op-deployer/pkg/deployer/state/deploy_config.go +++ b/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{ From dd124f218f06e79c647996e12bc5e7646a5ba8df Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Wed, 15 Jan 2025 08:20:36 -0700 Subject: [PATCH 2/2] Add contracts v180 tag --- op-deployer/pkg/deployer/standard/standard.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go index 50664b959b2a..cea4dd42e42d 100644 --- a/op-deployer/pkg/deployer/standard/standard.go +++ b/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