Merge pull request erigontech#133 from testinprod-io/hardfork-time-ni…

…l-check Check if superchain hardfork time is nil
bobanetwork · Feb 2, 2024 · 51367a4 · 51367a4
2 parents ef62ced + 1812270
commit 51367a4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/params/superchain.go b/params/superchain.go
@@ -112,8 +112,8 @@ func LoadSuperChainConfig(opStackChainCfg *superchain.ChainConfig) *chain.Config
 		PragueTime:                    nil,
 		BedrockBlock:                  common.Big0,
 		RegolithTime:                  big.NewInt(0),
-		CanyonTime:                    new(big.Int).SetUint64(*superchainConfig.Config.CanyonTime),
-		EcotoneTime:                   new(big.Int).SetUint64(*superchainConfig.Config.EcotoneTime),
+		CanyonTime:                    nil,
+		EcotoneTime:                   nil,
 		TerminalTotalDifficulty:       common.Big0,
 		TerminalTotalDifficultyPassed: true,
 		Ethash:                        nil,
@@ -127,9 +127,11 @@ func LoadSuperChainConfig(opStackChainCfg *superchain.ChainConfig) *chain.Config
 
 	if superchainConfig.Config.CanyonTime != nil {
 		out.ShanghaiTime = new(big.Int).SetUint64(*superchainConfig.Config.CanyonTime) // Shanghai activates with Canyon
+		out.CanyonTime = new(big.Int).SetUint64(*superchainConfig.Config.CanyonTime)
 	}
 	if superchainConfig.Config.EcotoneTime != nil {
 		out.CancunTime = new(big.Int).SetUint64(*superchainConfig.Config.EcotoneTime) // CancunTime activates with Ecotone
+		out.EcotoneTime = new(big.Int).SetUint64(*superchainConfig.Config.EcotoneTime)
 	}
 
 	// note: no actual parameters are being loaded, yet.