From e5d123e010dabdf258254e521f34142c5ed2cec5 Mon Sep 17 00:00:00 2001 From: Aaron Buchwald Date: Thu, 25 Jul 2024 20:10:13 -0400 Subject: [PATCH 1/3] Update to use ago upgrade struct --- go.mod | 2 +- go.sum | 4 ++-- params/config.go | 27 ++++++++++++++------------- params/config_extra.go | 11 ----------- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 6b67463c7b..4ac8b70a8e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21.12 require ( github.com/VictoriaMetrics/fastcache v1.12.1 - github.com/ava-labs/avalanchego v1.11.10-prerelease + github.com/ava-labs/avalanchego v1.11.10-0.20240720030200-d6720a2f1e79 github.com/cespare/cp v0.1.0 github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index 12b0fb5d68..9cb4dae54f 100644 --- a/go.sum +++ b/go.sum @@ -54,8 +54,8 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/ava-labs/avalanchego v1.11.10-prerelease h1:QUhVqvxrwDmsTvXXnKoePe5WU3Eh8GXB/QE2R2xHa0c= -github.com/ava-labs/avalanchego v1.11.10-prerelease/go.mod h1:ryRFbHr7sKmez4792NxzJS7AGiE+vd0Tez+qs2kmezE= +github.com/ava-labs/avalanchego v1.11.10-0.20240720030200-d6720a2f1e79 h1:wxhZa9+wmjLQkeYIw2jdA4w9GFJLS/fuZL4O1mxez5g= +github.com/ava-labs/avalanchego v1.11.10-0.20240720030200-d6720a2f1e79/go.mod h1:ryRFbHr7sKmez4792NxzJS7AGiE+vd0Tez+qs2kmezE= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/params/config.go b/params/config.go index abc4a27a77..41dda2c04b 100644 --- a/params/config.go +++ b/params/config.go @@ -32,8 +32,8 @@ import ( "fmt" "math/big" + "github.com/ava-labs/avalanchego/upgrade" "github.com/ava-labs/avalanchego/utils/constants" - "github.com/ava-labs/avalanchego/version" "github.com/ava-labs/coreth/precompile/modules" "github.com/ava-labs/coreth/precompile/precompileconfig" "github.com/ava-labs/coreth/utils" @@ -460,6 +460,7 @@ var ( ) func getChainConfig(networkID uint32, chainID *big.Int) *ChainConfig { + agoUpgrade := upgrade.GetConfig(networkID) return &ChainConfig{ ChainID: chainID, HomesteadBlock: big.NewInt(0), @@ -473,18 +474,18 @@ func getChainConfig(networkID uint32, chainID *big.Int) *ChainConfig { PetersburgBlock: big.NewInt(0), IstanbulBlock: big.NewInt(0), MuirGlacierBlock: big.NewInt(0), - ApricotPhase1BlockTimestamp: getUpgradeTime(networkID, version.ApricotPhase1Times), - ApricotPhase2BlockTimestamp: getUpgradeTime(networkID, version.ApricotPhase2Times), - ApricotPhase3BlockTimestamp: getUpgradeTime(networkID, version.ApricotPhase3Times), - ApricotPhase4BlockTimestamp: getUpgradeTime(networkID, version.ApricotPhase4Times), - ApricotPhase5BlockTimestamp: getUpgradeTime(networkID, version.ApricotPhase5Times), - ApricotPhasePre6BlockTimestamp: getUpgradeTime(networkID, version.ApricotPhasePre6Times), - ApricotPhase6BlockTimestamp: getUpgradeTime(networkID, version.ApricotPhase6Times), - ApricotPhasePost6BlockTimestamp: getUpgradeTime(networkID, version.ApricotPhasePost6Times), - BanffBlockTimestamp: getUpgradeTime(networkID, version.BanffTimes), - CortinaBlockTimestamp: getUpgradeTime(networkID, version.CortinaTimes), - DurangoBlockTimestamp: getUpgradeTime(networkID, version.DurangoTimes), - EUpgradeTime: getUpgradeTime(networkID, version.EUpgradeTimes), + ApricotPhase1BlockTimestamp: utils.TimeToNewUint64(agoUpgrade.ApricotPhase1Time), + ApricotPhase2BlockTimestamp: utils.TimeToNewUint64(agoUpgrade.ApricotPhase2Time), + ApricotPhase3BlockTimestamp: utils.TimeToNewUint64(agoUpgrade.ApricotPhase3Time), + ApricotPhase4BlockTimestamp: utils.TimeToNewUint64(agoUpgrade.ApricotPhase4Time), + ApricotPhase5BlockTimestamp: utils.TimeToNewUint64(agoUpgrade.ApricotPhase5Time), + ApricotPhasePre6BlockTimestamp: utils.TimeToNewUint64(agoUpgrade.ApricotPhasePre6Time), + ApricotPhase6BlockTimestamp: utils.TimeToNewUint64(agoUpgrade.ApricotPhase6Time), + ApricotPhasePost6BlockTimestamp: utils.TimeToNewUint64(agoUpgrade.ApricotPhasePost6Time), + BanffBlockTimestamp: utils.TimeToNewUint64(agoUpgrade.BanffTime), + CortinaBlockTimestamp: utils.TimeToNewUint64(agoUpgrade.CortinaTime), + DurangoBlockTimestamp: utils.TimeToNewUint64(agoUpgrade.DurangoTime), + EUpgradeTime: utils.TimeToNewUint64(agoUpgrade.EtnaUpgradeTime), } } diff --git a/params/config_extra.go b/params/config_extra.go index 908878f72f..f598fdf217 100644 --- a/params/config_extra.go +++ b/params/config_extra.go @@ -6,10 +6,8 @@ package params import ( "encoding/json" "errors" - "time" "github.com/ava-labs/avalanchego/snow" - "github.com/ava-labs/coreth/utils" ) // UpgradeConfig includes the following configs that may be specified in upgradeBytes: @@ -120,12 +118,3 @@ func (c *ChainConfig) ToWithUpgradesJSON() *ChainConfigWithUpgradesJSON { UpgradeConfig: c.UpgradeConfig, } } - -func getUpgradeTime(networkID uint32, upgradeTimes map[uint32]time.Time) *uint64 { - if upgradeTime, ok := upgradeTimes[networkID]; ok { - return utils.TimeToNewUint64(upgradeTime) - } - // If the upgrade time isn't specified, default being enabled in the - // genesis. - return utils.NewUint64(0) -} From 3b6b7308aeb97cf17508cfcfa4fc2c01ac3f4159 Mon Sep 17 00:00:00 2001 From: Aaron Buchwald Date: Thu, 25 Jul 2024 20:28:59 -0400 Subject: [PATCH 2/3] Update EtnaUpgradeTime -> EtnaTime --- params/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/config.go b/params/config.go index 41dda2c04b..e2ec42f84d 100644 --- a/params/config.go +++ b/params/config.go @@ -485,7 +485,7 @@ func getChainConfig(networkID uint32, chainID *big.Int) *ChainConfig { BanffBlockTimestamp: utils.TimeToNewUint64(agoUpgrade.BanffTime), CortinaBlockTimestamp: utils.TimeToNewUint64(agoUpgrade.CortinaTime), DurangoBlockTimestamp: utils.TimeToNewUint64(agoUpgrade.DurangoTime), - EUpgradeTime: utils.TimeToNewUint64(agoUpgrade.EtnaUpgradeTime), + EUpgradeTime: utils.TimeToNewUint64(agoUpgrade.EtnaTime), } } From 5de5e26d2d061cca81a08996239c37d5916708c8 Mon Sep 17 00:00:00 2001 From: Aaron Buchwald Date: Fri, 26 Jul 2024 14:12:18 -0400 Subject: [PATCH 3/3] Bump ago --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4ac8b70a8e..ae58bc2c9d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21.12 require ( github.com/VictoriaMetrics/fastcache v1.12.1 - github.com/ava-labs/avalanchego v1.11.10-0.20240720030200-d6720a2f1e79 + github.com/ava-labs/avalanchego v1.11.11-0.20240726180529-7c45bedc8791 github.com/cespare/cp v0.1.0 github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index 9cb4dae54f..54e7381520 100644 --- a/go.sum +++ b/go.sum @@ -54,8 +54,8 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/ava-labs/avalanchego v1.11.10-0.20240720030200-d6720a2f1e79 h1:wxhZa9+wmjLQkeYIw2jdA4w9GFJLS/fuZL4O1mxez5g= -github.com/ava-labs/avalanchego v1.11.10-0.20240720030200-d6720a2f1e79/go.mod h1:ryRFbHr7sKmez4792NxzJS7AGiE+vd0Tez+qs2kmezE= +github.com/ava-labs/avalanchego v1.11.11-0.20240726180529-7c45bedc8791 h1:fbG/dETGp8ySG+MOlp8ehkbsiPUc/1YXd81Ahr2J/dw= +github.com/ava-labs/avalanchego v1.11.11-0.20240726180529-7c45bedc8791/go.mod h1:v2IUrIkmsbxE1Gy8odNowdTRqow1xNBHC6wCEeD4EIg= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=