Name and configure the H upgrade: Helicon

.github/workflows/ci.yml

@@ -60,15 +60,15 @@ jobs:
           loki_push_url: ${{ secrets.LOKI_PUSH_URL || '' }}
           loki_username: ${{ secrets.LOKI_USERNAME || '' }}
           loki_password: ${{ secrets.LOKI_PASSWORD || '' }}
-  e2e_post_granite:
+  e2e_post_latest:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Run e2e tests
         uses: ./.github/actions/run-monitored-tmpnet-cmd
         with:
-          run: ./scripts/run_task.sh test-e2e-ci -- --activate-granite
-          artifact_prefix: e2e-post-granite
+          run: ./scripts/run_task.sh test-e2e-ci -- --activate-latest
+          artifact_prefix: e2e-post-latest
           filter_by_owner: avalanchego-e2e
           prometheus_url: ${{ secrets.PROMETHEUS_URL || '' }}
           prometheus_push_url: ${{ secrets.PROMETHEUS_PUSH_URL || '' }}

api/info/service.md

@@ -675,28 +675,29 @@ curl -X POST --data '{
 }' -H 'content-type:application/json;' 127.0.0.1:9650/ext/info
 ```
 
-**Example Response**:
+**Example Response (Mainnet)**:
 
 ```json
 {
   "jsonrpc": "2.0",
   "result": {
-    "apricotPhase1Time": "2020-12-05T05:00:00Z",
-    "apricotPhase2Time": "2020-12-05T05:00:00Z",
-    "apricotPhase3Time": "2020-12-05T05:00:00Z",
-    "apricotPhase4Time": "2020-12-05T05:00:00Z",
-    "apricotPhase4MinPChainHeight": 0,
-    "apricotPhase5Time": "2020-12-05T05:00:00Z",
-    "apricotPhasePre6Time": "2020-12-05T05:00:00Z",
-    "apricotPhase6Time": "2020-12-05T05:00:00Z",
-    "apricotPhasePost6Time": "2020-12-05T05:00:00Z",
-    "banffTime": "2020-12-05T05:00:00Z",
-    "cortinaTime": "2020-12-05T05:00:00Z",
-    "cortinaXChainStopVertexID": "11111111111111111111111111111111LpoYY",
-    "durangoTime": "2020-12-05T05:00:00Z",
-    "etnaTime": "2024-10-09T20:00:00Z",
-    "fortunaTime": "9999-12-01T05:00:00Z",
-    "graniteTime": "9999-12-01T05:00:00Z"
+    "apricotPhase1Time": "2021-03-31T14:00:00Z",
+    "apricotPhase2Time": "2021-05-10T11:00:00Z",
+    "apricotPhase3Time": "2021-08-24T14:00:00Z",
+    "apricotPhase4Time": "2021-09-22T21:00:00Z",
+    "apricotPhase4MinPChainHeight": 793005,
+    "apricotPhase5Time": "2021-12-02T18:00:00Z",
+    "apricotPhasePre6Time": "2022-09-05T01:30:00Z",
+    "apricotPhase6Time": "2022-09-06T20:00:00Z",
+    "apricotPhasePost6Time": "2022-09-07T03:00:00Z",
+    "banffTime": "2022-10-18T16:00:00Z",
+    "cortinaTime": "2023-04-25T15:00:00Z",
+    "cortinaXChainStopVertexID": "jrGWDh5Po9FMj54depyunNixpia5PN4aAYxfmNzU8n752Rjga",
+    "durangoTime": "2024-03-06T16:00:00Z",
+    "etnaTime": "2024-12-16T17:00:00Z",
+    "fortunaTime": "2025-04-08T15:00:00Z",
+    "graniteTime": "2025-11-19T16:00:00Z",
+    "heliconTime": "9999-12-01T00:00:00Z"
   },
   "id": 1
 }

proto/vm/vm.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package vm;
 
+import "google/protobuf/duration.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 import "io/prometheus/client/metrics.proto";
@@ -136,6 +137,8 @@ message NetworkUpgrades {
   google.protobuf.Timestamp etna_time = 14;
   google.protobuf.Timestamp fortuna_time = 15;
   google.protobuf.Timestamp granite_time = 16;
+  google.protobuf.Duration granite_epoch_duration = 17;
+  google.protobuf.Timestamp helicon_time = 18;
 }
 
 message InitializeResponse {

tests/e2e/e2e_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/ava-labs/avalanchego/tests/e2e/vms"
 	"github.com/ava-labs/avalanchego/tests/fixture/e2e"
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
-	"github.com/ava-labs/avalanchego/upgrade"
+	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
 )
 
 func TestE2E(t *testing.T) {
@@ -50,13 +50,12 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	nodes := tmpnet.NewNodesOrPanic(nodeCount)
 	subnets := vms.XSVMSubnetsOrPanic(nodes...)
 
-	upgrades := upgrade.Default
-	if flagVars.ActivateGranite() {
-		upgrades.GraniteTime = upgrade.InitiallyActiveTime
-		upgrades.GraniteEpochDuration = 4 * time.Second
-	} else {
-		upgrades.GraniteTime = upgrade.UnscheduledActivationTime
+	upgradeToActivate := upgradetest.Latest
+	if !flagVars.ActivateLatest() {
+		upgradeToActivate--
 	}
+	upgrades := upgradetest.GetConfig(upgradeToActivate)
+	upgrades.GraniteEpochDuration = 4 * time.Second
 	tc.Log().Info("setting upgrades",
 		zap.Reflect("upgrades", upgrades),
 	)

tests/fixture/e2e/flags.go

@@ -40,7 +40,7 @@ type FlagVars struct {
 	stopNetwork    bool
 	restartNetwork bool
 
-	activateGranite bool
+	activateLatest bool
 }
 
 func (v *FlagVars) NetworkCmd() (NetworkCmd, error) {
@@ -120,8 +120,8 @@ func (v *FlagVars) NetworkShutdownDelay() time.Duration {
 	return 0
 }
 
-func (v *FlagVars) ActivateGranite() bool {
-	return v.activateGranite
+func (v *FlagVars) ActivateLatest() bool {
+	return v.activateLatest
 }
 
 type DefaultOption func(*DefaultOptions)
@@ -215,10 +215,10 @@ func RegisterFlags(ops ...DefaultOption) *FlagVars {
 	)
 
 	flag.BoolVar(
-		&vars.activateGranite,
-		"activate-granite",
+		&vars.activateLatest,
+		"activate-latest",
 		false,
-		"[optional] activate the granite upgrade",
+		"[optional] activate all upgrades up to and including the latest upgrade",
 	)
 
 	return &vars

upgrade/new_upgrade_checklist.md

@@ -0,0 +1,45 @@
+<!-- markdownlint-disable MD024 -->
+
+# New Upgrade Configuration Checklist
+
+This checklist ists all the required steps when when adding a new network upgrade/fork to AvalancheGo. Note that this list is not exhaustive nor future-proof.
+
+---
+
+## 1. Core Configuration Files
+
+### [`upgrade/upgrade.go`](./upgrade.go)
+
+- [ ] Add new time field to `Config` struct
+- [ ] Add `UnscheduledActivationTime` activation time to all configs:
+  - `Mainnet` config
+  - `Fuji` config
+  - `Default` config
+- [ ] Add field to `Validate()` method's `upgrades` slice
+- [ ] Add `IsXActivated(time.Time) bool` method
+
+### [`vms/rpcchainvm/vm_client.go`](../vms/rpcchainvm/vm_client.go)
+
+- [ ] Add new time field to `NetworkUpgrades` struct in `getNetworkUpgrades()`
+
+### [`vms/rpcchainvm/vm_server.go`](../vms/rpcchainvm/vm_server.go)
+
+- [ ] Add a new `grpcutils.TimestampAsTime` block to `convertNetworkUpgrades()` function
+
+## 2. Test Helper Files
+
+### [`upgrade/upgradetest/fork.go`](./upgradetest/fork.go)
+
+- [ ] Add new fork constant before `Latest`
+- [ ] Add case to `String()` method
+
+### [`upgrade/upgradetest/config.go`](./upgradetest/config.go)
+
+- [ ] Add case to `SetTimesTo()` function
+
+---
+
+## After Initial Implementation
+
+Once the upgrade is scheduled for mainnet or fuji, ensure you update the config with the actual activation time respectively. 
+

upgrade/upgrade.go

@@ -38,6 +38,7 @@ var (
 		FortunaTime:               time.Date(2025, time.April, 8, 15, 0, 0, 0, time.UTC),
 		GraniteTime:               time.Date(2025, time.November, 19, 16, 0, 0, 0, time.UTC),
 		GraniteEpochDuration:      5 * time.Minute,
+		HeliconTime:               UnscheduledActivationTime,
 	}
 	Fuji = Config{
 		ApricotPhase1Time:            time.Date(2021, time.March, 26, 14, 0, 0, 0, time.UTC),
@@ -61,6 +62,7 @@ var (
 		FortunaTime:               time.Date(2025, time.March, 13, 15, 0, 0, 0, time.UTC),
 		GraniteTime:               time.Date(2025, time.October, 29, 15, 0, 0, 0, time.UTC),
 		GraniteEpochDuration:      5 * time.Minute,
+		HeliconTime:               UnscheduledActivationTime,
 	}
 	Default = Config{
 		ApricotPhase1Time:            InitiallyActiveTime,
@@ -80,6 +82,7 @@ var (
 		FortunaTime:                  InitiallyActiveTime,
 		GraniteTime:                  InitiallyActiveTime,
 		GraniteEpochDuration:         30 * time.Second,
+		HeliconTime:                  UnscheduledActivationTime,
 	}
 
 	ErrInvalidUpgradeTimes = errors.New("invalid upgrade configuration")
@@ -103,6 +106,7 @@ type Config struct {
 	FortunaTime                  time.Time     `json:"fortunaTime"`
 	GraniteTime                  time.Time     `json:"graniteTime"`
 	GraniteEpochDuration         time.Duration `json:"graniteEpochDuration"`
+	HeliconTime                  time.Time     `json:"heliconTime"`
 }
 
 func (c *Config) Validate() error {
@@ -121,6 +125,7 @@ func (c *Config) Validate() error {
 		c.EtnaTime,
 		c.FortunaTime,
 		c.GraniteTime,
+		c.HeliconTime,
 	}
 	for i := 0; i < len(upgrades)-1; i++ {
 		if upgrades[i].After(upgrades[i+1]) {
@@ -192,6 +197,10 @@ func (c *Config) IsGraniteActivated(t time.Time) bool {
 	return !t.Before(c.GraniteTime)
 }
 
+func (c *Config) IsHeliconActivated(t time.Time) bool {
+	return !t.Before(c.HeliconTime)
+}
+
 func GetConfig(networkID uint32) Config {
 	switch networkID {
 	case constants.MainnetID:

upgrade/upgradetest/config.go

@@ -33,6 +33,9 @@ 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 Helicon:
+		c.HeliconTime = upgradeTime
+		fallthrough
 	case Granite:
 		c.GraniteTime = upgradeTime
 		fallthrough

upgrade/upgradetest/fork.go

@@ -19,15 +19,18 @@ const (
 	Etna
 	Fortuna
 	Granite
+	Helicon
 
-	Latest = Granite
+	Latest Fork = iota - 1
 )
 
 // Fork is an enum of all the major network upgrades.
 type Fork int
 
 func (f Fork) String() string {
 	switch f {
+	case Helicon:
+		return "Helicon"
 	case Granite:
 		return "Granite"
 	case Fortuna:

vms/rpcchainvm/vm_client.go

@@ -15,6 +15,7 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health"
+	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/emptypb"
 
 	"github.com/ava-labs/avalanchego/api/metrics"
@@ -29,6 +30,7 @@ import (
 	"github.com/ava-labs/avalanchego/snow/engine/common/appsender"
 	"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
 	"github.com/ava-labs/avalanchego/snow/validators/gvalidators"
+	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/resource"
@@ -182,24 +184,7 @@ func (vm *VMClient) Initialize(
 		zap.String("address", serverAddr),
 	)
 
-	networkUpgrades := &vmpb.NetworkUpgrades{
-		ApricotPhase_1Time:            grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.ApricotPhase1Time),
-		ApricotPhase_2Time:            grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.ApricotPhase2Time),
-		ApricotPhase_3Time:            grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.ApricotPhase3Time),
-		ApricotPhase_4Time:            grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.ApricotPhase4Time),
-		ApricotPhase_4MinPChainHeight: chainCtx.NetworkUpgrades.ApricotPhase4MinPChainHeight,
-		ApricotPhase_5Time:            grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.ApricotPhase5Time),
-		ApricotPhasePre_6Time:         grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.ApricotPhasePre6Time),
-		ApricotPhase_6Time:            grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.ApricotPhase6Time),
-		ApricotPhasePost_6Time:        grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.ApricotPhasePost6Time),
-		BanffTime:                     grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.BanffTime),
-		CortinaTime:                   grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.CortinaTime),
-		CortinaXChainStopVertexId:     chainCtx.NetworkUpgrades.CortinaXChainStopVertexID[:],
-		DurangoTime:                   grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.DurangoTime),
-		EtnaTime:                      grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.EtnaTime),
-		FortunaTime:                   grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.FortunaTime),
-		GraniteTime:                   grpcutils.TimestampFromTime(chainCtx.NetworkUpgrades.GraniteTime),
-	}
+	networkUpgrades := getNetworkUpgrades(chainCtx.NetworkUpgrades)
 
 	resp, err := vm.client.Initialize(ctx, &vmpb.InitializeRequest{
 		NetworkId:       chainCtx.NetworkID,
@@ -269,6 +254,29 @@ func (vm *VMClient) Initialize(
 	return err
 }
 
+func getNetworkUpgrades(u upgrade.Config) *vmpb.NetworkUpgrades {
+	return &vmpb.NetworkUpgrades{
+		ApricotPhase_1Time:            grpcutils.TimestampFromTime(u.ApricotPhase1Time),
+		ApricotPhase_2Time:            grpcutils.TimestampFromTime(u.ApricotPhase2Time),
+		ApricotPhase_3Time:            grpcutils.TimestampFromTime(u.ApricotPhase3Time),
+		ApricotPhase_4Time:            grpcutils.TimestampFromTime(u.ApricotPhase4Time),
+		ApricotPhase_4MinPChainHeight: u.ApricotPhase4MinPChainHeight,
+		ApricotPhase_5Time:            grpcutils.TimestampFromTime(u.ApricotPhase5Time),
+		ApricotPhasePre_6Time:         grpcutils.TimestampFromTime(u.ApricotPhasePre6Time),
+		ApricotPhase_6Time:            grpcutils.TimestampFromTime(u.ApricotPhase6Time),
+		ApricotPhasePost_6Time:        grpcutils.TimestampFromTime(u.ApricotPhasePost6Time),
+		BanffTime:                     grpcutils.TimestampFromTime(u.BanffTime),
+		CortinaTime:                   grpcutils.TimestampFromTime(u.CortinaTime),
+		CortinaXChainStopVertexId:     u.CortinaXChainStopVertexID[:],
+		DurangoTime:                   grpcutils.TimestampFromTime(u.DurangoTime),
+		EtnaTime:                      grpcutils.TimestampFromTime(u.EtnaTime),
+		FortunaTime:                   grpcutils.TimestampFromTime(u.FortunaTime),
+		GraniteTime:                   grpcutils.TimestampFromTime(u.GraniteTime),
+		GraniteEpochDuration:          durationpb.New(u.GraniteEpochDuration),
+		HeliconTime:                   grpcutils.TimestampFromTime(u.HeliconTime),
+	}
+}
+
 func (vm *VMClient) newDBServer(db database.Database) *grpc.Server {
 	server := grpcutils.NewServer(
 		grpcutils.WithUnaryInterceptor(vm.grpcServerMetrics.UnaryServerInterceptor()),

vms/rpcchainvm/vm_server.go

@@ -886,6 +886,10 @@ func convertNetworkUpgrades(pbUpgrades *vmpb.NetworkUpgrades) (upgrade.Config, e
 	if err != nil {
 		return upgrade.Config{}, err
 	}
+	cortinaXChainStopVertexID, err := ids.ToID(pbUpgrades.CortinaXChainStopVertexId)
+	if err != nil {
+		return upgrade.Config{}, err
+	}
 	durango, err := grpcutils.TimestampAsTime(pbUpgrades.DurangoTime)
 	if err != nil {
 		return upgrade.Config{}, err
@@ -902,8 +906,8 @@ func convertNetworkUpgrades(pbUpgrades *vmpb.NetworkUpgrades) (upgrade.Config, e
 	if err != nil {
 		return upgrade.Config{}, err
 	}
-
-	cortinaXChainStopVertexID, err := ids.ToID(pbUpgrades.CortinaXChainStopVertexId)
+	graniteEpochDuration := pbUpgrades.GraniteEpochDuration.AsDuration()
+	helicon, err := grpcutils.TimestampAsTime(pbUpgrades.HeliconTime)
 	if err != nil {
 		return upgrade.Config{}, err
 	}
@@ -925,5 +929,7 @@ func convertNetworkUpgrades(pbUpgrades *vmpb.NetworkUpgrades) (upgrade.Config, e
 		EtnaTime:                     etna,
 		FortunaTime:                  fortuna,
 		GraniteTime:                  granite,
+		GraniteEpochDuration:         graniteEpochDuration,
+		HeliconTime:                  helicon,
 	}, nil
 }