feat(node): Clean old P2P stack

Cargo.toml

@@ -109,7 +109,7 @@ overflow-checks = false
 # that should run with `opt-level=3` set.
 [profile.test]
 build-override.opt-level = 3
-opt-level = 2                # Set to make execution of tests in this crate faster. Cf: https://github.com/Neptune-Crypto/neptune-core/issues/204
+opt-level = 2 # Set to make execution of tests in this crate faster.
 
 [profile.release]
 build-override.opt-level = 3

consensus/src/block/pow.rs

@@ -23,7 +23,6 @@ use crate::BFieldElement;
 use crate::block::Block;
 use crate::block::block_header::BlockHeader;
 use crate::block::block_kernel::BlockKernel;
-use crate::consensus_rule_set::ConsensusRuleSet;
 use crate::proof_abstractions::mast_hash::MastHash;
 
 /// Determines the number of leafs in the Merkle tree in the guesser buffer.

locks/Cargo.toml

@@ -7,8 +7,8 @@ version = "0.8.0"
 edition = "2021"
 license = "Apache-2.0"
 
-homepage = "https://neptune.cash/"
-repository = "https://github.com/Neptune-Crypto/neptune-core/"
+homepage = "https://nyks.tech/"
+repository = "https://github.com/Nyksnet/nyksnode/"
 
 [features]
 # locks::tokio support for tracking the location of lock acquisition.

node/Cargo.toml

@@ -92,7 +92,6 @@ serde_json = "1.0"
 strum = { version = "0.27.0", features = ["derive"] }
 tasm-lib = "7.0.0"
 tokio = { version = "1.47", features = ["fs", "io-util", "macros", "process", "signal", "sync", "time", "tracing"] }
-tokio-serde = { version = "0.8", features = ["bincode", "json"] }
 tokio-util = { version = "0.7", features = ["codec", "rt", "compat"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = [

node/src/application/config/cli_args.rs

@@ -11,7 +11,6 @@ use clap::builder::TypedValueParser;
 use clap::Parser;
 use libp2p::multiaddr::Protocol;
 use libp2p::Multiaddr;
-use num_traits::Zero;
 use nyks_consensus::transaction::transaction_proof::TransactionProofQuality;
 use tracing::error;
 
@@ -170,10 +169,6 @@ pub struct Args {
     #[clap(long, default_value = "1G", value_name = "SIZE")]
     pub(crate) max_mempool_size: ByteSize,
 
-    /// Port on which to listen for standard (AKA. legacy) TCP peer connections.
-    #[clap(long, default_value = "9798", value_name = "PORT")]
-    pub peer_port: u16,
-
     /// Port on which to listen for libp2p QUIC peer connections.
     #[clap(long, default_value = "9800", value_name = "PORT")]
     pub quic_port: u16,
@@ -357,21 +352,6 @@ impl Args {
         }
     }
 
-    /// Indicates if all incoming peer connections are disallowed.
-    pub(crate) fn disallow_all_incoming_peer_connections(&self) -> bool {
-        self.max_num_peers.is_zero()
-    }
-
-    /// Return the port that peer can connect on. None if incoming connections
-    /// are disallowed.
-    pub(crate) fn own_listen_port(&self) -> Option<u16> {
-        if self.disallow_all_incoming_peer_connections() {
-            None
-        } else {
-            Some(self.peer_port)
-        }
-    }
-
     /// Check if block proposal should be accepted from this IP address.
     pub(crate) fn accept_block_proposal_from(
         &self,
@@ -541,6 +521,8 @@ impl Args {
 mod tests {
     use std::net::Ipv6Addr;
 
+    use num_traits::Zero;
+
     use super::*;
     use crate::application::config::parser::multiaddr::parse_to_multiaddr;
 
@@ -550,22 +532,12 @@ mod tests {
 
         assert_eq!(1000, default_args.peer_tolerance);
         assert_eq!(10, default_args.max_num_peers);
-        assert_eq!(9798, default_args.peer_port);
         assert_eq!(
             IpAddr::from(Ipv6Addr::UNSPECIFIED),
             default_args.peer_listen_addr
         );
     }
 
-    #[test]
-    fn max_peers_0_means_no_incoming_connections() {
-        let args = Args {
-            max_num_peers: 0,
-            ..Default::default()
-        };
-        assert!(args.disallow_all_incoming_peer_connections());
-    }
-
     #[test]
     fn cli_args_default_network_agrees_with_enum_default() {
         assert_eq!(Args::default().network, Network::default());

node/src/application/config/parser/multiaddr.rs

@@ -32,27 +32,6 @@ pub(crate) fn parse_to_multiaddr(s: &str) -> Result<Multiaddr, MultiaddrParseErr
     Ok(socketaddr_to_multiaddr(socket_addr))
 }
 
-/// Converts a `Multiaddr` to a `SocketAddr` if possible. Useful when libp2p and
-/// the legacy P2P stack are used interchangeably.
-pub(crate) fn multiaddr_to_socketaddr(addr: &Multiaddr) -> Option<SocketAddr> {
-    let mut ip: Option<IpAddr> = None;
-    let mut port: Option<u16> = None;
-
-    for p in addr {
-        match p {
-            Protocol::Ip4(v4) => ip = Some(IpAddr::V4(v4)),
-            Protocol::Ip6(v6) => ip = Some(IpAddr::V6(v6)),
-            Protocol::Tcp(p) => port = Some(p),
-            _ => {}
-        }
-    }
-
-    match (ip, port) {
-        (Some(ip), Some(port)) => Some(SocketAddr::new(ip, port)),
-        _ => None,
-    }
-}
-
 /// Used in tests, but also in genesis_node.rs, which explains why this function
 /// and the module in which it is lived is marked `pub`.
 pub fn socketaddr_to_multiaddr(addr: SocketAddr) -> Multiaddr {
@@ -72,13 +51,6 @@ pub fn socketaddr_to_multiaddr(addr: SocketAddr) -> Multiaddr {
 
 #[cfg(test)]
 pub mod tests {
-
-    use std::net::SocketAddrV4;
-    use std::net::SocketAddrV6;
-
-    use proptest::prop_assert_eq;
-    use test_strategy::proptest;
-
     use super::*;
 
     #[test]
@@ -92,25 +64,4 @@ pub mod tests {
         assert!(parse_to_multiaddr("139.162.193.206").is_ok());
         assert!(parse_to_multiaddr("2001:bc8:17c0:41e:46a8:42ff:fe22:e8e9").is_ok());
     }
-
-    #[proptest]
-    fn ipv4_multiaddr_round_trip_prop(ipv4: SocketAddrV4) {
-        let socket_addr = SocketAddr::from(ipv4);
-        let multiaddr = socketaddr_to_multiaddr(socket_addr);
-        let socket_address_again = multiaddr_to_socketaddr(&multiaddr).unwrap();
-        prop_assert_eq!(socket_addr, socket_address_again);
-    }
-
-    #[proptest]
-    fn ipv6_multiaddr_round_trip_prop(ipv6: SocketAddrV6) {
-        let socket_addr = SocketAddr::from(ipv6);
-        let multiaddr = socketaddr_to_multiaddr(socket_addr);
-        let socket_address_again = multiaddr_to_socketaddr(&multiaddr).unwrap();
-
-        // Only compare ip + port
-        prop_assert_eq!(socket_addr.ip(), socket_address_again.ip());
-        prop_assert_eq!(socket_addr.port(), socket_address_again.port());
-
-        // (Scope ID is ignored.)
-    }
 }