refactor: rename libs and functions

Author: MarcosNicolau

aggregation-mode/Cargo.lock

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 sp1-sdk = "4.1.3"
-zkvm_sp1_interface = { path = "./zkvm/sp1/", package = "sp1_verifier_program" }
+sp1_aggregator = { path = "./zkvm/sp1/" }
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
 tracing = { version = "0.1", features = ["log"] }

aggregation-mode/Cargo.toml

@@ -1,6 +1,6 @@
 use super::sp1::{self, SP1AggregatedProof};
 use serde::{Deserialize, Serialize};
-use zkvm_sp1_interface::SP1CompressedProof;
+use sp1_aggregator::SP1CompressedProof;
 
 #[derive(Serialize, Deserialize)]
 pub enum InputProofs {
@@ -13,10 +13,8 @@ pub struct ProgramInput {
 }
 
 impl ProgramInput {
-    pub fn new(input_proofs: InputProofs) -> Self {
-        ProgramInput {
-            proofs: input_proofs,
-        }
+    pub fn new(proofs: InputProofs) -> Self {
+        ProgramInput { proofs }
     }
 }
 
@@ -26,12 +24,11 @@ pub enum AggregatedProof {
 
 pub struct ProgramOutput {
     pub proof: AggregatedProof,
-    pub leaves: Vec<Vec<u8>>,
 }
 
 impl ProgramOutput {
-    pub fn new(proof: AggregatedProof, leaves: Vec<Vec<u8>>) -> Self {
-        Self { proof, leaves }
+    pub fn new(proof: AggregatedProof) -> Self {
+        Self { proof }
     }
 
     /// TODO: return the contract calldata to verify proof
@@ -46,8 +43,8 @@ pub enum AggregatedVerificationError {
     SP1Proving,
 }
 
-pub fn verify_proofs(input: ProgramInput) -> Result<ProgramOutput, AggregatedVerificationError> {
+pub fn aggregate_proofs(input: ProgramInput) -> Result<ProgramOutput, AggregatedVerificationError> {
     match input.proofs {
-        InputProofs::SP1Compressed(proofs) => sp1::verify_proof_aggregation(proofs),
+        InputProofs::SP1Compressed(proofs) => sp1::aggregate_proofs(proofs),
     }
 }

…regation-mode/src/verifiers/interface.rs …egation-mode/src/aggregator/interface.rsaggregation-mode/src/verifiers/interface.rs renamed to aggregation-mode/src/aggregator/interface.rs aggregation-mode/src/verifiers/interface.rs renamed to aggregation-mode/src/aggregator/interface.rs

@@ -1,16 +1,16 @@
+use sp1_aggregator::SP1CompressedProof;
 use sp1_sdk::{ProverClient, SP1ProofWithPublicValues, SP1Stdin, SP1VerifyingKey};
-use zkvm_sp1_interface::SP1CompressedProof;
 
 use super::interface::{AggregatedProof, AggregatedVerificationError, ProgramOutput};
 
-const PROGRAM_ELF: &[u8] = include_bytes!("../../zkvm/sp1/elf/sp1_verifier_program");
+const PROGRAM_ELF: &[u8] = include_bytes!("../../zkvm/sp1/elf/sp1_aggregator_program");
 
 pub struct SP1AggregatedProof {
     proof: SP1ProofWithPublicValues,
     vk: SP1VerifyingKey,
 }
 
-pub(crate) fn verify_proof_aggregation(
+pub(crate) fn aggregate_proofs(
     proofs: Vec<SP1CompressedProof>,
 ) -> Result<ProgramOutput, AggregatedVerificationError> {
     let mut stdin = SP1Stdin::new();
@@ -29,10 +29,7 @@ pub(crate) fn verify_proof_aggregation(
         .verify(&proof, &vk)
         .map_err(AggregatedVerificationError::SP1Verification)?;
 
-    let output = ProgramOutput::new(
-        AggregatedProof::SP1(SP1AggregatedProof { proof, vk }),
-        vec![],
-    );
+    let output = ProgramOutput::new(AggregatedProof::SP1(SP1AggregatedProof { proof, vk }));
 
     Ok(output)
 }

aggregation-mode/src/verifiers/mod.rs aggregation-mode/src/aggregator/mod.rsaggregation-mode/src/verifiers/mod.rs renamed to aggregation-mode/src/aggregator/mod.rs

@@ -1,11 +1,5 @@
-mod verifiers;
+mod aggregator;
 
-use verifiers::interface::{
-    verify_proofs, AggregatedVerificationError, InputProofs, ProgramInput, ProgramOutput,
+pub use aggregator::interface::{
+    aggregate_proofs, AggregatedVerificationError, InputProofs, ProgramInput, ProgramOutput,
 };
-
-pub fn verify_aggregated_proofs() -> Result<ProgramOutput, AggregatedVerificationError> {
-    let sp1_compressed_proofs = vec![];
-    let input = ProgramInput::new(InputProofs::SP1Compressed(sp1_compressed_proofs));
-    verify_proofs(input)
-}

aggregation-mode/src/verifiers/sp1.rs aggregation-mode/src/aggregator/sp1.rsaggregation-mode/src/verifiers/sp1.rs renamed to aggregation-mode/src/aggregator/sp1.rs

@@ -1,28 +1,29 @@
 use std::time::Duration;
 
-use proof_aggregator::verify_aggregated_proofs;
+use proof_aggregator::{aggregate_proofs, InputProofs, ProgramInput};
 use tracing::{error, info};
 use tracing_subscriber::FmtSubscriber;
 
 fn main() {
     let subscriber = FmtSubscriber::builder().finish();
     tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed");
 
-    // simulate a service that sends proofs every n seconds after some processing
+    // simulate a service that aggregates proofs every n seconds after some processing
     loop {
         info!("Waiting 2 seconds before aggregating proofs...");
         std::thread::sleep(Duration::from_secs(2));
 
-        let Ok(output) = verify_aggregated_proofs() else {
+        let proofs = InputProofs::SP1Compressed(vec![]);
+        let input = ProgramInput::new(proofs);
+        let Ok(output) = aggregate_proofs(input) else {
             error!("Error while aggregating and verifying proofs");
             return;
         };
+
         info!("Proof aggregated, sending to aligned verification contract...");
 
         // TODO: send a blob transaction to with the merkle leaves
-        let _leaves = &output.leaves;
-
-        // TODO: call contract to verify proof + attach blob transaction
+        // TODO: call contract to verify proof + attach blob transaction root
         // the contract should emit a log with the verification and the path to the blob
         let _calldata = output.calldata();
     }

aggregation-mode/src/lib.rs

@@ -1,8 +1,11 @@
 [workspace]
-name = "zkvm"
+name = "zkvm_aggregators"
 version = "0.1.0"
 edition = "2021"
 resolver = "2"
 members = ["sp1"]
 
 [workspace.dependencies]
+serde = { version = "1.0.203", features = ["derive"] }
+serde_json = "1.0.117"
+sha2 = "0.10.8"

aggregation-mode/src/main.rs

@@ -1,14 +1,14 @@
 [package]
-name = "sp1_verifier_program"
+name = "sp1_aggregator"
 version = "0.1.0"
 edition = "2021"
 resolver = "2"
 
 [dependencies]
 sp1-zkvm = { version = "4.1.3", features = ["verify"] }
-sha2 = "0.10.8"
-serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.117"
+serde = { workspace = true }
+serde_json = { workspace = true }
+sha2 = { workspace = true }
 
 [patch.crates-io]
 sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", tag = "sha2-v0.10.8-patch-v1" }
@@ -17,5 +17,5 @@ sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", tag = "sha2-v
 path = "./src/lib.rs"
 
 [[bin]]
-name = "sp1_verifier_program"
-path = "src/main.rs"
+name = "sp1_aggregator_program"
+path = "./src/main.rs"