Add p2p v7, and make other versions obsolete one day before crescendo (kaspanet#662)

* Add p2p v7, and make other versions obsolete one day before crescendo

* Apply only to mainnet

* Fix threshold and protocol version for v6

Co-authored-by: Michael Sutton <[email protected]>

* Make v7 an alias of v6

Co-authored-by: Michael Sutton <[email protected]>

* Change network type to 'not testnet'

---------

Co-authored-by: Michael Sutton <[email protected]>

Author: someone235

protocol/flows/src/flow_context.rs

@@ -1,18 +1,24 @@
-use crate::flowcontext::{
-    orphans::{OrphanBlocksPool, OrphanOutput},
-    process_queue::ProcessQueue,
-    transactions::TransactionsSpread,
+use crate::{
+    flowcontext::{
+        orphans::{OrphanBlocksPool, OrphanOutput},
+        process_queue::ProcessQueue,
+        transactions::TransactionsSpread,
+    },
+    v7,
 };
 use crate::{v5, v6};
 use async_trait::async_trait;
 use futures::future::join_all;
 use kaspa_addressmanager::AddressManager;
 use kaspa_connectionmanager::ConnectionManager;
-use kaspa_consensus_core::api::{BlockValidationFuture, BlockValidationFutures};
 use kaspa_consensus_core::block::Block;
 use kaspa_consensus_core::config::Config;
 use kaspa_consensus_core::errors::block::RuleError;
 use kaspa_consensus_core::tx::{Transaction, TransactionId};
+use kaspa_consensus_core::{
+    api::{BlockValidationFuture, BlockValidationFutures},
+    network::NetworkType,
+};
 use kaspa_consensus_notify::{
     notification::{Notification, PruningPointUtxoSetOverrideNotification},
     root::ConsensusNotificationRoot,
@@ -58,8 +64,8 @@ use tokio::sync::{
 use tokio_stream::{wrappers::UnboundedReceiverStream, StreamExt};
 use uuid::Uuid;
 
-/// The P2P protocol version. Currently the only one supported.
-const PROTOCOL_VERSION: u32 = 6;
+/// The P2P protocol version.
+const PROTOCOL_VERSION: u32 = 7;
 
 /// See `check_orphan_resolution_range`
 const BASELINE_ORPHAN_RESOLUTION_RANGE: u32 = 5;
@@ -776,10 +782,24 @@ impl ConnectionInitializer for FlowContext {
         debug!("protocol versions - self: {}, peer: {}", PROTOCOL_VERSION, peer_version.protocol_version);
 
         // Register all flows according to version
-        let (flows, applied_protocol_version) = match peer_version.protocol_version {
-            v if v >= PROTOCOL_VERSION => (v6::register(self.clone(), router.clone()), PROTOCOL_VERSION),
-            5 => (v5::register(self.clone(), router.clone()), 5),
-            v => return Err(ProtocolError::VersionMismatch(PROTOCOL_VERSION, v)),
+        const CONNECT_ONLY_NEW_VERSIONS_THRESHOLD_MILLIS: u64 = 24 * 3600 * 1000; // one day in milliseconds
+        let daa_threshold = CONNECT_ONLY_NEW_VERSIONS_THRESHOLD_MILLIS / self.config.target_time_per_block().before();
+        let sink_daa_score = self.consensus().unguarded_session().async_get_sink_daa_score_timestamp().await.daa_score;
+        let connect_only_new_versions = self.config.net.network_type() != NetworkType::Testnet
+            && self.config.crescendo_activation.is_active(sink_daa_score + daa_threshold); // activate the protocol version constraint daa_threshold blocks ahead of time
+
+        let (flows, applied_protocol_version) = if connect_only_new_versions {
+            match peer_version.protocol_version {
+                v if v >= PROTOCOL_VERSION => (v7::register(self.clone(), router.clone()), PROTOCOL_VERSION),
+                v => return Err(ProtocolError::VersionMismatch(PROTOCOL_VERSION, v)),
+            }
+        } else {
+            match peer_version.protocol_version {
+                v if v >= PROTOCOL_VERSION => (v7::register(self.clone(), router.clone()), PROTOCOL_VERSION),
+                6 => (v6::register(self.clone(), router.clone()), 6),
+                5 => (v5::register(self.clone(), router.clone()), 5),
+                v => return Err(ProtocolError::VersionMismatch(PROTOCOL_VERSION, v)),
+            }
         };
 
         // Build and register the peer properties

protocol/flows/src/lib.rs

@@ -4,3 +4,4 @@ pub mod flowcontext;
 pub mod service;
 pub mod v5;
 pub mod v6;
+pub use v6 as v7;