remove solana-sdk from gossip (#4986)

Author: kevinheavey

Cargo.lock

@@ -32,31 +32,42 @@ siphasher = { workspace = true }
 solana-bloom = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-client = { workspace = true }
+solana-clock = { workspace = true }
 solana-connection-cache = { workspace = true }
 solana-entry = { workspace = true }
+solana-epoch-schedule = { workspace = true }
 solana-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }
 solana-frozen-abi-macro = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }
+solana-hash = { workspace = true }
+solana-keypair = { workspace = true }
 solana-ledger = { workspace = true }
 solana-logger = { workspace = true }
 solana-measure = { workspace = true }
 solana-metrics = { workspace = true }
+solana-native-token = { workspace = true }
 solana-net-utils = { workspace = true }
+solana-packet = { workspace = true }
 solana-perf = { workspace = true }
-solana-pubkey = { workspace = true }
+solana-pubkey = { workspace = true, features = ["rand"] }
+solana-quic-definitions = { workspace = true }
 solana-rayon-threadlimit = { workspace = true }
 solana-rpc-client = { workspace = true }
 solana-runtime = { workspace = true }
 solana-sanitize = { workspace = true }
-solana-sdk = { workspace = true }
 solana-serde-varint = { workspace = true }
+solana-sha256-hasher = { workspace = true }
 solana-short-vec = { workspace = true }
+solana-signature = { workspace = true }
+solana-signer = { workspace = true }
 solana-streamer = { workspace = true }
+solana-time-utils = { workspace = true }
 solana-tpu-client = { workspace = true }
+solana-transaction = { workspace = true }
 solana-version = { workspace = true }
 solana-vote = { workspace = true }
 solana-vote-program = { workspace = true }
@@ -72,6 +83,10 @@ rand_chacha0-2 = { workspace = true }
 serial_test = { workspace = true }
 solana-perf = { workspace = true, features = ["dev-context-only-utils"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
+solana-sdk = { workspace = true }
+solana-system-transaction = { workspace = true }
+solana-vote-interface = { workspace = true }
+static_assertions = { workspace = true }
 test-case = { workspace = true }
 
 [features]

gossip/Cargo.toml

@@ -10,7 +10,7 @@ use {
         crds_gossip_pull::{CrdsFilter, CrdsGossipPull},
         crds_value::CrdsValue,
     },
-    solana_sdk::hash::Hash,
+    solana_hash::Hash,
     std::sync::RwLock,
     test::Bencher,
 };

gossip/benches/crds_gossip_pull.rs

@@ -9,7 +9,7 @@ use {
         crds_shards::CrdsShards,
         crds_value::CrdsValue,
     },
-    solana_sdk::timing::timestamp,
+    solana_time_utils::timestamp,
     std::iter::repeat_with,
     test::Bencher,
 };

gossip/benches/crds_shards.rs

@@ -48,6 +48,9 @@ use {
     itertools::{Either, Itertools},
     rand::{seq::SliceRandom, CryptoRng, Rng},
     rayon::{prelude::*, ThreadPool, ThreadPoolBuilder},
+    solana_clock::{Slot, DEFAULT_MS_PER_SLOT, DEFAULT_SLOTS_PER_EPOCH},
+    solana_hash::Hash,
+    solana_keypair::{signable::Signable, Keypair},
     solana_ledger::shred::Shred,
     solana_net_utils::{
         bind_common_in_range_with_config, bind_common_with_config, bind_in_range,
@@ -59,24 +62,21 @@ use {
         data_budget::DataBudget,
         packet::{Packet, PacketBatch, PacketBatchRecycler, PACKET_DATA_SIZE},
     },
+    solana_pubkey::Pubkey,
+    solana_quic_definitions::QUIC_PORT_OFFSET,
     solana_rayon_threadlimit::get_thread_count,
     solana_runtime::bank_forks::BankForks,
     solana_sanitize::Sanitize,
-    solana_sdk::{
-        clock::{Slot, DEFAULT_MS_PER_SLOT, DEFAULT_SLOTS_PER_EPOCH},
-        hash::Hash,
-        pubkey::Pubkey,
-        quic::QUIC_PORT_OFFSET,
-        signature::{Keypair, Signable, Signature, Signer},
-        timing::timestamp,
-        transaction::Transaction,
-    },
+    solana_signature::Signature,
+    solana_signer::Signer,
     solana_streamer::{
         packet,
         quic::DEFAULT_QUIC_ENDPOINTS,
         socket::SocketAddrSpace,
         streamer::{PacketBatchReceiver, PacketBatchSender},
     },
+    solana_time_utils::timestamp,
+    solana_transaction::Transaction,
     solana_vote::vote_parser,
     solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY,
     std::{
@@ -119,7 +119,7 @@ pub const DEFAULT_CONTACT_SAVE_INTERVAL_MILLIS: u64 = 60_000;
 pub(crate) const CRDS_UNIQUE_PUBKEY_CAPACITY: usize = 8192;
 /// Minimum stake that a node should have so that its CRDS values are
 /// propagated through gossip (few types are exempted).
-const MIN_STAKE_FOR_GOSSIP: u64 = solana_sdk::native_token::LAMPORTS_PER_SOL;
+const MIN_STAKE_FOR_GOSSIP: u64 = solana_native_token::LAMPORTS_PER_SOL;
 /// Minimum number of staked nodes for enforcing stakes in gossip.
 const MIN_NUM_STAKED_NODES: usize = 500;
 
@@ -3037,9 +3037,10 @@ mod tests {
         },
         bincode::serialize,
         itertools::izip,
+        solana_keypair::Keypair,
         solana_ledger::shred::Shredder,
         solana_net_utils::bind_to,
-        solana_sdk::signature::{Keypair, Signer},
+        solana_signer::Signer,
         solana_vote_program::{vote_instruction, vote_state::Vote},
         std::{
             iter::repeat_with,

gossip/src/cluster_info.rs

@@ -1,8 +1,9 @@
 use {
     crate::{crds_gossip::CrdsGossip, protocol::Protocol},
     itertools::Itertools,
+    solana_clock::Slot,
     solana_measure::measure::Measure,
-    solana_sdk::{clock::Slot, pubkey::Pubkey},
+    solana_pubkey::Pubkey,
     std::{
         cmp::Reverse,
         collections::HashMap,

gossip/src/cluster_info_metrics.rs

@@ -3,12 +3,9 @@ use {
     crate::{crds_data::MAX_WALLCLOCK, legacy_contact_info::LegacyContactInfo},
     assert_matches::{assert_matches, debug_assert_matches},
     serde::{Deserialize, Deserializer, Serialize},
+    solana_pubkey::Pubkey,
+    solana_quic_definitions::QUIC_PORT_OFFSET,
     solana_sanitize::{Sanitize, SanitizeError},
-    solana_sdk::{
-        pubkey::Pubkey,
-        quic::QUIC_PORT_OFFSET,
-        rpc_port::{DEFAULT_RPC_PORT, DEFAULT_RPC_PUBSUB_PORT},
-    },
     solana_serde_varint as serde_varint, solana_short_vec as short_vec,
     solana_streamer::socket::SocketAddrSpace,
     static_assertions::const_assert_eq,
@@ -21,6 +18,17 @@ use {
     thiserror::Error,
 };
 
+// inline consts to avoid solana-sdk dep
+const DEFAULT_RPC_PORT: u16 = 8899;
+const DEFAULT_RPC_PUBSUB_PORT: u16 = 8900;
+#[cfg(test)]
+static_assertions::const_assert_eq!(DEFAULT_RPC_PORT, solana_sdk::rpc_port::DEFAULT_RPC_PORT);
+#[cfg(test)]
+static_assertions::const_assert_eq!(
+    DEFAULT_RPC_PUBSUB_PORT,
+    solana_sdk::rpc_port::DEFAULT_RPC_PUBSUB_PORT
+);
+
 pub const SOCKET_ADDR_UNSPECIFIED: SocketAddr =
     SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), /*port:*/ 0u16);
 const EMPTY_SOCKET_ADDR_CACHE: [SocketAddr; SOCKET_CACHE_SIZE] =
@@ -397,7 +405,7 @@ impl ContactInfo {
     /// New random ContactInfo for tests and simulations.
     pub fn new_rand<R: rand::Rng>(rng: &mut R, pubkey: Option<Pubkey>) -> Self {
         let delay = 10 * 60 * 1000; // 10 minutes
-        let now = solana_sdk::timing::timestamp() - delay + rng.gen_range(0..2 * delay);
+        let now = solana_time_utils::timestamp() - delay + rng.gen_range(0..2 * delay);
         let pubkey = pubkey.unwrap_or_else(solana_pubkey::new_rand);
         let mut node = ContactInfo::new_localhost(&pubkey, now);
         let _ = node.set_gossip((Ipv4Addr::LOCALHOST, rng.gen_range(1024..u16::MAX)));
@@ -408,8 +416,8 @@ impl ContactInfo {
     pub fn new_gossip_entry_point(gossip_addr: &SocketAddr) -> Self {
         let mut node = Self::new(
             Pubkey::default(),
-            solana_sdk::timing::timestamp(), // wallclock
-            0,                               // shred_version
+            solana_time_utils::timestamp(), // wallclock
+            0,                              // shred_version
         );
         if let Err(err) = node.set_gossip(*gossip_addr) {
             error!("Invalid entrypoint: {gossip_addr}, {err:?}");
@@ -446,8 +454,8 @@ impl ContactInfo {
         assert_matches!(sanitize_socket(socket), Ok(()));
         let mut node = Self::new(
             *pubkey,
-            solana_sdk::timing::timestamp(), // wallclock,
-            0u16,                            // shred_version
+            solana_time_utils::timestamp(), // wallclock,
+            0u16,                           // shred_version
         );
         let (addr, port) = (socket.ip(), socket.port());
         node.set_gossip((addr, port + 1)).unwrap();
@@ -679,7 +687,8 @@ mod tests {
     use {
         super::*,
         rand::{seq::SliceRandom, Rng},
-        solana_sdk::signature::{Keypair, Signer},
+        solana_keypair::Keypair,
+        solana_signer::Signer,
         std::{
             collections::{HashMap, HashSet},
             iter::repeat_with,
@@ -1001,7 +1010,7 @@ mod tests {
     fn test_new_localhost() {
         let node = ContactInfo::new_localhost(
             &Keypair::new().pubkey(),
-            solana_sdk::timing::timestamp(), // wallclock
+            solana_time_utils::timestamp(), // wallclock
         );
         cross_verify_with_legacy(&node);
     }

gossip/src/contact_info.rs

@@ -41,7 +41,10 @@ use {
     },
     lru::LruCache,
     rayon::{prelude::*, ThreadPool},
-    solana_sdk::{clock::Slot, hash::Hash, pubkey::Pubkey, signature::Signature},
+    solana_clock::Slot,
+    solana_hash::Hash,
+    solana_pubkey::Pubkey,
+    solana_signature::Signature,
     std::{
         cmp::Ordering,
         collections::{hash_map, BTreeMap, HashMap, VecDeque},
@@ -785,10 +788,9 @@ mod tests {
         rand::{thread_rng, Rng, SeedableRng},
         rand_chacha::ChaChaRng,
         rayon::ThreadPoolBuilder,
-        solana_sdk::{
-            signature::{Keypair, Signer},
-            timing::timestamp,
-        },
+        solana_keypair::Keypair,
+        solana_signer::Signer,
+        solana_time_utils::timestamp,
         std::{collections::HashSet, iter::repeat_with, net::Ipv4Addr, time::Duration},
     };
 

gossip/src/crds.rs

@@ -9,14 +9,12 @@ use {
     },
     rand::Rng,
     serde::de::{Deserialize, Deserializer},
+    solana_clock::Slot,
+    solana_hash::Hash,
+    solana_pubkey::{self, Pubkey},
     solana_sanitize::{Sanitize, SanitizeError},
-    solana_sdk::{
-        clock::Slot,
-        hash::Hash,
-        pubkey::{self, Pubkey},
-        timing::timestamp,
-        transaction::Transaction,
-    },
+    solana_time_utils::timestamp,
+    solana_transaction::Transaction,
     solana_vote::vote_parser,
     std::{cmp::Ordering, collections::BTreeSet},
 };
@@ -245,7 +243,7 @@ impl AccountsHashes {
         .take(num_hashes)
         .collect();
         Self {
-            from: pubkey.unwrap_or_else(pubkey::new_rand),
+            from: pubkey.unwrap_or_else(solana_pubkey::new_rand),
             hashes,
             wallclock: new_rand_timestamp(rng),
         }
@@ -307,7 +305,7 @@ impl LowestSlot {
     /// New random LowestSlot for tests and benchmarks.
     fn new_rand<R: Rng>(rng: &mut R, pubkey: Option<Pubkey>) -> Self {
         Self {
-            from: pubkey.unwrap_or_else(pubkey::new_rand),
+            from: pubkey.unwrap_or_else(solana_pubkey::new_rand),
             root: rng.gen(),
             lowest: rng.gen(),
             slots: BTreeSet::default(),
@@ -368,7 +366,7 @@ impl Vote {
     /// New random Vote for tests and benchmarks.
     fn new_rand<R: Rng>(rng: &mut R, pubkey: Option<Pubkey>) -> Self {
         Self {
-            from: pubkey.unwrap_or_else(pubkey::new_rand),
+            from: pubkey.unwrap_or_else(solana_pubkey::new_rand),
             transaction: Transaction::default(),
             wallclock: new_rand_timestamp(rng),
             slot: None,
@@ -503,11 +501,10 @@ mod test {
         super::*,
         crate::crds_value::CrdsValue,
         bincode::Options,
+        solana_keypair::Keypair,
         solana_perf::test_tx::new_test_vote_tx,
-        solana_sdk::{
-            signature::{Keypair, Signer},
-            timing::timestamp,
-        },
+        solana_signer::Signer,
+        solana_time_utils::timestamp,
         solana_vote_program::{vote_instruction, vote_state},
     };
 

gossip/src/crds_data.rs

@@ -68,7 +68,7 @@ mod tests {
             crds_data::new_rand_timestamp,
         },
         rand::seq::SliceRandom,
-        solana_sdk::signature::Keypair,
+        solana_keypair::Keypair,
         std::collections::HashMap,
     };