refactor: replace root history capacity with DEFAULT_BATCH_ROOT_HISTORY_LEN constant and set it 200 (#1835)

Author: sergeytimoshin

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

@@ -6,7 +6,7 @@ pub const DEFAULT_BATCH_ADDRESS_TREE_HEIGHT: u32 = 40;
 
 pub const DEFAULT_BATCH_STATE_TREE_HEIGHT: u32 = 32;
 
-pub const DEFAULT_BATCH_STATE_ROOT_HISTORY_LEN: u32 = 20;
+pub const DEFAULT_BATCH_ROOT_HISTORY_LEN: u32 = 200;
 
 pub const DEFAULT_NUM_BATCHES: u64 = 2;
 

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

@@ -7,8 +7,8 @@ use light_merkle_tree_metadata::{
 
 use crate::{
     constants::{
-        DEFAULT_ADDRESS_ZKP_BATCH_SIZE, DEFAULT_BATCH_ADDRESS_TREE_HEIGHT, DEFAULT_BATCH_SIZE,
-        DEFAULT_ZKP_BATCH_SIZE,
+        DEFAULT_ADDRESS_ZKP_BATCH_SIZE, DEFAULT_BATCH_ADDRESS_TREE_HEIGHT,
+        DEFAULT_BATCH_ROOT_HISTORY_LEN, DEFAULT_BATCH_SIZE,
     },
     errors::BatchedMerkleTreeError,
     initialize_state_tree::match_circuit_size,
@@ -43,7 +43,7 @@ impl Default for InitAddressTreeAccountsInstructionData {
             input_queue_batch_size: DEFAULT_BATCH_SIZE,
             input_queue_zkp_batch_size: DEFAULT_ADDRESS_ZKP_BATCH_SIZE,
             height: 40,
-            root_history_capacity: (DEFAULT_BATCH_SIZE / DEFAULT_ZKP_BATCH_SIZE * 2) as u32,
+            root_history_capacity: DEFAULT_BATCH_ROOT_HISTORY_LEN,
             bloom_filter_capacity: DEFAULT_BATCH_SIZE * 8,
             network_fee: Some(5000),
             rollover_threshold: Some(95),
@@ -172,7 +172,8 @@ 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,
+        DEFAULT_ADDRESS_ZKP_BATCH_SIZE, DEFAULT_BATCH_ROOT_HISTORY_LEN, TEST_DEFAULT_BATCH_SIZE,
+        TEST_DEFAULT_ZKP_BATCH_SIZE,
     };
 
     impl InitAddressTreeAccountsInstructionData {
@@ -185,7 +186,7 @@ pub mod test_utils {
                 input_queue_batch_size: TEST_DEFAULT_BATCH_SIZE,
                 input_queue_zkp_batch_size: TEST_DEFAULT_ZKP_BATCH_SIZE,
                 height: 40,
-                root_history_capacity: 20,
+                root_history_capacity: DEFAULT_BATCH_ROOT_HISTORY_LEN,
                 bloom_filter_capacity: 20_000 * 8,
                 network_fee: Some(5000),
                 rollover_threshold: Some(95),
@@ -202,7 +203,7 @@ pub mod test_utils {
                 input_queue_batch_size: 500,
                 input_queue_zkp_batch_size: TEST_DEFAULT_ZKP_BATCH_SIZE,
                 height: 40,
-                root_history_capacity: 20,
+                root_history_capacity: DEFAULT_BATCH_ROOT_HISTORY_LEN,
                 bloom_filter_capacity: 20_000 * 8,
                 network_fee: Some(5000),
                 rollover_threshold: Some(95),
@@ -218,7 +219,7 @@ pub mod test_utils {
                 input_queue_batch_size: 15000,
                 input_queue_zkp_batch_size: DEFAULT_ADDRESS_ZKP_BATCH_SIZE,
                 height: 40,
-                root_history_capacity: 20,
+                root_history_capacity: DEFAULT_BATCH_ROOT_HISTORY_LEN,
                 bloom_filter_capacity: ADDRESS_BLOOM_FILTER_CAPACITY,
                 network_fee: Some(5000),
                 rollover_threshold: Some(95),

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

@@ -245,8 +245,8 @@ pub mod test_utils {
     use super::*;
     use crate::{
         constants::{
-            STATE_BLOOM_FILTER_CAPACITY, STATE_BLOOM_FILTER_NUM_HASHES, TEST_DEFAULT_BATCH_SIZE,
-            TEST_DEFAULT_ZKP_BATCH_SIZE,
+            DEFAULT_BATCH_ROOT_HISTORY_LEN, 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,
@@ -265,7 +265,7 @@ pub mod test_utils {
                 input_queue_zkp_batch_size: TEST_DEFAULT_ZKP_BATCH_SIZE,
                 output_queue_zkp_batch_size: TEST_DEFAULT_ZKP_BATCH_SIZE,
                 height: DEFAULT_BATCH_STATE_TREE_HEIGHT,
-                root_history_capacity: 20,
+                root_history_capacity: DEFAULT_BATCH_ROOT_HISTORY_LEN,
                 bloom_filter_capacity: 20_000 * 8,
                 network_fee: Some(5000),
                 rollover_threshold: Some(95),
@@ -285,7 +285,7 @@ pub mod test_utils {
                 input_queue_zkp_batch_size: TEST_DEFAULT_ZKP_BATCH_SIZE,
                 output_queue_zkp_batch_size: TEST_DEFAULT_ZKP_BATCH_SIZE,
                 height: DEFAULT_BATCH_STATE_TREE_HEIGHT,
-                root_history_capacity: 20,
+                root_history_capacity: DEFAULT_BATCH_ROOT_HISTORY_LEN,
                 bloom_filter_capacity: 20_000 * 8,
                 network_fee: Some(5000),
                 rollover_threshold: Some(95),
@@ -305,7 +305,7 @@ pub mod test_utils {
                 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,
+                root_history_capacity: DEFAULT_BATCH_ROOT_HISTORY_LEN,
                 bloom_filter_capacity: STATE_BLOOM_FILTER_CAPACITY,
                 network_fee: Some(5000),
                 rollover_threshold: Some(95),

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

@@ -9,8 +9,8 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{
     constants::{
-        DEFAULT_BATCH_STATE_TREE_HEIGHT, NUM_BATCHES, TEST_DEFAULT_BATCH_SIZE,
-        TEST_DEFAULT_ZKP_BATCH_SIZE,
+        DEFAULT_BATCH_ROOT_HISTORY_LEN, DEFAULT_BATCH_STATE_TREE_HEIGHT, NUM_BATCHES,
+        TEST_DEFAULT_BATCH_SIZE, TEST_DEFAULT_ZKP_BATCH_SIZE,
     },
     errors::BatchedMerkleTreeError,
     initialize_address_tree::InitAddressTreeAccountsInstructionData,
@@ -57,7 +57,7 @@ impl Default for BatchedMerkleTreeMetadata {
             sequence_number: 0,
             tree_type: TreeType::StateV2 as u64,
             height: DEFAULT_BATCH_STATE_TREE_HEIGHT,
-            root_history_capacity: 20,
+            root_history_capacity: DEFAULT_BATCH_ROOT_HISTORY_LEN,
             capacity: 2u64.pow(DEFAULT_BATCH_STATE_TREE_HEIGHT),
             queue_batches: QueueBatches {
                 currently_processing_batch_index: 0,

sdk-libs/program-test/src/indexer/address_tree.rs

@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-use light_batched_merkle_tree::constants::DEFAULT_BATCH_STATE_ROOT_HISTORY_LEN;
+use light_batched_merkle_tree::constants::DEFAULT_BATCH_ROOT_HISTORY_LEN;
 use light_client::{
     fee::FeeConfig,
     indexer::{AddressMerkleTreeAccounts, IndexerError},
@@ -59,7 +59,7 @@ impl AddressMerkleTreeBundle {
         >::new(height, canopy)
         .map_err(|_| IndexerError::InvalidResponseData)?;
         merkle_tree.merkle_tree.root_history_array_len =
-            Some(DEFAULT_BATCH_STATE_ROOT_HISTORY_LEN as usize);
+            Some(DEFAULT_BATCH_ROOT_HISTORY_LEN as usize);
         let merkle_tree = IndexedMerkleTreeVersion::V2(Box::new(merkle_tree));
 
         Ok(AddressMerkleTreeBundle {

sdk-libs/program-test/src/indexer/test_indexer.rs

@@ -7,7 +7,7 @@ use async_trait::async_trait;
 use borsh::BorshDeserialize;
 use light_batched_merkle_tree::{
     constants::{
-        DEFAULT_BATCH_ADDRESS_TREE_HEIGHT, DEFAULT_BATCH_STATE_ROOT_HISTORY_LEN,
+        DEFAULT_BATCH_ADDRESS_TREE_HEIGHT, DEFAULT_BATCH_ROOT_HISTORY_LEN,
         DEFAULT_BATCH_STATE_TREE_HEIGHT,
     },
     merkle_tree::BatchedMerkleTreeAccount,
@@ -1296,7 +1296,7 @@ impl TestIndexer {
                     DEFAULT_BATCH_STATE_TREE_HEIGHT as usize,
                     0,
                     0,
-                    DEFAULT_BATCH_STATE_ROOT_HISTORY_LEN as usize,
+                    DEFAULT_BATCH_ROOT_HISTORY_LEN as usize,
                 ));
                 (
                     TreeType::StateV2,
@@ -1508,7 +1508,7 @@ impl TestIndexer {
                         DEFAULT_BATCH_STATE_TREE_HEIGHT as usize,
                         0,
                         0,
-                        DEFAULT_BATCH_STATE_ROOT_HISTORY_LEN as usize,
+                        DEFAULT_BATCH_ROOT_HISTORY_LEN as usize,
 
                     ));
                     (FeeConfig::test_batched().state_merkle_tree_rollover as i64,merkle_tree, Some(params.output_queue_batch_size as usize))