Add setup for account control

Author: gregcusack

Cargo.lock

@@ -52,6 +52,7 @@ serde-big-array = { workspace = true }
 serde_bytes = { workspace = true }
 serde_derive = { workspace = true }
 siphasher = { workspace = true }
+solana-account = { workspace = true }
 solana-bloom = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-client = { workspace = true }

gossip/Cargo.toml

@@ -68,7 +68,7 @@ use {
     solana_pubkey::Pubkey,
     solana_quic_definitions::QUIC_PORT_OFFSET,
     solana_rayon_threadlimit::get_thread_count,
-    solana_runtime::bank_forks::BankForks,
+    solana_runtime::{bank::Bank, bank_forks::BankForks},
     solana_sanitize::Sanitize,
     solana_signature::Signature,
     solana_signer::Signer,
@@ -223,6 +223,7 @@ impl ClusterInfo {
         stakes: &HashMap<Pubkey, u64>,
         gossip_validators: Option<&HashSet<Pubkey>>,
         sender: &impl ChannelSend<PacketBatch>,
+        maybe_bank_ref: Option<&Bank>,
     ) {
         let shred_version = self.my_contact_info.read().unwrap().shred_version();
         let self_keypair: Arc<Keypair> = self.keypair().clone();
@@ -235,6 +236,7 @@ impl ClusterInfo {
             &self.ping_cache,
             &mut pings,
             &self.socket_addr_space,
+            maybe_bank_ref,
         );
         let pings = pings
             .into_iter()
@@ -1436,7 +1438,7 @@ impl ClusterInfo {
             .thread_name(|i| format!("solRunGossip{i:02}"))
             .build()
             .unwrap();
-        let mut epoch_specs = bank_forks.map(EpochSpecs::from);
+        let mut epoch_specs = bank_forks.clone().map(EpochSpecs::from);
         Builder::new()
             .name("solGossip".to_string())
             .spawn(move || {
@@ -1493,12 +1495,18 @@ impl ClusterInfo {
                     //TODO: possibly tune this parameter
                     //we saw a deadlock passing an self.read().unwrap().timeout into sleep
                     if start - last_push > REFRESH_PUSH_ACTIVE_SET_INTERVAL_MS {
+                        let maybe_bank = bank_forks
+                            .as_ref()
+                            .and_then(|bf| bf.read().ok()) // RwLockGuard
+                            .map(|forks| forks.root_bank()); // Arc<Bank>
+                        let maybe_bank_ref = maybe_bank.as_deref(); // Option<&Bank>
                         self.refresh_my_gossip_contact_info();
                         self.refresh_push_active_set(
                             &recycler,
                             &stakes,
                             gossip_validators.as_ref(),
                             &sender,
+                            maybe_bank_ref,
                         );
                         last_push = timestamp();
                     }
@@ -3086,6 +3094,7 @@ mod tests {
             &cluster_info.ping_cache,
             &mut Vec::new(), // pings
             &SocketAddrSpace::Unspecified,
+            None,
         );
         let mut reqs = cluster_info.generate_new_gossip_requests(
             &thread_pool,
@@ -3227,6 +3236,7 @@ mod tests {
             &cluster_info.ping_cache,
             &mut Vec::new(), // pings
             &SocketAddrSpace::Unspecified,
+            None,
         );
         //check that all types of gossip messages are signed correctly
         cluster_info.flush_push_queue();

gossip/src/cluster_info.rs

@@ -27,6 +27,7 @@ use {
     solana_keypair::Keypair,
     solana_ledger::shred::Shred,
     solana_pubkey::Pubkey,
+    solana_runtime::bank::Bank,
     solana_signer::Signer,
     solana_streamer::socket::SocketAddrSpace,
     solana_time_utils::timestamp,
@@ -186,6 +187,7 @@ impl CrdsGossip {
         ping_cache: &Mutex<PingCache>,
         pings: &mut Vec<(SocketAddr, Ping)>,
         socket_addr_space: &SocketAddrSpace,
+        maybe_bank_ref: Option<&Bank>,
     ) {
         self.push.refresh_push_active_set(
             &self.crds,
@@ -196,6 +198,7 @@ impl CrdsGossip {
             ping_cache,
             pings,
             socket_addr_space,
+            maybe_bank_ref,
         )
     }
 
@@ -445,6 +448,7 @@ mod test {
             &ping_cache,
             &mut Vec::new(), // pings
             &SocketAddrSpace::Unspecified,
+            None,
         );
         let now = timestamp();
         //incorrect dest

gossip/src/crds_gossip.rs

@@ -25,6 +25,7 @@ use {
     itertools::Itertools,
     solana_keypair::Keypair,
     solana_pubkey::Pubkey,
+    solana_runtime::bank::Bank,
     solana_signer::Signer,
     solana_streamer::socket::SocketAddrSpace,
     solana_time_utils::timestamp,
@@ -250,6 +251,7 @@ impl CrdsGossipPush {
         ping_cache: &Mutex<PingCache>,
         pings: &mut Vec<(SocketAddr, Ping)>,
         socket_addr_space: &SocketAddrSpace,
+        maybe_bank_ref: Option<&Bank>,
     ) {
         let mut rng = rand::thread_rng();
         // Active and valid gossip nodes with matching shred-version.
@@ -287,6 +289,7 @@ impl CrdsGossipPush {
             cluster_size,
             &nodes,
             stakes,
+            maybe_bank_ref,
         )
     }
 }
@@ -447,6 +450,7 @@ mod tests {
             &ping_cache,
             &mut Vec::new(), // pings
             &SocketAddrSpace::Unspecified,
+            None,
         );
 
         let new_msg = CrdsValue::new_unsigned(CrdsData::from(ContactInfo::new_localhost(
@@ -514,6 +518,7 @@ mod tests {
             &ping_cache,
             &mut Vec::new(),
             &SocketAddrSpace::Unspecified,
+            None,
         );
 
         // push 3's contact info to 1 and 2 and 3
@@ -557,6 +562,7 @@ mod tests {
             &ping_cache,
             &mut Vec::new(), // pings
             &SocketAddrSpace::Unspecified,
+            None,
         );
 
         let new_msg = CrdsValue::new_unsigned(CrdsData::from(ContactInfo::new_localhost(
@@ -605,6 +611,7 @@ mod tests {
             &ping_cache,
             &mut Vec::new(), // pings
             &SocketAddrSpace::Unspecified,
+            None,
         );
 
         let mut ci = ContactInfo::new_localhost(&solana_pubkey::new_rand(), 0);

gossip/src/crds_gossip_push.rs

@@ -41,6 +41,7 @@ mod protocol;
 mod push_active_set;
 mod received_cache;
 pub mod restart_crds_values;
+pub mod stake_weighting_config;
 pub mod weighted_shuffle;
 
 #[macro_use]

gossip/src/lib.rs

@@ -9,18 +9,28 @@
 //!     K = W_C / (1 + W_C), where Wc = 2π * Fc * Fs
 //!     Fc = 1 / TC  (cutoff frequency)
 //!     Fs = 1 / refresh interval
-use crate::cluster_info::REFRESH_PUSH_ACTIVE_SET_INTERVAL_MS;
+use std::num::NonZeroU64;
 
 // Fixed point scale for K and `alpha` calculation
-pub const SCALE: u64 = 1_000;
-// 30_000ms convergence time
-const TC_MS: u64 = 30_000;
-// 7500ms refresh interval
-const FS_MS: u64 = REFRESH_PUSH_ACTIVE_SET_INTERVAL_MS;
+pub const SCALE: NonZeroU64 = NonZeroU64::new(1000).unwrap();
 // 2 * pi * SCALE
 const TWO_PI_SCALED: u64 = 6_283;
-const W_C_SCALED: u64 = (TWO_PI_SCALED * FS_MS) / TC_MS;
-const K: u64 = (W_C_SCALED * 1_000 + (SCALE / 2)) / (SCALE + W_C_SCALED);
+
+/// Computes the filter constant `K` for a given sample period and
+/// time‑constant, both in **milliseconds**.
+///
+///     K = Wc / (1 + Wc)   where  Wc = 2π · Fs / Tc
+///
+/// Returns `K` scaled by `SCALE` (0–1000).
+pub fn compute_k(fs_ms: u64, tc_ms: u64) -> u64 {
+    if tc_ms == 0 {
+        return 0;
+    } // disabled / passthrough
+    let scale = SCALE.get();
+    let wc_scaled = (TWO_PI_SCALED * fs_ms) / tc_ms;
+    // round to nearest integer
+    ((wc_scaled * scale + scale / 2) / (scale + wc_scaled)).min(scale)
+}
 
 /// Updates alpha with a first-order low-pass filter.
 /// ### Convergence Characteristics (w/ K = 0.611):
@@ -32,21 +42,23 @@ const K: u64 = (W_C_SCALED * 1_000 + (SCALE / 2)) / (SCALE + W_C_SCALED);
 ///   - ~98% after 4
 ///   - ~99% after 5
 ///
-/// Note: Each update is 7500ms apart.
+/// Note: Each update is `fs_ms` apart. `fs_ms` is 7500ms for push_active_set.
 ///
 /// If future code changes make `alpha_target` jump larger, we must retune
 /// `TC`/`K` or use a higher‑order filter to avoid lag/overshoot.
 /// Returns `alpha_new = K * target + (1 - K) * prev`, rounded and clamped.
-pub fn filter_alpha(prev: u64, target: u64, min: u64, max: u64) -> u64 {
-    let updated = (K * target + (SCALE - K) * prev) / SCALE;
-    updated.clamp(min, max)
+pub fn filter_alpha(prev: u64, target: u64, k: u64, min: u64, max: u64) -> u64 {
+    let scale = SCALE.get();
+    let next = (k * target + (scale - k) * prev) / scale;
+    next.clamp(min, max)
 }
 
 /// Approximates `base^alpha` rounded to nearest integer using
 /// integer-only linear interpolation between `base^1` and `base^2`.
 #[inline]
 pub fn interpolate(base: u64, t: u64) -> u64 {
-    debug_assert!(t <= SCALE, "interpolation t={} > SCALE={}", t, SCALE);
+    let scale = SCALE.get();
+    debug_assert!(t <= scale, "interpolation t={} > SCALE={}", t, scale);
     let base_squared = base.saturating_mul(base);
-    ((base * (SCALE - t) + base_squared * t) + SCALE / 2) / SCALE
+    ((base * (scale - t) + base_squared * t) + scale / 2) / scale
 }