Merge branch 'refs/heads/feat/aggregation-mode' into integrate-sp1-into-aggregation-mode

Author: JuArce

aggregation_mode/src/backend/config.rs

@@ -11,7 +11,6 @@ pub struct ECDSAConfig {
 pub struct Config {
     pub eth_rpc_url: String,
     pub eth_ws_url: String,
-    pub private_key: String,
     pub max_proofs_in_queue: u16,
     pub proof_aggregation_service_address: String,
     pub aligned_service_manager_address: String,

aggregation_mode/src/backend/merkle_tree.rs

@@ -10,14 +10,7 @@ pub fn combine_hashes(hash_a: &[u8; 32], hash_b: &[u8; 32]) -> [u8; 32] {
 
 /// Returns (merkle_root, leaves)
 pub fn compute_proofs_merkle_root(proofs: &[AlignedProof]) -> ([u8; 32], Vec<[u8; 32]>) {
-    let leaves: Vec<[u8; 32]> = proofs
-        .chunks(2)
-        .map(|chunk| match chunk {
-            [a, b] => combine_hashes(&a.hash(), &b.hash()),
-            [a] => combine_hashes(&a.hash(), &a.hash()),
-            _ => panic!("Unexpected chunk leaves"),
-        })
-        .collect();
+    let leaves: Vec<[u8; 32]> = proofs.iter().map(|proof| proof.hash()).collect();
 
     let mut root = leaves.clone();
 

aggregation_mode/src/backend/mod.rs

@@ -4,8 +4,11 @@ mod merkle_tree;
 mod s3;
 mod types;
 
-use crate::aggregators::{lib::{AggregatedProof, ProofAggregationError}, sp1_aggregator::{aggregate_proofs, SP1AggregationInput}, AlignedProof, ZKVMEngine};
-
+use crate::aggregators::{
+    lib::{AggregatedProof, ProofAggregationError},
+    sp1_aggregator::{aggregate_proofs, SP1AggregationInput},
+    AlignedProof, ZKVMEngine,
+};
 
 use alloy::{
     consensus::{Blob, BlobTransactionSidecar},
@@ -25,7 +28,6 @@ use std::str::FromStr;
 use tracing::{error, info, warn};
 use types::{AlignedProofAggregationService, AlignedProofAggregationServiceContract};
 
-
 #[derive(Debug)]
 pub enum AggregatedProofSubmissionError {
     Aggregation(ProofAggregationError),
@@ -122,8 +124,7 @@ impl ProofAggregator {
                     merkle_root,
                 };
 
-                aggregate_proofs(input)
-                    .map_err(AggregatedProofSubmissionError::Aggregation)?
+                aggregate_proofs(input).map_err(AggregatedProofSubmissionError::Aggregation)?
             }
         };
         info!("Proof aggregation program finished");
@@ -184,8 +185,17 @@ impl ProofAggregator {
         let data: Vec<u8> = leaves.iter().flat_map(|arr| arr.iter().copied()).collect();
         let mut blob_data: [u8; BYTES_PER_BLOB] = [0u8; BYTES_PER_BLOB];
 
-        for (i, byte) in data.iter().enumerate() {
-            blob_data[i] = *byte;
+        // We pad the data with 0x0 byte every 31 bytes so that the field elements
+        // constructed from the bytes are less than BLS_MODULUS.
+        //
+        // See https://github.com/ethereum/consensus-specs/blob/86fb82b221474cc89387fa6436806507b3849d88/specs/deneb/polynomial-commitments.md#bytes_to_bls_field
+        let mut offset = 0;
+        for chunk in data.chunks(31) {
+            blob_data[offset] = 0x00;
+            let start = offset + 1;
+            let end = start + chunk.len();
+            blob_data[start..end].copy_from_slice(chunk);
+            offset += 32;
         }
 
         // calculate kzg commitments for blob

aggregation_mode/src/backend/s3.rs

@@ -6,15 +6,23 @@ pub enum GetBatchProofsError {
     Deserialization,
     EmptyBody,
     StatusFailed,
+    ReqwestClientFailed
 }
 
+// needed to make S3 bucket work
+const DEFAULT_USER_AGENT: &str = "proof-aggregator/aligned-layer";
+
 pub async fn get_aligned_batch_from_s3(
     url: String,
 ) -> Result<Vec<VerificationData>, GetBatchProofsError> {
-    let response = reqwest::get(url)
+    let client = reqwest::Client::builder()
+    .user_agent(DEFAULT_USER_AGENT)
+    .build()
+    .map_err(|_| GetBatchProofsError::ReqwestClientFailed)?;
+
+    let response = client.get(url).send()
         .await
         .map_err(|_| GetBatchProofsError::Fetching)?;
-
     if !response.status().is_success() {
         return Err(GetBatchProofsError::StatusFailed);
     }

config-files/config-proof-aggregator.yaml

@@ -1,6 +1,5 @@
 aligned_service_manager_address: "0x851356ae760d987E095750cCeb3bC6014560891C"
 proof_aggregation_service_address: "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc"
-private_key: "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000
@@ -10,5 +9,5 @@ fetch_logs_from_secs_ago: 86400 # 24hs
 block_time_secs: 7
 
 ecdsa:
-  private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"
-  private_key_store_password: ""
+    private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"
+    private_key_store_password: ""