Merge remote-tracking branch 'origin/feat/integrate-agg-mode-with-db' into feat/recover-address

Author: MarcosNicolau

aggregation_mode/batcher/src/db.rs

@@ -99,7 +99,7 @@ impl Db {
     pub async fn insert_task(
         &self,
         address: &str,
-        proving_system_id: i64,
+        proving_system_id: i32,
         proof: &[u8],
         program_commitment: &[u8],
         merkle_path: Option<&[u8]>,

aggregation_mode/batcher/src/server/http.rs

@@ -52,8 +52,6 @@ impl BatcherServer {
         HttpServer::new(move || {
             App::new()
                 .app_data(Data::new(state.clone()))
-                // Note: this is temporary and should be lowered when we accept proofs via multipart form data instead of json
-                .app_data(web::JsonConfig::default().limit(50 * 1024 * 1024)) // 50mb
                 .route("/nonce/{address}", web::get().to(Self::get_nonce))
                 .route("/receipts", web::get().to(Self::get_receipts))
                 .route("/proof/sp1", web::post().to(Self::post_proof_sp1))
@@ -203,7 +201,7 @@ impl BatcherServer {
             .db
             .insert_task(
                 &recovered_address,
-                AggregationModeProvingSystem::SP1.as_u16() as i64,
+                AggregationModeProvingSystem::SP1.as_u16() as i32,
                 &proof_content,
                 &vk_content,
                 None,

aggregation_mode/db/src/types.rs

@@ -16,7 +16,7 @@ pub enum TaskStatus {
 pub struct Task {
     pub task_id: Uuid,
     pub address: String,
-    pub proving_system_id: i64,
+    pub proving_system_id: i32,
     pub proof: Vec<u8>,
     pub program_commitment: Vec<u8>,
     pub merkle_path: Option<Vec<u8>>,

aggregation_mode/proof_aggregator/src/aggregators/sp1_aggregator.rs

@@ -127,12 +127,12 @@ pub(crate) fn run_user_proofs_aggregator(
         .verify(&proof, &vk)
         .map_err(SP1AggregationError::Verification)?;
 
-    let proof_and_elf = SP1ProofWithPubValuesAndVk {
+    let proof_and_vk = SP1ProofWithPubValuesAndVk {
         proof_with_pub_values: proof,
         vk,
     };
 
-    Ok(proof_and_elf)
+    Ok(proof_and_vk)
 }
 
 pub(crate) fn run_chunk_aggregator(
@@ -199,12 +199,12 @@ pub(crate) fn run_chunk_aggregator(
         .verify(&proof, &vk)
         .map_err(SP1AggregationError::Verification)?;
 
-    let proof_and_elf = SP1ProofWithPubValuesAndVk {
+    let proof_and_vk = SP1ProofWithPubValuesAndVk {
         proof_with_pub_values: proof,
         vk,
     };
 
-    Ok(proof_and_elf)
+    Ok(proof_and_vk)
 }
 
 pub fn vk_from_elf(elf: &[u8]) -> SP1VerifyingKey {

aggregation_mode/proof_aggregator/src/backend/db.rs

@@ -49,7 +49,7 @@ impl Db {
         .map_err(|e| DbError::Query(e.to_string()))
     }
 
-    pub async fn insert_tasks_merkle_path_and_mark_them_as_submitted(
+    pub async fn insert_tasks_merkle_path_and_mark_them_as_verified(
         &self,
         updates: Vec<(Uuid, Vec<u8>)>,
     ) -> Result<(), DbError> {

aggregation_mode/proof_aggregator/src/backend/mod.rs

@@ -23,6 +23,7 @@ use config::Config;
 use fetcher::{ProofsFetcher, ProofsFetcherError};
 use merkle_tree::compute_proofs_merkle_root;
 use risc0_ethereum_contracts::encode_seal;
+use sqlx::types::Uuid;
 use std::thread::sleep;
 use std::{str::FromStr, time::Duration};
 use tracing::{error, info, warn};
@@ -213,9 +214,9 @@ impl ProofAggregator {
         );
 
         info!("Storing merkle paths for each task...",);
-        let mut merkle_paths_for_tasks = vec![];
-        for task_id in tasks_id {
-            let Some(proof) = merkle_tree.get_proof_by_pos(0) else {
+        let mut merkle_paths_for_tasks: Vec<(Uuid, Vec<u8>)> = vec![];
+        for (idx, task_id) in tasks_id.into_iter().enumerate() {
+            let Some(proof) = merkle_tree.get_proof_by_pos(idx) else {
                 warn!("Proof not found for task id {task_id}");
                 continue;
             };
@@ -228,7 +229,7 @@ impl ProofAggregator {
             merkle_paths_for_tasks.push((task_id, proof_bytes))
         }
         self.db
-            .insert_tasks_merkle_path_and_mark_them_as_submitted(merkle_paths_for_tasks)
+            .insert_tasks_merkle_path_and_mark_them_as_verified(merkle_paths_for_tasks)
             .await
             .map_err(AggregatedProofSubmissionError::StoringMerklePaths)?;
         info!("Merkle path inserted sucessfully",);