From f7055de4b4b116e5e3166e60c95fa0bac6a5d4ec Mon Sep 17 00:00:00 2001 From: MauroFab Date: Fri, 11 Oct 2024 11:25:40 -0300 Subject: [PATCH 1/5] Remove unused batch len, added minimium 2 proofs per batch --- batcher/aligned-batcher/src/config/mod.rs | 1 - batcher/aligned-batcher/src/lib.rs | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/batcher/aligned-batcher/src/config/mod.rs b/batcher/aligned-batcher/src/config/mod.rs index 9f53631ee..47adce463 100644 --- a/batcher/aligned-batcher/src/config/mod.rs +++ b/batcher/aligned-batcher/src/config/mod.rs @@ -38,7 +38,6 @@ impl NonPayingConfig { #[derive(Debug, Deserialize)] pub struct BatcherConfigFromYaml { pub block_interval: u64, - pub batch_size_interval: usize, pub max_proof_size: usize, pub max_batch_size: usize, pub eth_ws_reconnects: usize, diff --git a/batcher/aligned-batcher/src/lib.rs b/batcher/aligned-batcher/src/lib.rs index 0fb3b38d8..d6a933996 100644 --- a/batcher/aligned-batcher/src/lib.rs +++ b/batcher/aligned-batcher/src/lib.rs @@ -68,7 +68,6 @@ pub struct Batcher { payment_service_fallback: BatcherPaymentService, batch_state: Mutex, max_block_interval: u64, - min_batch_len: usize, max_proof_size: usize, max_batch_size: usize, last_uploaded_batch_block: Mutex, @@ -194,7 +193,6 @@ impl Batcher { payment_service, payment_service_fallback, max_block_interval: config.batcher.block_interval, - min_batch_len: config.batcher.batch_size_interval, max_proof_size: config.batcher.max_proof_size, max_batch_size: config.batcher.max_batch_size, last_uploaded_batch_block: Mutex::new(last_uploaded_batch_block), @@ -750,17 +748,16 @@ impl Batcher { let current_batch_len = batch_state_lock.batch_queue.len(); let last_uploaded_batch_block_lock = self.last_uploaded_batch_block.lock().await; - if current_batch_len == 0 { - info!("Current batch is empty. Waiting for more proofs..."); + if current_batch_len < 2 { + info!("Current batch has one proof. Waiting for more proofs..."); return None; } - if batch_state_lock.batch_queue.len() < self.min_batch_len - && block_number < *last_uploaded_batch_block_lock + self.max_block_interval + if block_number < *last_uploaded_batch_block_lock + self.max_block_interval { info!( - "Current batch not ready to be posted. Current block: {} - Last uploaded block: {}. Current batch length: {} - Minimum batch length: {}", - block_number, *last_uploaded_batch_block_lock, batch_state_lock.batch_queue.len(), self.min_batch_len + "Current batch not ready to be posted. Minimium amount of blocks has not passed. Current block: {} - Last uploaded block: {}.", + block_number, *last_uploaded_batch_block_lock ); return None; } From d3aab41b292fddcbb893f9de5bb3f4f8e8b250fc Mon Sep 17 00:00:00 2001 From: MauroFab Date: Fri, 11 Oct 2024 11:30:29 -0300 Subject: [PATCH 2/5] Improve log --- batcher/aligned-batcher/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batcher/aligned-batcher/src/lib.rs b/batcher/aligned-batcher/src/lib.rs index d6a933996..0ea8b9dc7 100644 --- a/batcher/aligned-batcher/src/lib.rs +++ b/batcher/aligned-batcher/src/lib.rs @@ -756,8 +756,8 @@ impl Batcher { if block_number < *last_uploaded_batch_block_lock + self.max_block_interval { info!( - "Current batch not ready to be posted. Minimium amount of blocks has not passed. Current block: {} - Last uploaded block: {}.", - block_number, *last_uploaded_batch_block_lock + "Current batch not ready to be posted. Minimium amount of {} blocks have not passed. Block passed: {}", self.max_block_interval, + block_number - *last_uploaded_batch_block_lock, ); return None; } From 72cf3eab2ee8a9243a411cd13ea50cd8b30e9e21 Mon Sep 17 00:00:00 2001 From: MauroFab Date: Fri, 11 Oct 2024 11:31:22 -0300 Subject: [PATCH 3/5] Fmt --- batcher/aligned-batcher/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/batcher/aligned-batcher/src/lib.rs b/batcher/aligned-batcher/src/lib.rs index 0ea8b9dc7..e02096bc6 100644 --- a/batcher/aligned-batcher/src/lib.rs +++ b/batcher/aligned-batcher/src/lib.rs @@ -753,8 +753,7 @@ impl Batcher { return None; } - if block_number < *last_uploaded_batch_block_lock + self.max_block_interval - { + if block_number < *last_uploaded_batch_block_lock + self.max_block_interval { info!( "Current batch not ready to be posted. Minimium amount of {} blocks have not passed. Block passed: {}", self.max_block_interval, block_number - *last_uploaded_batch_block_lock, From 3e6f9603ac8de3e4dd5cc00d481b8aedb14c2653 Mon Sep 17 00:00:00 2001 From: MauroFab Date: Fri, 11 Oct 2024 11:38:46 -0300 Subject: [PATCH 4/5] Fix comment --- batcher/aligned-batcher/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batcher/aligned-batcher/src/lib.rs b/batcher/aligned-batcher/src/lib.rs index e02096bc6..9d14750e6 100644 --- a/batcher/aligned-batcher/src/lib.rs +++ b/batcher/aligned-batcher/src/lib.rs @@ -749,7 +749,7 @@ impl Batcher { let last_uploaded_batch_block_lock = self.last_uploaded_batch_block.lock().await; if current_batch_len < 2 { - info!("Current batch has one proof. Waiting for more proofs..."); + info!("Current batch has {} proof. Waiting for more proofs...",current_batch_len); return None; } From 139d4dfa9e6c9d844aad99fc3541519e9d14a9a6 Mon Sep 17 00:00:00 2001 From: MauroFab Date: Fri, 11 Oct 2024 11:41:56 -0300 Subject: [PATCH 5/5] Fmt --- batcher/aligned-batcher/src/lib.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/batcher/aligned-batcher/src/lib.rs b/batcher/aligned-batcher/src/lib.rs index 9d14750e6..b8b7a19f0 100644 --- a/batcher/aligned-batcher/src/lib.rs +++ b/batcher/aligned-batcher/src/lib.rs @@ -749,7 +749,10 @@ impl Batcher { let last_uploaded_batch_block_lock = self.last_uploaded_batch_block.lock().await; if current_batch_len < 2 { - info!("Current batch has {} proof. Waiting for more proofs...",current_batch_len); + info!( + "Current batch has {} proof. Waiting for more proofs...", + current_batch_len + ); return None; }