Name F-Upgrade Fortuna (#3761)

StephenButtolph · web-flow · commit c84be1048343 · 2025-03-04T18:12:19.000-05:00
diff --git a/api/info/service.md b/api/info/service.md
@@ -695,7 +695,7 @@ curl -X POST --data '{
     "cortinaXChainStopVertexID": "11111111111111111111111111111111LpoYY",
     "durangoTime": "2020-12-05T05:00:00Z",
     "etnaTime": "2024-10-09T20:00:00Z",
-    "fUpgradeTime": "9999-12-01T05:00:00Z"
+    "fortunaTime": "9999-12-01T05:00:00Z"
   },
   "id": 1
 }
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/DataDog/zstd v1.5.2
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/antithesishq/antithesis-sdk-go v0.3.8
-	github.com/ava-labs/coreth v0.14.1-acp-176.1
+	github.com/ava-labs/coreth v0.14.1-rc.2
 	github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593
diff --git a/go.sum b/go.sum
@@ -64,8 +64,8 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/ava-labs/coreth v0.14.1-acp-176.1 h1:44iXYYeLR4LzTM+5DB7ohGqysDiTFPIvxiuFY9vZJAI=
-github.com/ava-labs/coreth v0.14.1-acp-176.1/go.mod h1:AEQcF8MWrKH0sS114wEZlkSfeGF5F66xTbQYqqimNLI=
+github.com/ava-labs/coreth v0.14.1-rc.2 h1:GRL7bMeNKhz1aNFEPJ3Rcd2Di/RfW8JOK/I9deAr6+0=
+github.com/ava-labs/coreth v0.14.1-rc.2/go.mod h1:gIGr+5WDNX1DrFvUMy53AtTpkxlM/8cNOD/PDIChKfM=
 github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 h1:EL66gtXOAwR/4KYBjOV03LTWgkEXvLePribLlJNu4g0=
 github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60/go.mod h1:/7qKobTfbzBu7eSTVaXMTr56yTYk4j2Px6/8G+idxHo=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
diff --git a/proto/pb/vm/vm.pb.go b/proto/pb/vm/vm.pb.go
diff --git a/proto/vm/vm.proto b/proto/vm/vm.proto
@@ -130,7 +130,7 @@ message NetworkUpgrades {
   bytes cortina_x_chain_stop_vertex_id = 12;
   google.protobuf.Timestamp durango_time = 13;
   google.protobuf.Timestamp etna_time = 14;
-  google.protobuf.Timestamp f_upgrade_time = 15;
+  google.protobuf.Timestamp fortuna_time = 15;
 }
 
 message InitializeResponse {
diff --git a/tests/e2e/c/dynamic_fees.go b/tests/e2e/c/dynamic_fees.go
@@ -105,7 +105,7 @@ var _ = e2e.DescribeCChain("[Dynamic Fees]", func() {
 			require.NoError(err)
 
 			now := time.Now()
-			if upgrades.IsFUpgradeActivated(now) {
+			if upgrades.IsFortunaActivated(now) {
 				gasLimit = acp176.MinMaxCapacity
 			} else {
 				gasLimit = cortina.GasLimit
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -47,9 +47,9 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 
 	upgrades := upgrade.Default
 	if flagVars.ActivateFortuna() {
-		upgrades.FUpgradeTime = upgrade.InitiallyActiveTime
+		upgrades.FortunaTime = upgrade.InitiallyActiveTime
 	} else {
-		upgrades.FUpgradeTime = upgrade.UnscheduledActivationTime
+		upgrades.FortunaTime = upgrade.UnscheduledActivationTime
 	}
 	tc.Log().Info("setting upgrades",
 		zap.Reflect("upgrades", upgrades),
diff --git a/upgrade/upgrade.go b/upgrade/upgrade.go
@@ -35,7 +35,7 @@ var (
 		CortinaXChainStopVertexID: ids.FromStringOrPanic("jrGWDh5Po9FMj54depyunNixpia5PN4aAYxfmNzU8n752Rjga"),
 		DurangoTime:               time.Date(2024, time.March, 6, 16, 0, 0, 0, time.UTC),
 		EtnaTime:                  time.Date(2024, time.December, 16, 17, 0, 0, 0, time.UTC),
-		FUpgradeTime:              UnscheduledActivationTime,
+		FortunaTime:               UnscheduledActivationTime,
 	}
 	Fuji = Config{
 		ApricotPhase1Time:            time.Date(2021, time.March, 26, 14, 0, 0, 0, time.UTC),
@@ -56,7 +56,7 @@ var (
 		CortinaXChainStopVertexID: ids.FromStringOrPanic("2D1cmbiG36BqQMRyHt4kFhWarmatA1ighSpND3FeFgz3vFVtCZ"),
 		DurangoTime:               time.Date(2024, time.February, 13, 16, 0, 0, 0, time.UTC),
 		EtnaTime:                  time.Date(2024, time.November, 25, 16, 0, 0, 0, time.UTC),
-		FUpgradeTime:              UnscheduledActivationTime,
+		FortunaTime:               UnscheduledActivationTime,
 	}
 	Default = Config{
 		ApricotPhase1Time:            InitiallyActiveTime,
@@ -73,7 +73,7 @@ var (
 		CortinaXChainStopVertexID:    ids.Empty,
 		DurangoTime:                  InitiallyActiveTime,
 		EtnaTime:                     InitiallyActiveTime,
-		FUpgradeTime:                 UnscheduledActivationTime,
+		FortunaTime:                  UnscheduledActivationTime,
 	}
 
 	ErrInvalidUpgradeTimes = errors.New("invalid upgrade configuration")
@@ -94,7 +94,7 @@ type Config struct {
 	CortinaXChainStopVertexID    ids.ID    `json:"cortinaXChainStopVertexID"`
 	DurangoTime                  time.Time `json:"durangoTime"`
 	EtnaTime                     time.Time `json:"etnaTime"`
-	FUpgradeTime                 time.Time `json:"fUpgradeTime"`
+	FortunaTime                  time.Time `json:"fortunaTime"`
 }
 
 func (c *Config) Validate() error {
@@ -111,7 +111,7 @@ func (c *Config) Validate() error {
 		c.CortinaTime,
 		c.DurangoTime,
 		c.EtnaTime,
-		c.FUpgradeTime,
+		c.FortunaTime,
 	}
 	for i := 0; i < len(upgrades)-1; i++ {
 		if upgrades[i].After(upgrades[i+1]) {
@@ -175,8 +175,8 @@ func (c *Config) IsEtnaActivated(t time.Time) bool {
 	return !t.Before(c.EtnaTime)
 }
 
-func (c *Config) IsFUpgradeActivated(t time.Time) bool {
-	return !t.Before(c.FUpgradeTime)
+func (c *Config) IsFortunaActivated(t time.Time) bool {
+	return !t.Before(c.FortunaTime)
 }
 
 func GetConfig(networkID uint32) Config {
diff --git a/upgrade/upgradetest/config.go b/upgrade/upgradetest/config.go
@@ -31,8 +31,8 @@ func GetConfigWithUpgradeTime(fork Fork, upgradeTime time.Time) upgrade.Config {
 // to the provided upgradeTime.
 func SetTimesTo(c *upgrade.Config, fork Fork, upgradeTime time.Time) {
 	switch fork {
-	case FUpgrade:
-		c.FUpgradeTime = upgradeTime
+	case Fortuna:
+		c.FortunaTime = upgradeTime
 		fallthrough
 	case Etna:
 		c.EtnaTime = upgradeTime
diff --git a/upgrade/upgradetest/fork.go b/upgrade/upgradetest/fork.go
@@ -17,18 +17,18 @@ const (
 	Cortina
 	Durango
 	Etna
-	FUpgrade
+	Fortuna
 
-	Latest = FUpgrade
+	Latest = Fortuna
 )
 
 // Fork is an enum of all the major network upgrades.
 type Fork int
 
 func (f Fork) String() string {
 	switch f {
-	case FUpgrade:
-		return "FUpgrade"
+	case Fortuna:
+		return "Fortuna"
 	case Etna:
 		return "Etna"
 	case Durango:
diff --git a/utils/constants/acps.go b/utils/constants/acps.go
@@ -32,7 +32,9 @@ var (
 	// release, marked as implementable and not activated.
 	//
 	// See: https://github.com/orgs/avalanche-foundation/projects/1
-	CurrentACPs = set.Of[uint32]()
+	CurrentACPs = set.Of[uint32](
+		176, // https://github.com/avalanche-foundation/ACPs/blob/main/ACPs/176-dynamic-evm-gas-limit-and-price-discovery-updates/README.md
+	)
 
 	// ScheduledACPs are the ACPs included into the next upgrade.
 	ScheduledACPs = set.Of[uint32]()
diff --git a/vms/platformvm/block/executor/verifier.go b/vms/platformvm/block/executor/verifier.go
@@ -146,7 +146,7 @@ func (v *verifier) BanffStandardBlock(b *block.BanffStandardBlock) error {
 	// After the F upgrade, it is.
 	if !changed &&
 		len(b.Transactions) == 0 &&
-		(!v.txExecutorBackend.Config.UpgradeConfig.IsFUpgradeActivated(b.Timestamp()) || !lowBalanceL1ValidatorsEvicted) {
+		(!v.txExecutorBackend.Config.UpgradeConfig.IsFortunaActivated(b.Timestamp()) || !lowBalanceL1ValidatorsEvicted) {
 		return errBanffStandardBlockWithoutChanges
 	}
 
diff --git a/vms/platformvm/block/executor/verifier_test.go b/vms/platformvm/block/executor/verifier_test.go
@@ -1353,7 +1353,7 @@ func TestDeactivateLowBalanceL1ValidatorBlockChanges(t *testing.T) {
 		},
 		{
 			name:              "After F Upgrade - no L1 validators evicted",
-			currentFork:       upgradetest.FUpgrade,
+			currentFork:       upgradetest.Fortuna,
 			durationToAdvance: 0,
 			expectedErr:       errBanffStandardBlockWithoutChanges,
 		},
@@ -1365,7 +1365,7 @@ func TestDeactivateLowBalanceL1ValidatorBlockChanges(t *testing.T) {
 		},
 		{
 			name:              "After F Upgrade - L1 validators evicted",
-			currentFork:       upgradetest.FUpgrade,
+			currentFork:       upgradetest.Fortuna,
 			durationToAdvance: time.Second,
 		},
 	}
diff --git a/vms/rpcchainvm/vm_client.go b/vms/rpcchainvm/vm_client.go
@@ -198,7 +198,7 @@ func (vm *VMClient) Initialize(
 		CortinaXChainStopVertexId:     chainCtx.NetworkUpgrades.CortinaXChainStopVertexID[:],
 		DurangoTime:                   grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.DurangoTime),
 		EtnaTime:                      grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.EtnaTime),
-		FUpgradeTime:                  grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.FUpgradeTime),
+		FortunaTime:                   grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.FortunaTime),
 	}
 
 	resp, err := vm.client.Initialize(ctx, &vmpb.InitializeRequest{
diff --git a/vms/rpcchainvm/vm_server.go b/vms/rpcchainvm/vm_server.go
@@ -867,7 +867,7 @@ func convertNetworkUpgrades(pbUpgrades *vmpb.NetworkUpgrades) (upgrade.Config, e
 	if err != nil {
 		return upgrade.Config{}, err
 	}
-	fupgrade, err := grpcutils.TimestampAsTime(pbUpgrades.FUpgradeTime)
+	fortuna, err := grpcutils.TimestampAsTime(pbUpgrades.FortunaTime)
 	if err != nil {
 		return upgrade.Config{}, err
 	}
@@ -892,6 +892,6 @@ func convertNetworkUpgrades(pbUpgrades *vmpb.NetworkUpgrades) (upgrade.Config, e
 		CortinaXChainStopVertexID:    cortinaXChainStopVertexID,
 		DurangoTime:                  durango,
 		EtnaTime:                     etna,
-		FUpgradeTime:                 fupgrade,
+		FortunaTime:                  fortuna,
 	}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ curl -X POST --data '{`
`695`	`695`	`"cortinaXChainStopVertexID": "11111111111111111111111111111111LpoYY",`
`696`	`696`	`"durangoTime": "2020-12-05T05:00:00Z",`
`697`	`697`	`"etnaTime": "2024-10-09T20:00:00Z",`
`698`		`- "fUpgradeTime": "9999-12-01T05:00:00Z"`
	`698`	`+ "fortunaTime": "9999-12-01T05:00:00Z"`
`699`	`699`	`},`
`700`	`700`	`"id": 1`
`701`	`701`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ message NetworkUpgrades {`
`130`	`130`	`bytes cortina_x_chain_stop_vertex_id = 12;`
`131`	`131`	`google.protobuf.Timestamp durango_time = 13;`
`132`	`132`	`google.protobuf.Timestamp etna_time = 14;`
`133`		`- google.protobuf.Timestamp f_upgrade_time = 15;`
	`133`	`+ google.protobuf.Timestamp fortuna_time = 15;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`message InitializeResponse {`