feat: proofs per chunk as a config param instead of const

Author: MarcosNicolau

aggregation_mode/src/aggregators/mod.rs

@@ -13,8 +13,6 @@ use sp1_aggregator::{
 };
 use tracing::info;
 
-const MAX_PROOFS_PER_AGGREGATION: usize = 512;
-
 #[derive(Clone, Debug)]
 pub enum ZKVMEngine {
     SP1,
@@ -63,6 +61,7 @@ impl ZKVMEngine {
     pub fn aggregate_proofs(
         &self,
         proofs: Vec<AlignedProof>,
+        proofs_per_chunk: u16,
     ) -> Result<(AlignedProof, [u8; 32]), ProofAggregationError> {
         let res = match self {
             ZKVMEngine::SP1 => {
@@ -77,11 +76,12 @@ impl ZKVMEngine {
                     })
                     .collect();
 
-                let chunks = proofs.chunks(MAX_PROOFS_PER_AGGREGATION);
+                let chunks = proofs.chunks(proofs_per_chunk as usize);
                 info!(
-                    "Total proofs to aggregate {}. They aggregation will be performed in {} chunks",
+                    "Total proofs to aggregate {}. They aggregation will be performed in {} chunks (i.e {} proofs per chunk)",
                     proofs.len(),
-                    chunks.len()
+                    chunks.len(),
+                    proofs_per_chunk,
                 );
 
                 let mut agg_proofs: Vec<(SP1ProofWithPubValuesAndElf, Vec<[u8; 32]>)> = vec![];
@@ -118,11 +118,12 @@ impl ZKVMEngine {
                     })
                     .collect();
 
-                let chunks = proofs.chunks(MAX_PROOFS_PER_AGGREGATION);
+                let chunks = proofs.chunks(proofs_per_chunk as usize);
                 info!(
-                    "Total proofs to aggregate {}. They aggregation will be performed in {} chunks",
+                    "Total proofs to aggregate {}. They aggregation will be performed in {} chunks (i.e {} proofs per chunk)",
                     proofs.len(),
-                    chunks.len()
+                    chunks.len(),
+                    proofs_per_chunk,
                 );
 
                 let mut agg_proofs: Vec<(Risc0ProofReceiptAndImageId, Vec<[u8; 32]>)> = vec![];

aggregation_mode/src/backend/config.rs

@@ -21,6 +21,7 @@ pub struct Config {
     pub aligned_service_manager_address: String,
     pub last_aggregated_block_filepath: String,
     pub ecdsa: ECDSAConfig,
+    pub proofs_per_chunk: u16,
 }
 
 impl Config {

aggregation_mode/src/backend/mod.rs

@@ -42,10 +42,11 @@ pub struct ProofAggregator {
     engine: ZKVMEngine,
     proof_aggregation_service: AlignedProofAggregationServiceContract,
     fetcher: ProofsFetcher,
+    config: Config,
 }
 
 impl ProofAggregator {
-    pub fn new(config: &Config) -> Self {
+    pub fn new(config: Config) -> Self {
         let rpc_url = config.eth_rpc_url.parse().expect("RPC URL should be valid");
         let signer = LocalSigner::decrypt_keystore(
             config.ecdsa.private_key_store_path.clone(),
@@ -62,24 +63,25 @@ impl ProofAggregator {
 
         let engine =
             ZKVMEngine::from_env().expect("AGGREGATOR env variable to be set to one of sp1|risc0");
-        let fetcher = ProofsFetcher::new(config);
+        let fetcher = ProofsFetcher::new(&config);
 
         Self {
             engine,
             proof_aggregation_service,
             fetcher,
+            config,
         }
     }
 
-    pub async fn start(&mut self, config: &Config) {
+    pub async fn start(&mut self) {
         info!("Starting proof aggregator service");
 
         info!("About to aggregate and submit proof to be verified on chain");
         let res = self.aggregate_and_submit_proofs_on_chain().await;
 
         match res {
             Ok(()) => {
-                config
+                self.config
                     .update_last_aggregated_block(self.fetcher.get_last_aggregated_block())
                     .unwrap();
                 info!("Process finished successfully");
@@ -113,7 +115,7 @@ impl ProofAggregator {
         info!("Starting proof aggregation program...");
         let (aggregated_proof, zkvm_merkle_root) = self
             .engine
-            .aggregate_proofs(proofs)
+            .aggregate_proofs(proofs, self.config.proofs_per_chunk)
             .map_err(AggregatedProofSubmissionError::ZKVMAggregation)?;
         info!("Proof aggregation program finished");
 

aggregation_mode/src/main.rs

@@ -26,6 +26,6 @@ async fn main() {
     let config = Config::from_file(&config_file_path).expect("Config is valid");
     tracing::info!("Config loaded");
 
-    let mut proof_aggregator = ProofAggregator::new(&config);
-    proof_aggregator.start(&config).await;
+    let mut proof_aggregator = ProofAggregator::new(config);
+    proof_aggregator.start().await;
 }

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

@@ -4,6 +4,7 @@ eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8546"
 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
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

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

@@ -4,6 +4,7 @@ eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8546"
 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
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

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

@@ -4,6 +4,7 @@ eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 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
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator.yaml

@@ -4,6 +4,7 @@ eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 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
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"