chore: adapt default queue size to 30k, update new deployment xtask (#1774)

Author: ananas-block

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

@@ -19,9 +19,10 @@ pub const TEST_DEFAULT_BATCH_SIZE: u64 = 50;
 
 pub const TEST_DEFAULT_ZKP_BATCH_SIZE: u64 = 10;
 
-pub const DEFAULT_BATCH_SIZE: u64 = 50000;
+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 DEFAULT_CPI_CONTEXT_ACCOUNT_SIZE: u64 = 20 * 1024 + 8;
 

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

@@ -6,15 +6,17 @@ use light_merkle_tree_metadata::{
 };
 
 // Import feature-gated types from lib.rs
-use crate::AccountInfo;
 #[cfg(not(feature = "pinocchio"))]
 use crate::AccountInfoTrait;
 use crate::{
-    constants::{DEFAULT_BATCH_ADDRESS_TREE_HEIGHT, DEFAULT_BATCH_SIZE, DEFAULT_ZKP_BATCH_SIZE},
+    constants::{
+        DEFAULT_ADDRESS_ZKP_BATCH_SIZE, DEFAULT_BATCH_ADDRESS_TREE_HEIGHT, DEFAULT_BATCH_SIZE,
+        DEFAULT_ZKP_BATCH_SIZE,
+    },
     errors::BatchedMerkleTreeError,
     initialize_state_tree::match_circuit_size,
     merkle_tree::{get_merkle_tree_account_size, BatchedMerkleTreeAccount},
-    BorshDeserialize, BorshSerialize,
+    AccountInfo, BorshDeserialize, BorshSerialize,
 };
 
 #[repr(C)]
@@ -42,7 +44,7 @@ impl Default for InitAddressTreeAccountsInstructionData {
             forester: None,
             bloom_filter_num_iters: 3,
             input_queue_batch_size: DEFAULT_BATCH_SIZE,
-            input_queue_zkp_batch_size: DEFAULT_ZKP_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,
             bloom_filter_capacity: DEFAULT_BATCH_SIZE * 8,

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

@@ -238,7 +238,7 @@ pub fn validate_batched_tree_params(params: InitStateTreeAccountsInstructionData
 }
 
 pub fn match_circuit_size(size: u64) -> bool {
-    matches!(size, 10 | 100 | 500 | 1000)
+    matches!(size, 10 | 100 | 250 | 500 | 1000)
 }
 #[cfg(feature = "test-only")]
 pub mod test_utils {

program-tests/system-test/tests/test.rs

@@ -1663,7 +1663,7 @@ async fn regenerate_accounts() {
     let mut config = ProgramTestConfig::default_with_batched_trees(false);
     config.skip_register_programs = true;
     config.protocol_config = protocol_config;
-    let env = initialize_accounts(&mut rpc, &config, keypairs)
+    let env = initialize_accounts(&mut rpc, &config, &keypairs)
         .await
         .unwrap();
     let keypairs = for_regenerate_accounts();

sdk-libs/program-test/src/accounts/initialize.rs

@@ -45,7 +45,7 @@ use crate::{
 pub async fn initialize_accounts<R: RpcConnection + TestRpc>(
     context: &mut R,
     config: &ProgramTestConfig,
-    keypairs: TestKeypairs,
+    keypairs: &TestKeypairs,
 ) -> Result<TestAccounts, RpcError> {
     let ProgramTestConfig {
         protocol_config,
@@ -134,38 +134,54 @@ pub async fn initialize_accounts<R: RpcConnection + TestRpc>(
     }
     let merkle_tree_pubkey = keypairs.state_merkle_tree.pubkey();
     let nullifier_queue_pubkey = keypairs.nullifier_queue.pubkey();
-    create_state_merkle_tree_and_queue_account(
-        &keypairs.governance_authority,
-        true,
-        context,
-        &keypairs.state_merkle_tree,
-        &keypairs.nullifier_queue,
-        Some(&keypairs.cpi_context_account),
-        None,
-        None,
-        1,
-        v1_state_tree_config,
-        v1_nullifier_queue_config,
-    )
-    .await?;
-
-    if !skip_second_v1_tree {
+    if !config.skip_v1_trees {
         create_state_merkle_tree_and_queue_account(
             &keypairs.governance_authority,
             true,
             context,
-            &keypairs.state_merkle_tree_2,
-            &keypairs.nullifier_queue_2,
-            Some(&keypairs.cpi_context_2),
+            &keypairs.state_merkle_tree,
+            &keypairs.nullifier_queue,
+            Some(&keypairs.cpi_context_account),
             None,
             None,
-            2,
+            1,
             v1_state_tree_config,
             v1_nullifier_queue_config,
         )
         .await?;
+
+        if !skip_second_v1_tree {
+            create_state_merkle_tree_and_queue_account(
+                &keypairs.governance_authority,
+                true,
+                context,
+                &keypairs.state_merkle_tree_2,
+                &keypairs.nullifier_queue_2,
+                Some(&keypairs.cpi_context_2),
+                None,
+                None,
+                2,
+                v1_state_tree_config,
+                v1_nullifier_queue_config,
+            )
+            .await?;
+        }
+
+        create_address_merkle_tree_and_queue_account(
+            &keypairs.governance_authority,
+            true,
+            context,
+            &keypairs.address_merkle_tree,
+            &keypairs.address_merkle_tree_queue,
+            None,
+            None,
+            v1_address_tree_config,
+            v1_address_queue_config,
+            0,
+        )
+        .await?;
     }
-    #[cfg(feature = "devenv")]
+    #[cfg(feature = "v2")]
     if let Some(v2_state_tree_config) = _v2_state_tree_config {
         create_batched_state_merkle_tree(
             &keypairs.governance_authority,
@@ -178,7 +194,7 @@ pub async fn initialize_accounts<R: RpcConnection + TestRpc>(
         )
         .await?;
     }
-    #[cfg(feature = "devenv")]
+    #[cfg(feature = "v2")]
     if let Some(params) = _v2_address_tree_config {
         create_batch_address_merkle_tree(
             context,
@@ -188,19 +204,6 @@ pub async fn initialize_accounts<R: RpcConnection + TestRpc>(
         )
         .await?;
     }
-    create_address_merkle_tree_and_queue_account(
-        &keypairs.governance_authority,
-        true,
-        context,
-        &keypairs.address_merkle_tree,
-        &keypairs.address_merkle_tree_queue,
-        None,
-        None,
-        v1_address_tree_config,
-        v1_address_queue_config,
-        0,
-    )
-    .await?;
 
     let registered_system_program_pda =
         get_registered_program_pda(&light_sdk::constants::PROGRAM_ID_LIGHT_SYSTEM);
@@ -291,7 +294,7 @@ pub async fn setup_accounts(
     initialize_accounts(
         &mut rpc,
         &ProgramTestConfig::default_with_batched_trees(false),
-        keypairs,
+        &keypairs,
     )
     .await
 }

sdk-libs/program-test/src/program_test/config.rs

@@ -16,6 +16,7 @@ pub struct ProgramTestConfig {
     pub with_prover: bool,
     pub prover_config: Option<ProverConfig>,
     pub skip_register_programs: bool,
+    pub skip_v1_trees: bool,
     pub skip_second_v1_tree: bool,
     pub v1_state_tree_config: StateMerkleTreeConfig,
     pub v1_nullifier_queue_config: NullifierQueueConfig,
@@ -112,6 +113,7 @@ impl Default for ProgramTestConfig {
             v2_state_tree_config: None,
             v2_address_tree_config: None,
             skip_protocol_init: false,
+            skip_v1_trees: false,
         }
     }
 }

sdk-libs/program-test/src/program_test/light_program_test.rs

@@ -59,7 +59,7 @@ impl LightProgramTest {
         airdrop_lamports(&mut context, &keypairs.forester.pubkey(), 10_000_000_000).await?;
 
         if !config.skip_protocol_init {
-            let test_accounts = initialize_accounts(&mut context, &config, keypairs).await?;
+            let test_accounts = initialize_accounts(&mut context, &config, &keypairs).await?;
             let batch_size = config
                 .v2_state_tree_config
                 .as_ref()