bloom filter constants for p=1e-12 (#1810)

Author: sergeytimoshin

program-libs/batched-merkle-tree/src/constants.rs

@@ -19,6 +19,12 @@ pub const DEFAULT_BATCH_SIZE: u64 = 15000;
 pub const DEFAULT_ZKP_BATCH_SIZE: u64 = 500;
 pub const DEFAULT_ADDRESS_ZKP_BATCH_SIZE: u64 = 250;
 
+pub const STATE_BLOOM_FILTER_CAPACITY: u64 = 2_301_536;
+pub const STATE_BLOOM_FILTER_NUM_HASHES: u64 = 10;
+
+pub const ADDRESS_BLOOM_FILTER_CAPACITY: u64 = 2_301_536;
+pub const ADDRESS_BLOOM_FILTER_NUM_HASHES: u64 = 10;
+
 pub const DEFAULT_CPI_CONTEXT_ACCOUNT_SIZE: u64 = 20 * 1024 + 8;
 
 pub const ADDRESS_TREE_INIT_ROOT_40: [u8; 32] = [

program-libs/batched-merkle-tree/src/initialize_address_tree.rs

@@ -171,6 +171,7 @@ pub fn get_address_merkle_tree_account_size_from_params(
 pub mod test_utils {
     pub use super::InitAddressTreeAccountsInstructionData;
     use crate::constants::{
+        ADDRESS_BLOOM_FILTER_CAPACITY, ADDRESS_BLOOM_FILTER_NUM_HASHES,
         DEFAULT_ADDRESS_ZKP_BATCH_SIZE, TEST_DEFAULT_BATCH_SIZE, TEST_DEFAULT_ZKP_BATCH_SIZE,
     };
 
@@ -213,12 +214,12 @@ pub mod test_utils {
                 index: 0,
                 program_owner: None,
                 forester: None,
-                bloom_filter_num_iters: 3,
-                input_queue_batch_size: 2000,
+                bloom_filter_num_iters: ADDRESS_BLOOM_FILTER_NUM_HASHES,
+                input_queue_batch_size: 15000,
                 input_queue_zkp_batch_size: DEFAULT_ADDRESS_ZKP_BATCH_SIZE,
                 height: 40,
                 root_history_capacity: 20,
-                bloom_filter_capacity: 20_000 * 8,
+                bloom_filter_capacity: ADDRESS_BLOOM_FILTER_CAPACITY,
                 network_fee: Some(5000),
                 rollover_threshold: Some(95),
                 close_threshold: None,

program-libs/batched-merkle-tree/src/initialize_state_tree.rs

@@ -244,7 +244,10 @@ pub mod test_utils {
     pub use super::InitStateTreeAccountsInstructionData;
     use super::*;
     use crate::{
-        constants::{TEST_DEFAULT_BATCH_SIZE, TEST_DEFAULT_ZKP_BATCH_SIZE},
+        constants::{
+            STATE_BLOOM_FILTER_CAPACITY, STATE_BLOOM_FILTER_NUM_HASHES, TEST_DEFAULT_BATCH_SIZE,
+            TEST_DEFAULT_ZKP_BATCH_SIZE,
+        },
         queue::{test_utils::assert_queue_inited, BatchedQueueMetadata},
         queue_batch_metadata::QueueBatches,
     };
@@ -296,14 +299,14 @@ pub mod test_utils {
                 program_owner: None,
                 forester: None,
                 additional_bytes: DEFAULT_CPI_CONTEXT_ACCOUNT_SIZE,
-                bloom_filter_num_iters: 3,
-                input_queue_batch_size: 2000,
-                output_queue_batch_size: 2000,
+                bloom_filter_num_iters: STATE_BLOOM_FILTER_NUM_HASHES,
+                input_queue_batch_size: 15000,
+                output_queue_batch_size: 15000,
                 input_queue_zkp_batch_size: DEFAULT_ZKP_BATCH_SIZE,
                 output_queue_zkp_batch_size: DEFAULT_ZKP_BATCH_SIZE,
                 height: DEFAULT_BATCH_STATE_TREE_HEIGHT,
                 root_history_capacity: 20,
-                bloom_filter_capacity: 20_000 * 8,
+                bloom_filter_capacity: STATE_BLOOM_FILTER_CAPACITY,
                 network_fee: Some(5000),
                 rollover_threshold: Some(95),
                 close_threshold: None,