Merge branch 'staging' into perf/sp1-verification

Author: MarcosNicolau

aggregation_mode/src/backend/config.rs

@@ -23,6 +23,7 @@ pub struct Config {
     pub ecdsa: ECDSAConfig,
     pub proofs_per_chunk: u16,
     pub pre_verification_enabled: bool,
+    pub total_proofs_limit: u16,
 }
 
 impl Config {

aggregation_mode/src/backend/fetcher.rs

@@ -58,6 +58,7 @@ impl ProofsFetcher {
     pub async fn fetch(
         &mut self,
         engine: ZKVMEngine,
+        limit: u16,
     ) -> Result<Vec<AlignedProof>, ProofsFetcherError> {
         // Get current block
         let current_block = self
@@ -89,12 +90,9 @@ impl ProofsFetcher {
 
         info!("Logs collected {}", logs.len());
 
-        // Update last processed block after collecting logs
-        self.last_aggregated_block = current_block;
-
         let mut proofs = vec![];
 
-        for (batch, _) in logs {
+        for (batch, log) in logs {
             info!(
                 "New batch submitted, about to process. Batch merkle root {}...",
                 batch.batchMerkleRoot
@@ -177,9 +175,24 @@ impl ProofsFetcher {
                 proofs_to_add.len()
             );
 
+            if (proofs.len() + proofs_to_add.len()) > (limit as usize) {
+                let log_block_number = log.block_number.unwrap();
+                info!(
+                    "Limit of {} proofs reached, stopping at block number {}, which is {} from current block",
+                    limit, log_block_number, current_block - log_block_number
+                );
+                // Update last processed block to this log block number
+                // So the next aggregation starts at this block
+                self.last_aggregated_block = log_block_number;
+                return Ok(proofs);
+            }
+
             proofs.extend(proofs_to_add);
         }
 
+        // Update last processed block after collecting logs
+        self.last_aggregated_block = current_block;
+
         Ok(proofs)
     }
 

aggregation_mode/src/backend/mod.rs

@@ -97,7 +97,7 @@ impl ProofAggregator {
     ) -> Result<(), AggregatedProofSubmissionError> {
         let proofs = self
             .fetcher
-            .fetch(self.engine.clone())
+            .fetch(self.engine.clone(), self.config.total_proofs_limit)
             .await
             .map_err(AggregatedProofSubmissionError::FetchingProofs)?;
 

config-files/config-proof-aggregator-ethereum-package.yaml

@@ -6,6 +6,13 @@ max_proofs_in_queue: 1000
 last_aggregated_block_filepath: config-files/proof-aggregator.last_aggregated_block.json
 proofs_per_chunk: 512 # Amount of proofs to process per chunk
 pre_verification_enabled: true
+# This number comes from the blob data limit
+# Since each blob has a capacity of (4096 * 32) = 131.072 bytes
+# But to not surpass the field modulus we pad with a 0xo byte so we have (4096 * 31) = 126.976 bytes
+# of usable data
+# Since each proof commitments takes 32 bytes hash
+# We can aggregate as much proofs as 126.976 / 32 = 3968 per blob
+total_proofs_limit: 3968
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator-mock-ethereum-package.yaml

@@ -6,6 +6,14 @@ max_proofs_in_queue: 1000
 last_aggregated_block_filepath: config-files/proof-aggregator.last_aggregated_block.json
 proofs_per_chunk: 512 # Amount of proofs to process per chunk
 pre_verification_enabled: true
+# This number comes from the blob data limit
+# Since each blob has a capacity of (4096 * 32) = 131.072 bytes
+# But to not surpass the field modulus we pad with a 0xo byte so we have (4096 * 31) = 126.976 bytes
+# of usable data
+# Since each proof commitments takes 32 bytes hash
+# We can aggregate as much proofs as 126.976 / 32 = 3968 per blob
+total_proofs_limit: 3968
+
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator-mock.yaml

@@ -6,6 +6,14 @@ max_proofs_in_queue: 1000
 last_aggregated_block_filepath: config-files/proof-aggregator.last_aggregated_block.json
 proofs_per_chunk: 512 # Amount of proofs to process per chunk
 pre_verification_enabled: true
+# This number comes from the blob data limit
+# Since each blob has a capacity of (4096 * 32) = 131.072 bytes
+# But to not surpass the field modulus we pad with a 0xo byte so we have (4096 * 31) = 126.976 bytes
+# of usable data
+# Since each proof commitments takes 32 bytes hash
+# We can aggregate as much proofs as 126.976 / 32 = 3968 per blob
+total_proofs_limit: 3968
+
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator.yaml

@@ -6,6 +6,14 @@ max_proofs_in_queue: 1000
 last_aggregated_block_filepath: config-files/proof-aggregator.last_aggregated_block.json
 proofs_per_chunk: 512 # Amount of proofs to process per chunk
 pre_verification_enabled: true
+# This number comes from the blob data limit
+# Since each blob has a capacity of (4096 * 32) = 131.072 bytes
+# But to not surpass the field modulus we pad with a 0xo byte so we have (4096 * 31) = 126.976 bytes
+# of usable data
+# Since each proof commitments takes 32 bytes hash
+# We can aggregate as much proofs as 126.976 / 32 = 3968 per blob
+total_proofs_limit: 3968
+
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"