Mark X-chain migration as Cortina (ava-labs#2747)

Author: StephenButtolph

chains/manager.go

@@ -653,11 +653,11 @@ func (m *manager) createAvalancheChain(
 	// persistence of vertices
 	vtxManager := state.NewSerializer(
 		state.SerializerConfig{
-			ChainID:             ctx.ChainID,
-			VM:                  vm,
-			DB:                  vertexDB,
-			Log:                 ctx.Log,
-			XChainMigrationTime: version.GetXChainMigrationTime(ctx.NetworkID),
+			ChainID:     ctx.ChainID,
+			VM:          vm,
+			DB:          vertexDB,
+			Log:         ctx.Log,
+			CortinaTime: version.GetCortinaTime(ctx.NetworkID),
 		},
 	)
 

snow/engine/avalanche/state/serializer.go

@@ -44,11 +44,11 @@ type Serializer struct {
 }
 
 type SerializerConfig struct {
-	ChainID             ids.ID
-	VM                  vertex.DAGVM
-	DB                  database.Database
-	Log                 logging.Logger
-	XChainMigrationTime time.Time
+	ChainID     ids.ID
+	VM          vertex.DAGVM
+	DB          database.Database
+	Log         logging.Logger
+	CortinaTime time.Time
 }
 
 func NewSerializer(config SerializerConfig) vertex.Manager {

snow/engine/avalanche/state/unique_vertex.go

@@ -264,7 +264,7 @@ func (vtx *uniqueVertex) Verify(ctx context.Context) error {
 		if vtx.time != nil {
 			now = vtx.time()
 		}
-		allowed := vtx.serializer.XChainMigrationTime
+		allowed := vtx.serializer.CortinaTime
 		if now.Before(allowed) {
 			return errStopVertexNotAllowedTimestamp
 		}

snow/engine/avalanche/state/unique_vertex_test.go

@@ -605,11 +605,11 @@ func TestStopVertexVerifyNotAllowedTimestamp(t *testing.T) {
 
 	_, parseTx := generateTestTxs('a')
 	ts := newTestSerializer(t, parseTx)
-	ts.XChainMigrationTime = version.XChainMigrationDefaultTime
+	ts.CortinaTime = version.CortinaDefaultTime
 
 	svtx := newTestUniqueVertex(t, ts, nil, nil, true)
 	svtx.time = func() time.Time {
-		return version.XChainMigrationDefaultTime.Add(-time.Second)
+		return version.CortinaDefaultTime.Add(-time.Second)
 	}
 
 	if verr := svtx.Verify(context.Background()); !errors.Is(verr, errStopVertexNotAllowedTimestamp) {

snow/engine/avalanche/transitive.go

@@ -6,6 +6,7 @@ package avalanche
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"go.uber.org/zap"
 
@@ -24,6 +25,7 @@ import (
 	"github.com/ava-labs/avalanchego/utils/sampler"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/utils/wrappers"
+	"github.com/ava-labs/avalanchego/version"
 )
 
 var _ Engine = (*Transitive)(nil)
@@ -367,6 +369,11 @@ func (t *Transitive) Notify(ctx context.Context, msg common.Message) error {
 
 	switch msg {
 	case common.PendingTxs:
+		// After the linearization, we shouldn't be building any new vertices
+		if cortinaTime, ok := version.CortinaTimes[t.Ctx.NetworkID]; ok && time.Now().After(cortinaTime) {
+			return nil
+		}
+
 		txs := t.VM.PendingTxs(ctx)
 		t.pendingTxs = append(t.pendingTxs, txs...)
 		t.metrics.pendingTxs.Set(float64(len(t.pendingTxs)))

version/constants.go

@@ -95,12 +95,12 @@ var (
 	}
 	BanffDefaultTime = time.Date(2020, time.December, 5, 5, 0, 0, 0, time.UTC)
 
-	// FIXME: update this before release
-	XChainMigrationTimes = map[uint32]time.Time{
+	// TODO: update this before release
+	CortinaTimes = map[uint32]time.Time{
 		constants.MainnetID: time.Date(10000, time.December, 1, 0, 0, 0, 0, time.UTC),
 		constants.FujiID:    time.Date(10000, time.December, 1, 0, 0, 0, 0, time.UTC),
 	}
-	XChainMigrationDefaultTime = time.Date(2020, time.December, 5, 5, 0, 0, 0, time.UTC)
+	CortinaDefaultTime = time.Date(2020, time.December, 5, 5, 0, 0, 0, time.UTC)
 )
 
 func init() {
@@ -166,11 +166,11 @@ func GetBanffTime(networkID uint32) time.Time {
 	return BanffDefaultTime
 }
 
-func GetXChainMigrationTime(networkID uint32) time.Time {
-	if upgradeTime, exists := XChainMigrationTimes[networkID]; exists {
+func GetCortinaTime(networkID uint32) time.Time {
+	if upgradeTime, exists := CortinaTimes[networkID]; exists {
 		return upgradeTime
 	}
-	return XChainMigrationDefaultTime
+	return CortinaDefaultTime
 }
 
 func GetCompatibility(networkID uint32) Compatibility {

vms/avm/states/state_test.go

@@ -280,7 +280,7 @@ func TestInitializeChainState(t *testing.T) {
 	require.NoError(err)
 
 	stopVertexID := ids.GenerateTestID()
-	genesisTimestamp := version.XChainMigrationDefaultTime
+	genesisTimestamp := version.CortinaDefaultTime
 	err = s.InitializeChainState(stopVertexID, genesisTimestamp)
 	require.NoError(err)
 

vms/avm/vm.go

@@ -405,7 +405,7 @@ func (*VM) LastAccepted(context.Context) (ids.ID, error) {
  */
 
 func (vm *VM) Linearize(_ context.Context, stopVertexID ids.ID) error {
-	time := version.GetXChainMigrationTime(vm.ctx.NetworkID)
+	time := version.GetCortinaTime(vm.ctx.NetworkID)
 	return vm.state.InitializeChainState(stopVertexID, time)
 }