Add new config param

Author: Mechanix97

batcher/aligned-batcher/src/config/mod.rs

@@ -46,6 +46,7 @@ pub struct BatcherConfigFromYaml {
     pub max_proof_size: usize,
     pub max_batch_byte_size: usize,
     pub max_batch_proof_qty: usize,
+    pub max_queue_size: usize,
     pub pre_verification_is_enabled: bool,
     pub metrics_port: u16,
     pub telemetry_ip_port_address: String,

batcher/aligned-batcher/src/lib.rs

@@ -88,6 +88,7 @@ pub struct Batcher {
     max_proof_size: usize,
     max_batch_byte_size: usize,
     max_batch_proof_qty: usize,
+    max_queue_size: usize,
     last_uploaded_batch_block: Mutex<u64>,
     pre_verification_is_enabled: bool,
     non_paying_config: Option<NonPayingConfig>,
@@ -263,6 +264,7 @@ impl Batcher {
             max_proof_size: config.batcher.max_proof_size,
             max_batch_byte_size: config.batcher.max_batch_byte_size,
             max_batch_proof_qty: config.batcher.max_batch_proof_qty,
+            max_queue_size: config.batcher.max_queue_size,
             last_uploaded_batch_block: Mutex::new(last_uploaded_batch_block),
             pre_verification_is_enabled: config.batcher.pre_verification_is_enabled,
             non_paying_config,
@@ -794,6 +796,23 @@ impl Batcher {
             return Ok(());
         }
 
+        // * ---------------------------------------------------------------------*
+        // *        Perform validation over batcher queue                         *
+        // * ---------------------------------------------------------------------*
+
+        // if max batch qty exceded, remove least priority element
+        if batch_state_lock.batch_queue.len() == self.max_queue_size {
+            info!("Queue limit exceded, removing least priority element");
+
+            // if let Some(lowest_priority_entry) = batch_state_lock.batch_queue.pop() {
+            //     send_message(
+            //         lowest_priority_entry.0.messaging_sink.unwrap(),
+            //         SubmitProofResponseMessage::BatchQueueLimitExceededError,
+            //     )
+            //     .await;
+            // }
+        }
+
         // * ---------------------------------------------------------------------*
         // *        Add message data into the queue and update user state         *
         // * ---------------------------------------------------------------------*
@@ -1028,19 +1047,6 @@ impl Batcher {
             BatchQueueEntryPriority::new(max_fee, nonce),
         );
 
-        // if max batch qty exceded, remove least priority element
-        if batch_state_lock.batch_queue.len() > self.max_batch_proof_qty {
-            info!("Queue limit exceded, removing least priority element");
-
-            if let Some(lowest_priority_entry) = batch_state_lock.batch_queue.pop() {
-                send_message(
-                    lowest_priority_entry.0.messaging_sink.unwrap(),
-                    SubmitProofResponseMessage::BatchQueueLimitExceededError,
-                )
-                .await;
-            }
-        }
-
         // Update metrics
         let queue_len = batch_state_lock.batch_queue.len();
         let queue_size_bytes = calculate_batch_size(&batch_state_lock.batch_queue)?;

config-files/config-batcher.yaml

@@ -21,9 +21,10 @@ batcher:
   block_interval: 3
   batch_size_interval: 10
   transaction_wait_timeout: 96000 # 8 blocks
-  max_proof_size: 67108864 # 64 MiB
+  max_proof_size: 4194304 # 4 MiB
   max_batch_byte_size: 268435456 # 256 MiB
   max_batch_proof_qty: 3000 # 3000 proofs in a batch
+  max_queue_size: 10000
   pre_verification_is_enabled: true
   metrics_port: 9093
   telemetry_ip_port_address: localhost:4001