fix setting eth upgrades in genesis storedcfg (#1356)

core/genesis.go

@@ -182,6 +182,7 @@ func SetupGenesisBlock(
 		rawdb.WriteChainConfig(db, stored, newcfg)
 		return newcfg, stored, nil
 	}
+	storedcfg.SetEthUpgrades(storedcfg.NetworkUpgrades)
 	// Check config compatibility and write the config. Compatibility errors
 	// are returned to the caller unless we're already at block zero.
 	// we use last accepted block for cfg compatibility check. Note this allows

params/config_extra.go

@@ -68,6 +68,12 @@ type AvalancheContext struct {
 
 // SetEthUpgrades sets the mapped upgrades  Avalanche > EVM upgrades) for the chain config.
 func (c *ChainConfig) SetEthUpgrades(avalancheUpgrades NetworkUpgrades) {
+	if c.BerlinBlock == nil {
+		c.BerlinBlock = big.NewInt(0)
+	}
+	if c.LondonBlock == nil {
+		c.LondonBlock = big.NewInt(0)
+	}
 	if avalancheUpgrades.DurangoTimestamp != nil {
 		c.ShanghaiTime = utils.NewUint64(*avalancheUpgrades.DurangoTimestamp)
 	}
@@ -263,12 +269,6 @@ func (c *ChainConfig) SetNetworkUpgradeDefaults() {
 	if c.MuirGlacierBlock == nil {
 		c.MuirGlacierBlock = big.NewInt(0)
 	}
-	if c.BerlinBlock == nil {
-		c.BerlinBlock = big.NewInt(0)
-	}
-	if c.LondonBlock == nil {
-		c.LondonBlock = big.NewInt(0)
-	}
 
 	c.NetworkUpgrades.setDefaults(c.SnowCtx.NetworkUpgrades)
 }