Merge branch 'staging' into feat/verify-agg-proof-on-chain

Author: MarcosNicolau

Makefile

@@ -166,14 +166,18 @@ is_aggregator_set:
 		exit 1; \
 	fi
 
-start_proof_aggregator_dev: is_aggregator_set ## Starts proof aggregator with mock proofs (DEV mode)
-	AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 cargo run --manifest-path ./aggregation_mode/Cargo.toml --release -- config-files/config-proof-aggregator-mock.yaml
+reset_last_aggregated_block:
+	@echo "Resetting last aggregated block..."
+	@echo '{"last_aggregated_block":0}' > config-files/proof-aggregator.last_aggregated_block.json
 
-start_proof_aggregator: is_aggregator_set ## Starts proof aggregator with proving activated
-	AGGREGATOR=$(AGGREGATOR) cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove -- config-files/config-proof-aggregator.yaml
+start_proof_aggregator_dev: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with mock proofs (DEV mode)
+	AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator -- config-files/config-proof-aggregator-mock.yaml
 
-start_proof_aggregator_gpu: is_aggregator_set ## Starts proof aggregator with proving + GPU acceleration (CUDA)
-	AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu -- config-files/config-proof-aggregator.yaml
+start_proof_aggregator: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated
+	AGGREGATOR=$(AGGREGATOR) cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove --bin proof_aggregator -- config-files/config-proof-aggregator.yaml
+
+start_proof_aggregator_gpu: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving + GPU acceleration (CUDA)
+	AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu --bin proof_aggregator -- config-files/config-proof-aggregator.yaml
 
 verify_aggregated_proof_sp1_holesky_stage: 
 	@echo "Verifying SP1 in aggregated proofs on holesky..."
@@ -200,7 +204,11 @@ verify_aggregated_proof_risc0_holesky_stage:
 		--rpc_url https://ethereum-holesky-rpc.publicnode.com
 
 install_aggregation_mode: ## Install the aggregation mode with proving enabled
-	cargo install --path aggregation_mode --features prove
+	cargo install --path aggregation_mode --features prove,gpu --bin proof_aggregator
+
+agg_mode_write_program_ids: ## Write proof aggregator zkvm programs ids 
+	@cd aggregation_mode && \
+	cargo run --release --bin write_program_image_id_vk_hash
 
 _AGGREGATOR_:
 
@@ -568,6 +576,11 @@ batcher_send_burst_groth16: batcher/target/release/aligned
 	@mkdir -p scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs
 	@./batcher/aligned/send_burst_tasks.sh $(BURST_SIZE) $(START_COUNTER)
 
+batcher_send_proof_with_random_address:
+	@cd batcher/aligned/ && ./send_proof_with_random_address.sh
+
+batcher_send_burst_with_random_address:
+	@cd batcher/aligned/ && ./send_burst_with_random_address.sh
 
 __TASK_SENDER__:
 BURST_TIME_SECS ?= 3

aggregation_mode/Cargo.toml

@@ -3,7 +3,6 @@ name = "proof_aggregator"
 version = "0.1.0"
 edition = "2021"
 
-
 [dependencies]
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
@@ -42,3 +41,11 @@ opt-level = 3
 default = []
 prove = []
 gpu = ["risc0-zkvm/cuda"]
+
+[[bin]]
+name = "proof_aggregator"
+path = "./src/main.rs"
+
+[[bin]]
+name = "write_program_image_id_vk_hash"
+path = "./bin/write_program_image_id_vk_hash.rs"

aggregation_mode/abi/AlignedProofAggregationService.json

@@ -22,6 +22,16 @@ impl Risc0ImageIdAndPubInputs {
     }
 }
 
+// Note: this MerkleTreeBackend is defined in three locations
+// - aggregation_mode/src/aggregators/mod.rs
+// - aggregation_mode/src/aggregators/risc0_aggregator.rs
+// - aggregation_mode/src/aggregators/sp1_aggregator.rs
+// All 3 implementations should match
+// The definition on aggregator/mod.rs supports taking proofs from both Risc0 and SP1,
+// Additionally, a version that takes the leaves as already hashed data is defined on:
+// - batcher/aligned-sdk/src/sdk/aggregation.rs
+// This one is used in the SDK since,
+// the user may not have access to the proofs that he didn't submit
 impl IsMerkleTreeBackend for Risc0ImageIdAndPubInputs {
     type Data = Risc0ImageIdAndPubInputs;
     type Node = [u8; 32];

aggregation_mode/aggregation_programs/risc0/src/lib.rs

@@ -19,6 +19,16 @@ impl SP1VkAndPubInputs {
     }
 }
 
+// Note: this MerkleTreeBackend is defined in three locations
+// - aggregation_mode/src/aggregators/mod.rs
+// - aggregation_mode/src/aggregators/risc0_aggregator.rs and
+// - aggregation_mode/src/aggregators/sp1_aggregator.rs
+// All 3 implementations should match
+// The definition on aggregator/mod.rs supports taking proofs from both Risc0 and SP1,
+// Additionally, a version that takes the leaves as already hashed data is defined on:
+// - batcher/aligned-sdk/src/sdk/aggregation.rs
+// This one is used in the SDK since
+// the user may not have access to the proofs that they didn't submit
 impl IsMerkleTreeBackend for SP1VkAndPubInputs {
     type Data = SP1VkAndPubInputs;
     type Node = [u8; 32];

aggregation_mode/aggregation_programs/sp1/src/lib.rs

@@ -0,0 +1,38 @@
+use alloy::hex::hex;
+use proof_aggregator::aggregators::{
+    risc0_aggregator::RISC0_AGGREGATOR_PROGRAM_ID_BYTES, sp1_aggregator,
+};
+use serde_json::json;
+use sp1_sdk::HashableKey;
+use std::{env, fs, path::Path};
+use tracing::info;
+use tracing_subscriber::FmtSubscriber;
+
+const SP1_PROGRAM_ELF: &[u8] =
+    include_bytes!("../aggregation_programs/sp1/elf/sp1_aggregator_program");
+
+include!(concat!(env!("OUT_DIR"), "/methods.rs"));
+
+fn main() {
+    let subscriber = FmtSubscriber::builder().finish();
+    tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed");
+
+    info!("About to write sp1 programs vk hash bytes + risc0 programs image id bytes");
+    let sp1_vk_hash = sp1_aggregator::vk_from_elf(SP1_PROGRAM_ELF).bytes32_raw();
+    let risc0_image_id_bytes = RISC0_AGGREGATOR_PROGRAM_ID_BYTES;
+
+    let sp1_vk_hash_hex = hex::encode(sp1_vk_hash);
+    let risc0_image_id_hex = hex::encode(risc0_image_id_bytes);
+
+    let dest_path = Path::new("programs_ids.json");
+
+    let json_data = json!({
+        "sp1_vk_hash": format!("0x{}", sp1_vk_hash_hex),
+        "risc0_image_id": format!("0x{}", risc0_image_id_hex),
+    });
+
+    // Write to the file
+    fs::write(dest_path, serde_json::to_string_pretty(&json_data).unwrap()).unwrap();
+
+    info!("Program ids written to {:?}", dest_path);
+}

aggregation_mode/bin/write_program_image_id_vk_hash.rs

@@ -1,10 +1,28 @@
+use risc0_build::{DockerOptionsBuilder, GuestOptionsBuilder};
+use std::collections::HashMap;
+
+// Reference: https://docs.succinct.xyz/docs/sp1/writing-programs/compiling#advanced-build-options-1
 fn main() {
     sp1_build::build_program_with_args("./aggregation_programs/sp1", {
         sp1_build::BuildArgs {
             output_directory: Some("./aggregation_programs/sp1/elf".to_string()),
+            // We use Docker to generate a reproducible ELF that will be identical across all platforms
+            // (https://docs.succinct.xyz/docs/sp1/writing-programs/compiling#production-builds)
+            docker: true,
             ..Default::default()
         }
     });
 
-    risc0_build::embed_methods();
+    // With this containerized build process, we ensure that all builds of the guest code,
+    // regardless of the machine or local environment, will produce the same ImageID
+    let docker_options = DockerOptionsBuilder::default().build().unwrap();
+    // Reference: https://github.com/risc0/risc0/blob/main/risc0/build/src/config.rs#L73-L90
+    let guest_options = GuestOptionsBuilder::default()
+        .use_docker(docker_options)
+        .build()
+        .unwrap();
+    risc0_build::embed_methods_with_options(HashMap::from([(
+        "risc0_aggregation_program",
+        guest_options,
+    )]));
 }

aggregation_mode/build.rs

@@ -0,0 +1,4 @@
+{
+  "risc0_image_id": "0xa2966b3e63b5e73848dd3fb8ff1e03ac68ca10fa961ca0c0d8dbbb0a85b60acd",
+  "sp1_vk_hash": "0x00eb8139c8360fc371b9a6decdec55ba01aaae0f4739f68139e0b3d40397d1d6"
+}

aggregation_mode/programs_ids.json

@@ -125,6 +125,23 @@ impl AlignedProof {
     }
 }
 
+/// Merkle tree commitment for aligned proofs.
+///
+/// Each leaf node (representing a proof) is committed by hashing:
+/// — The program id: the verification key hash in SP1 or the image ID in RISC Zero
+/// — Public inputs.
+///
+/// Intermediate nodes in the tree are formed by computing the keccak pairs of child nodes.
+// Note: this MerkleTreeBackend is defined in three locations
+// - aggregation_mode/src/aggregators/mod.rs
+// - aggregation_mode/src/aggregators/risc0_aggregator.rs
+// - aggregation_mode/src/aggregators/sp1_aggregator.rs
+// All 3 implementations should match
+// The definition on aggregator/mod.rs supports taking proofs from both Risc0 and SP1,
+// Additionally, a version that takes the leaves as already hashed data is defined on:
+// - batcher/aligned-sdk/src/sdk/aggregation.rs
+// This one is used in the SDK since,
+// the user may not have access to the proofs that he didn't submit
 impl IsMerkleTreeBackend for AlignedProof {
     type Data = AlignedProof;
     type Node = [u8; 32];

aggregation_mode/src/aggregators/mod.rs

@@ -4,7 +4,7 @@ use risc0_zkvm::{default_prover, ExecutorEnv, ProverOpts, Receipt};
 use sha3::{Digest, Keccak256};
 
 /// Byte representation of the aggregator image_id, converted from `[u32; 8]` to `[u8; 32]`.
-const RISC0_AGGREGATOR_PROGRAM_ID_BYTES: [u8; 32] = {
+pub const RISC0_AGGREGATOR_PROGRAM_ID_BYTES: [u8; 32] = {
     let mut res = [0u8; 32];
     let mut i = 0;
     while i < 8 {