feat: integrate sp1 verifier with aggregation mode (#1843)

Co-authored-by: Marcos Nicolau <[email protected]>
Co-authored-by: MauroFab <[email protected]>
Co-authored-by: Lucas Rack <[email protected]>
Co-authored-by: Mauro Toscano <[email protected]>
Co-authored-by: Marcos Nicolau <[email protected]>

Author: 4 people

.github/workflows/build-and-test-rust.yml

@@ -7,6 +7,7 @@ on:
     branches: ["*"]
     paths:
       - "batcher/**"
+      - "aggregation_mode/**"
       - ".github/workflows/build-rust.yml"
 
 jobs:
@@ -22,6 +23,14 @@ jobs:
           toolchain: stable
           components: rustfmt, clippy
           override: true
+
+      # Reference: https://github.com/succinctlabs/sp1/actions/runs/8886659400/workflow#L61-L65
+      - name: Install sp1 toolchain
+        run: |
+          curl -L https://sp1.succinct.xyz | bash
+          source /home/runner/.bashrc
+           ~/.sp1/bin/sp1up
+
       - name: Cache Rust dependencies
         uses: actions/cache@v3
         with:
@@ -32,27 +41,54 @@ jobs:
           key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-
-      - name: Check formatting of Rust projects
+
+      - name: Check formatting of Batcher
         run: |
           cd batcher
           cargo fmt --all -- --check
-      - name: Run Clippy
+
+      - name: Run Clippy on Batcher
         run: |
           cd batcher
           cargo clippy --all -- -D warnings
-      - name: Build Rust projects
+
+      - name: Build Batcher
         run: |
           cd batcher
           cargo build --all
 
+      - name: Check formatting of AggregationMode
+        run: |
+          cd aggregation_mode
+          cargo fmt --all -- --check
+
+      - name: Build AggregationMode # We build before clippy to generate the ELF
+        run: |
+          cd aggregation_mode
+          cargo build --all
+
+      - name: Run Clippy on AggregationMode
+        run: |
+          cd aggregation_mode
+          cargo clippy --all -- -D warnings
+
   test:
     runs-on: aligned-runner
     needs: build
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+
       - name: foundry-toolchain
         uses: foundry-rs/[email protected]
+
+      # Reference: https://github.com/succinctlabs/sp1/actions/runs/8886659400/workflow#L61-L65
+      - name: Install sp1 toolchain
+        run: |
+          curl -L https://sp1.succinct.xyz | bash
+          source /home/runner/.bashrc
+           ~/.sp1/bin/sp1up
+
       - name: Cache Rust dependencies
         uses: actions/cache@v3
         with:
@@ -63,7 +99,13 @@ jobs:
           key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-
-      - name: Run tests
+
+      - name: Run Batcher tests
         run: |
           cd batcher
           cargo test --all
+
+      - name: Run AggregationMode tests
+        run: |
+          cd aggregation_mode
+          cargo test --all

Makefile

@@ -75,6 +75,10 @@ anvil_deploy_eigen_contracts:
 	@echo "Deploying Eigen Contracts..."
 	. contracts/scripts/anvil/deploy_eigen_contracts.sh
 
+anvil_deploy_sp1_contracts:
+	@echo "Deploying SP1 Contracts..."
+	. contracts/scripts/anvil/deploy_sp1_contracts.sh
+
 anvil_deploy_aligned_contracts:
 	@echo "Deploying Aligned Contracts..."
 	. contracts/scripts/anvil/deploy_aligned_contracts.sh
@@ -152,7 +156,7 @@ anvil_start_with_block_time_with_more_prefunded_accounts:
 
 __AGGREGATION_MODE__: ## ____
 start_proof_aggregator_local: ## Start the proof aggregator locally using Mock Verifier Contract
-	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release -- config-files/config-proof-aggregator.yaml
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release -- config-files/config-proof-aggregator-mock.yaml
 
 start_proof_aggregator_local_with_proving: ## Start the proof aggregator locally using SP1 Verifier Contract
 	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove -- config-files/config-proof-aggregator.yaml
@@ -694,6 +698,10 @@ upgrade_batcher_payment_service: ## Upgrade BatcherPayments contract. Parameters
 	@echo "Upgrading BatcherPayments Contract on $(NETWORK) network..."
 	@. contracts/scripts/.env.$(NETWORK) && . contracts/scripts/upgrade_batcher_payment_service.sh
 
+deploy_proof_aggregator:
+	@echo "Deploying ProofAggregator contract on $(NETWORK) network..."
+	@. contracts/scripts/.env.$(NETWORK) && . contracts/scripts/deploy_proof_aggregator.sh
+
 build_aligned_contracts:
 	@cd contracts/src/core && forge build
 

aggregation_mode/abi/AlignedProofAggregationService.json

@@ -1,5 +1,5 @@
-pub mod sp1_aggregator;
 pub mod lib;
+pub mod sp1_aggregator;
 
 use sp1_aggregator::{AlignedSP1VerificationError, SP1ProofWithPubValuesAndElf};
 pub enum ZKVMEngine {
@@ -26,7 +26,11 @@ pub enum AlignedVerificationError {
 impl AlignedProof {
     pub fn verify(&self) -> Result<(), AlignedVerificationError> {
         match self {
-            AlignedProof::SP1(proof) => sp1_aggregator::verify(proof).map_err(|arg0: sp1_aggregator::AlignedSP1VerificationError| AlignedVerificationError::Sp1(arg0)),
+            AlignedProof::SP1(proof) => sp1_aggregator::verify(proof).map_err(
+                |arg0: sp1_aggregator::AlignedSP1VerificationError| {
+                    AlignedVerificationError::Sp1(arg0)
+                },
+            ),
         }
     }
 }

aggregation_mode/src/aggregators/mod.rs

@@ -6,11 +6,12 @@ use sp1_sdk::{
 
 use super::lib::{AggregatedProof, ProgramOutput, ProofAggregationError};
 
-const PROGRAM_ELF: &[u8] = include_bytes!("../../aggregation_programs/sp1/elf/sp1_aggregator_program");
+const PROGRAM_ELF: &[u8] =
+    include_bytes!("../../aggregation_programs/sp1/elf/sp1_aggregator_program");
 
 pub struct SP1ProofWithPubValuesAndElf {
     pub proof_with_pub_values: SP1ProofWithPublicValues,
-    pub elf: Vec<u8>
+    pub elf: Vec<u8>,
 }
 
 impl SP1ProofWithPubValuesAndElf {
@@ -98,15 +99,23 @@ pub enum AlignedSP1VerificationError {
     UnsupportedProof,
 }
 
-pub(crate) fn verify(sp1_proof_with_pub_values_and_elf: &SP1ProofWithPubValuesAndElf) -> Result<(), AlignedSP1VerificationError> {
+pub(crate) fn verify(
+    sp1_proof_with_pub_values_and_elf: &SP1ProofWithPubValuesAndElf,
+) -> Result<(), AlignedSP1VerificationError> {
     let client = ProverClient::from_env();
 
     let (_pk, vk) = client.setup(&sp1_proof_with_pub_values_and_elf.elf);
 
     // only sp1 compressed proofs are supported for aggregation now
-    match sp1_proof_with_pub_values_and_elf.proof_with_pub_values.proof {
+    match sp1_proof_with_pub_values_and_elf
+        .proof_with_pub_values
+        .proof
+    {
         sp1_sdk::SP1Proof::Compressed(_) => client
-            .verify(&sp1_proof_with_pub_values_and_elf.proof_with_pub_values, &vk)
+            .verify(
+                &sp1_proof_with_pub_values_and_elf.proof_with_pub_values,
+                &vk,
+            )
             .map_err(AlignedSP1VerificationError::Verification),
         _ => Err(AlignedSP1VerificationError::UnsupportedProof),
     }

aggregation_mode/src/aggregators/sp1_aggregator.rs

@@ -5,7 +5,8 @@ use super::{
     types::{AlignedLayerServiceManager, AlignedLayerServiceManagerContract, RPCProvider},
 };
 use crate::{
-    aggregators::{sp1_aggregator::SP1ProofWithPubValuesAndElf, AlignedProof}, backend::s3::get_aligned_batch_from_s3
+    aggregators::{sp1_aggregator::SP1ProofWithPubValuesAndElf, AlignedProof},
+    backend::s3::get_aligned_batch_from_s3,
 };
 use aligned_sdk::core::types::ProvingSystemId;
 use alloy::{
@@ -88,7 +89,10 @@ impl ProofsFetcher {
                     ProvingSystemId::SP1 => {
                         let elf = p.vm_program_code?;
                         let proof_with_pub_values = bincode::deserialize(&p.proof).ok()?;
-                        let sp1_proof = SP1ProofWithPubValuesAndElf { proof_with_pub_values, elf };
+                        let sp1_proof = SP1ProofWithPubValuesAndElf {
+                            proof_with_pub_values,
+                            elf,
+                        };
 
                         Some(AlignedProof::SP1(sp1_proof))
                     }

aggregation_mode/src/backend/fetcher.rs

@@ -18,8 +18,8 @@ pub fn compute_proofs_merkle_root(proofs: &[AlignedProof]) -> ([u8; 32], Vec<[u8
         root = root
             .chunks(2)
             .map(|chunk| match chunk {
-                [a, b] => combine_hashes(&a, &b),
-                [a] => combine_hashes(&a, &a),
+                [a, b] => combine_hashes(a, b),
+                [a] => combine_hashes(a, a),
                 _ => panic!("Unexpected chunk size in leaves"),
             })
             .collect()

aggregation_mode/src/backend/merkle_tree.rs

@@ -11,11 +11,11 @@ use crate::aggregators::{
 };
 
 use alloy::{
-    consensus::{BlobTransactionSidecar},
+    consensus::BlobTransactionSidecar,
     eips::eip4844::BYTES_PER_BLOB,
     hex,
     network::EthereumWallet,
-    primitives::{Address},
+    primitives::Address,
     providers::{PendingTransactionError, ProviderBuilder},
     rpc::types::TransactionReceipt,
     signers::local::LocalSigner,
@@ -81,11 +81,6 @@ impl ProofAggregator {
             }
             Err(err) => {
                 error!("Error while aggregating and submitting proofs: {:?}", err);
-                info!("About to set aggregated proof as missed");
-                if let Err(err) = self.set_aggregated_proof_as_missed().await {
-                    error!("Error while marking proof as failed: {:?}", err);
-                };
-                info!("Proofs set as missed");
             }
         }
     }
@@ -99,7 +94,7 @@ impl ProofAggregator {
             .await
             .map_err(AggregatedProofSubmissionError::FetchingProofs)?;
 
-        if proofs.len() == 0 {
+        if proofs.is_empty() {
             warn!("No proofs collected, skipping aggregation...");
             return Ok(());
         }
@@ -114,8 +109,8 @@ impl ProofAggregator {
                 // only SP1 compressed proofs are supported
                 let proofs = proofs
                     .into_iter()
-                    .filter_map(|proof| match proof {
-                        AlignedProof::SP1(proof) => Some(proof),
+                    .map(|proof| match proof {
+                        AlignedProof::SP1(proof) => proof,
                     })
                     .collect();
 
@@ -219,19 +214,4 @@ impl ProofAggregator {
 
         Ok((blob, blob_versioned_hash))
     }
-
-    async fn set_aggregated_proof_as_missed(
-        &self,
-    ) -> Result<TransactionReceipt, AggregatedProofSubmissionError> {
-        let res = self
-            .proof_aggregation_service
-            .markCurrentAggregatedProofAsMissed()
-            .send()
-            .await
-            .map_err(AggregatedProofSubmissionError::SendVerifyAggregatedProofTransaction)?;
-
-        res.get_receipt()
-            .await
-            .map_err(AggregatedProofSubmissionError::ReceiptError)
-    }
 }

aggregation_mode/src/backend/mod.rs

@@ -6,7 +6,7 @@ pub enum GetBatchProofsError {
     Deserialization,
     EmptyBody,
     StatusFailed,
-    ReqwestClientFailed
+    ReqwestClientFailed,
 }
 
 // needed to make S3 bucket work
@@ -16,11 +16,13 @@ pub async fn get_aligned_batch_from_s3(
     url: String,
 ) -> Result<Vec<VerificationData>, GetBatchProofsError> {
     let client = reqwest::Client::builder()
-    .user_agent(DEFAULT_USER_AGENT)
-    .build()
-    .map_err(|_| GetBatchProofsError::ReqwestClientFailed)?;
+        .user_agent(DEFAULT_USER_AGENT)
+        .build()
+        .map_err(|_| GetBatchProofsError::ReqwestClientFailed)?;
 
-    let response = client.get(url).send()
+    let response = client
+        .get(url)
+        .send()
         .await
         .map_err(|_| GetBatchProofsError::Fetching)?;
     if !response.status().is_success() {

aggregation_mode/src/backend/s3.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::too_many_arguments)]
 use alloy::{
     network::EthereumWallet,
     providers::{