Move bloom seed into StatementProtocolConfig

Author: AndreiEres

light-base/examples/statement_test.rs

@@ -67,6 +67,7 @@ fn main() {
                     smoldot_light::network_service::StatementProtocolConfig::new(
                         core::num::NonZeroUsize::new(65536).unwrap(),
                         0.01,
+                        rand::random(),
                     ),
                 ),
             })

light-base/src/json_rpc_service/background.rs

@@ -121,8 +121,6 @@ struct Background<TPlat: PlatformRef> {
 
     statement_protocol_config: Option<network_service::StatementProtocolConfig>,
 
-    bloom_seed: u128,
-
     /// See [`Config::network_service`].
     network_service: Arc<network_service::NetworkServiceChain<TPlat>>,
     /// See [`Config::sync_service`].
@@ -519,11 +517,6 @@ pub(super) async fn run<TPlat: PlatformRef>(
             seed
         }),
         statement_protocol_config: config.statement_protocol_config,
-        bloom_seed: {
-            let mut seed_bytes = [0u8; 16];
-            config.platform.fill_random_bytes(&mut seed_bytes);
-            u128::from_le_bytes(seed_bytes)
-        },
         next_garbage_collection: Box::pin(config.platform.sleep(Duration::new(0, 0))),
         network_service: config.network_service.clone(),
         sync_service: config.sync_service.clone(),
@@ -780,11 +773,11 @@ pub(super) async fn run<TPlat: PlatformRef>(
                 if matches!(version, network_service::StatementProtocolVersion::V2) {
                     me.v2_statement_peers.insert(peer_id.clone());
                     if !me.statement_subscriptions.is_empty() {
-                        let fpr = me.statement_protocol_config.as_ref().expect("V2 peers require statement protocol; qed").false_positive_rate();
+                        let spc = me.statement_protocol_config.as_ref().expect("V2 peers require statement protocol; qed");
                         let combined_filter = build_combined_affinity_filter(
                             &me.statement_subscriptions,
-                            me.bloom_seed,
-                            fpr,
+                            spc.bloom_seed(),
+                            spc.false_positive_rate(),
                         );
                         let _ = me
                             .network_service

light-base/src/network_service.rs

@@ -82,13 +82,15 @@ pub use service::{
 pub struct StatementProtocolConfig {
     max_seen_statements: NonZeroUsize,
     false_positive_rate: f64,
+    bloom_seed: u128,
 }
 
 impl StatementProtocolConfig {
-    pub fn new(max_seen_statements: NonZeroUsize, false_positive_rate: f64) -> Self {
+    pub fn new(max_seen_statements: NonZeroUsize, false_positive_rate: f64, bloom_seed: u128) -> Self {
         StatementProtocolConfig {
             max_seen_statements,
             false_positive_rate,
+            bloom_seed,
         }
     }
 
@@ -99,6 +101,10 @@ impl StatementProtocolConfig {
     pub fn false_positive_rate(&self) -> f64 {
         self.false_positive_rate
     }
+
+    pub fn bloom_seed(&self) -> u128 {
+        self.bloom_seed
+    }
 }
 
 mod tasks;

wasm-node/rust/src/lib.rs

@@ -140,7 +140,11 @@ fn add_chain(
                     statement_protocol_config: NonZero::<usize>::new(
                         usize::try_from(statement_store_max_seen_statements).unwrap_or(0),
                     )
-                    .map(|max_seen| smoldot_light::network_service::StatementProtocolConfig::new(max_seen, statement_store_false_positive_rate)),
+                    .map(|max_seen| {
+                        let mut seed_bytes = [0u8; 16];
+                        smoldot_light::platform::PlatformRef::fill_random_bytes(&platform::PLATFORM_REF, &mut seed_bytes);
+                        smoldot_light::network_service::StatementProtocolConfig::new(max_seen, statement_store_false_positive_rate, u128::from_le_bytes(seed_bytes))
+                    }),
                 }) {
                 Ok(c) => c,
                 Err(error) => {