Add UpgradeTime to p2p handshake (#4468)

Signed-off-by: Stephen Buttolph <stephen@avalabs.org>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: StephenButtolph

message/messagemock/outbound_message_builder.go

@@ -27,6 +27,7 @@ type OutboundMsgBuilder interface {
 		major uint32,
 		minor uint32,
 		patch uint32,
+		upgradeTime uint64,
 		ipSigningTime uint64,
 		ipNodeIDSig []byte,
 		ipBLSSig []byte,
@@ -238,6 +239,7 @@ func (b *outMsgBuilder) Handshake(
 	major uint32,
 	minor uint32,
 	patch uint32,
+	upgradeTime uint64,
 	ipSigningTime uint64,
 	ipNodeIDSig []byte,
 	ipBLSSig []byte,
@@ -258,6 +260,7 @@ func (b *outMsgBuilder) Handshake(
 					MyTime:         myTime,
 					IpAddr:         ip.Addr().AsSlice(),
 					IpPort:         uint32(ip.Port()),
+					UpgradeTime:    upgradeTime,
 					IpSigningTime:  ipSigningTime,
 					IpNodeIdSig:    ipNodeIDSig,
 					TrackedSubnets: subnetIDBytes,

message/outbound_msg_builder.go

@@ -17,6 +17,7 @@ type Info struct {
 	PublicIP       netip.AddrPort  `json:"publicIP,omitempty"`
 	ID             ids.NodeID      `json:"nodeID"`
 	Version        string          `json:"version"`
+	UpgradeTime    uint64          `json:"upgradeTime"`
 	LastSent       time.Time       `json:"lastSent"`
 	LastReceived   time.Time       `json:"lastReceived"`
 	ObservedUptime json.Uint32     `json:"observedUptime"`

network/peer/info.go

@@ -143,6 +143,9 @@ type peer struct {
 	// version is the claimed version the peer is running that we received in
 	// the Handshake message.
 	version *version.Application
+	// upgradeTime is the claimed Unix timestamp (in seconds) of the most
+	// recently scheduled network upgrade from the Handshake message.
+	upgradeTime uint64
 	// trackedSubnets are the subnetIDs the peer sent us in the Handshake
 	// message. The primary network ID is always included.
 	trackedSubnets set.Set[ids.ID]
@@ -288,6 +291,7 @@ func (p *peer) Info() Info {
 		PublicIP:       p.ip.AddrPort,
 		ID:             p.id,
 		Version:        p.version.String(),
+		UpgradeTime:    p.upgradeTime,
 		LastSent:       p.LastSent(),
 		LastReceived:   p.LastReceived(),
 		ObservedUptime: json.Uint32(primaryUptime),
@@ -541,6 +545,7 @@ func (p *peer) writeMessages() {
 		uint32(myVersion.Major),
 		uint32(myVersion.Minor),
 		uint32(myVersion.Patch),
+		uint64(p.VersionCompatibility.UpgradeTime.Unix()),
 		mySignedIP.Timestamp,
 		mySignedIP.TLSSignature,
 		mySignedIP.BLSSignatureBytes,
@@ -909,6 +914,8 @@ func (p *peer) handleHandshake(msg *p2p.Handshake) {
 		)
 	}
 
+	p.upgradeTime = msg.UpgradeTime
+
 	// handle subnet IDs
 	if numTrackedSubnets := len(msg.TrackedSubnets); numTrackedSubnets > maxNumTrackedSubnets {
 		p.Log.Debug(malformedMessageLog,

network/peer/peer.go

@@ -356,6 +356,34 @@ func TestInvalidBLSKeyDisconnects(t *testing.T) {
 	require.NoError(peer1.AwaitClosed(t.Context()))
 }
 
+// Test that the upgrade time is exchanged and exposed correctly after the
+// handshake finishes.
+func TestUpgradeTime(t *testing.T) {
+	require := require.New(t)
+
+	sharedConfig0 := newConfig(t)
+	sharedConfig0.VersionCompatibility.UpgradeTime = time.Unix(123, 0)
+
+	sharedConfig1 := newConfig(t)
+	sharedConfig1.VersionCompatibility.UpgradeTime = time.Unix(1234, 0)
+
+	peer0, peer1 := startTestPeers(
+		newRawTestPeer(t, sharedConfig0),
+		newRawTestPeer(t, sharedConfig1),
+	)
+	require.NoError(peer0.AwaitReady(t.Context()))
+	require.NoError(peer1.AwaitReady(t.Context()))
+
+	require.Equal(uint64(sharedConfig1.VersionCompatibility.UpgradeTime.Unix()), peer0.Info().UpgradeTime)
+	require.Equal(uint64(sharedConfig0.VersionCompatibility.UpgradeTime.Unix()), peer1.Info().UpgradeTime)
+
+	peer0.StartClose()
+	peer1.StartClose()
+
+	require.NoError(peer0.AwaitClosed(t.Context()))
+	require.NoError(peer1.AwaitClosed(t.Context()))
+}
+
 func TestShouldDisconnect(t *testing.T) {
 	peerID := ids.GenerateTestNodeID()
 	txID := ids.GenerateTestID()

network/peer/peer_test.go

@@ -83,7 +83,6 @@ message Pong {
 //
 // Peers should drop connections to peers with incompatible versions.
 message Handshake {
-  reserved 5; // Until E upgrade is activated.
   // Network the peer is running on (e.g local, testnet, mainnet)
   uint32 network_id = 1;
   // Unix timestamp when this Handshake message was created
@@ -92,6 +91,9 @@ message Handshake {
   bytes ip_addr = 3;
   // IP port of the peer
   uint32 ip_port = 4;
+  // Unix timestamp (in seconds) of the most recently scheduled network upgrade.
+  // This timestamp may be the past upgrade or a future upgrade.
+  uint64 upgrade_time = 5;
   // Timestamp of the IP
   uint64 ip_signing_time = 6;
   // Signature of the peer IP port pair at a provided timestamp with the TLS