feat(batcher client): add verify function in service manager to check proof merkle path (#367)

Co-authored-by: jotabulacios <45471455+jotabulacios@users.noreply.github.com>
Co-authored-by: NicolasRampoldi <58613770+NicolasRampoldi@users.noreply.github.com>
Co-authored-by: Santos Rosati <rosatisantos@gmail.com>
Co-authored-by: Mauro Toscano <12560266+MauroToscano@users.noreply.github.com>
Co-authored-by: Uriel Mihura <43704209+uri-99@users.noreply.github.com>

Author: 6 people

.gitignore

@@ -6,3 +6,5 @@ cache
 **/build
 **/target
 task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/**
+batcher/aligned/batch_inclusion_responses/*
+**/aligned_verification_data

Makefile

@@ -185,15 +185,15 @@ batcher/target/release/aligned:
 
 batcher_send_sp1_task:
 	@echo "Sending SP1 fibonacci task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system SP1 \
 		--proof test_files/sp1/sp1_fibonacci.proof \
 		--vm_program test_files/sp1/sp1_fibonacci-elf \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
 
 batcher_send_sp1_burst:
 	@echo "Sending SP1 fibonacci task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system SP1 \
 		--proof test_files/sp1/sp1_fibonacci.proof \
 		--vm_program test_files/sp1/sp1_fibonacci-elf \
@@ -206,7 +206,7 @@ batcher_send_infinite_sp1:
 
 batcher_send_plonk_bn254_task: batcher/target/release/aligned
 	@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system GnarkPlonkBn254 \
 		--proof test_files/plonk_bn254/plonk.proof \
 		--public_input test_files/plonk_bn254/plonk_pub_input.pub \
@@ -215,7 +215,7 @@ batcher_send_plonk_bn254_task: batcher/target/release/aligned
 
 batcher_send_plonk_bn254_burst: batcher/target/release/aligned
 	@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system GnarkPlonkBn254 \
 		--proof test_files/plonk_bn254/plonk.proof \
 		--public_input test_files/plonk_bn254/plonk_pub_input.pub \
@@ -225,7 +225,7 @@ batcher_send_plonk_bn254_burst: batcher/target/release/aligned
 
 batcher_send_plonk_bls12_381_task: batcher/target/release/aligned
 	@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system GnarkPlonkBls12_381 \
 		--proof test_files/plonk_bls12_381/plonk.proof \
 		--public_input test_files/plonk_bls12_381/plonk_pub_input.pub \
@@ -234,7 +234,7 @@ batcher_send_plonk_bls12_381_task: batcher/target/release/aligned
 
 batcher_send_plonk_bls12_381_burst: batcher/target/release/aligned
 	@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system GnarkPlonkBls12_381 \
 		--proof test_files/plonk_bls12_381/plonk.proof \
 		--public_input test_files/plonk_bls12_381/plonk_pub_input.pub \
@@ -245,7 +245,7 @@ batcher_send_plonk_bls12_381_burst: batcher/target/release/aligned
 
 batcher_send_groth16_bn254_task: batcher/target/release/aligned
 	@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Groth16Bn254 \
 		--proof test_files/groth16/ineq_1_groth16.proof \
 		--public_input test_files/groth16/ineq_1_groth16.pub \
@@ -254,7 +254,7 @@ batcher_send_groth16_bn254_task: batcher/target/release/aligned
 
 batcher_send_groth16_burst: batcher/target/release/aligned
 	@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Groth16Bn254 \
 		--proof test_files/groth16/ineq_1_groth16.proof \
 		--public_input test_files/groth16/ineq_1_groth16.pub \
@@ -274,15 +274,15 @@ batcher_send_burst_groth16: batcher/target/release/aligned
 
 batcher_send_halo2_ipa_task: batcher/target/release/aligned
 	@echo "Sending Halo2 IPA 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Halo2IPA \
 		--proof test_files/halo2_ipa/proof.bin \
 		--public_input test_files/halo2_ipa/pub_input.bin \
 		--vk test_files/halo2_ipa/params.bin \
 
 batcher_send_halo2_ipa_task_burst_5: batcher/target/release/aligned
 	@echo "Sending Halo2 IPA 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Halo2IPA \
 		--proof test_files/halo2_ipa/proof.bin \
 		--public_input test_files/halo2_ipa/pub_input.bin \
@@ -291,7 +291,7 @@ batcher_send_halo2_ipa_task_burst_5: batcher/target/release/aligned
 
 batcher_send_halo2_kzg_task: batcher/target/release/aligned
 	@echo "Sending Halo2 KZG 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Halo2KZG \
 		--proof test_files/halo2_kzg/proof.bin \
 		--public_input test_files/halo2_kzg/pub_input.bin \
@@ -300,7 +300,7 @@ batcher_send_halo2_kzg_task: batcher/target/release/aligned
 
 batcher_send_halo2_kzg_task_burst_5: batcher/target/release/aligned
 	@echo "Sending Halo2 KZG 1!=0 task to Batcher..."
-	@cd batcher/aligned/ && cargo run --release -- \
+	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system Halo2KZG \
 		--proof test_files/halo2_kzg/proof.bin \
 		--public_input test_files/halo2_kzg/pub_input.bin \

README.md

@@ -44,7 +44,7 @@ curl -L https://raw.githubusercontent.com/yetanotherco/aligned_layer/main/batche
 Send the proof with:
 
 ```bash
-aligned \
+aligned submit \
 --proving_system SP1 \
 --proof ~/.aligned/test_files/sp1_fibonacci.proof \
 --vm_program ~/.aligned/test_files/sp1_fibonacci-elf \
@@ -58,18 +58,19 @@ aligned \
 The SP1 proof needs the proof file and the vm program file.
 
 ```bash
-aligned \
+aligned submit \
 --proving_system <SP1|GnarkPlonkBn254|GnarkPlonkBls12_381|Groth16Bn254> \
 --proof <proof_file> \
 --vm_program <vm_program_file> \
 --conn wss://batcher.alignedlayer.com \
---proof_generator_addr [proof_generator_addr]
+--proof_generator_addr [proof_generator_addr] \
+--batch_inclusion_data_directory_path [batch_inclusion_data_directory_path]
 ```
 
 **Example**
 
 ```bash
-aligned \
+aligned submit \
 --proving_system SP1 \
 --proof ./batcher/aligned/test_files/sp1/sp1_fibonacci.proof \
 --vm_program ./batcher/aligned/test_files/sp1/sp1_fibonacci-elf \
@@ -81,19 +82,20 @@ aligned \
 The GnarkPlonkBn254, GnarkPlonkBls12_381 and Groth16Bn254 proofs need the proof file, the public input file and the verification key file.
 
 ```bash
-aligned \
+aligned submit \
 --proving_system <SP1|GnarkPlonkBn254|GnarkPlonkBls12_381|Groth16Bn254> \
 --proof <proof_file> \
 --public_input <public_input_file> \
 --vk <verification_key_file> \
 --conn wss://batcher.alignedlayer.com \
---proof_generator_addr [proof_generator_addr]
+--proof_generator_addr [proof_generator_addr] \
+--batch_inclusion_data_directory_path [batch_inclusion_data_directory_path]
 ```
 
 **Examples**:
 
 ```bash
-aligned \
+aligned submit \
 --proving_system GnarkPlonkBn254 \
 --proof ./batcher/aligned/test_files/plonk_bn254/plonk.proof \
 --public_input ./batcher/aligned/test_files/plonk_bn254/plonk_pub_input.pub \
@@ -102,7 +104,7 @@ aligned \
 ```
 
 ```bash
-aligned \
+aligned submit \
 --proving_system GnarkPlonkBls12_381 \
 --proof ./batcher/aligned/test_files/plonk_bls12_381/plonk.proof \
 --public_input ./batcher/aligned/test_files/plonk_bls12_381/plonk_pub_input.pub \
@@ -111,14 +113,35 @@ aligned \
 ```
 
 ```bash
-aligned \
+aligned submit \
 --proving_system Groth16Bn254 \
 --proof ./batcher/aligned/test_files/groth16/ineq_1_groth16.proof \
 --public_input ./batcher/aligned/test_files/groth16/ineq_1_groth16.pub \
 --vk ./batcher/aligned/test_files/groth16/ineq_1_groth16.vk \
 --conn wss://batcher.alignedlayer.com
 ```
 
+### Creating a transaction from the CLI to verify proof in Ethereum
+After running the commands of the previous section to submit proofs to the batcher, you will receive responses that will be written to disk in a JSON format inside the `<batch_inclusion_data_directory_path>`, for example `19f04bbb143af72105e2287935c320cc2aa9eeda0fe1f3ffabbe4e59cdbab691_0.json`. By default, the `batch_inclusion_data` directory will be created where the submit command is being executed, but you can specify it with the `<batch_inclusion_data_directory_path>` argument. To verify their inclusion in a batch, run the following command, replacing the `<path_to_batch_inclusion_data>` placeholder with the path to your response file, and `<private_key_store>` with the path to your ECDSA key store:
+
+```bash
+aligned verify-proof-onchain \
+--aligned-verification-data <path_to_verification_data> \
+--private-key-store <path_to_private_key_store> \
+--eth_rpc_url <holesky_rpc_url> \
+--chain holesky
+```
+
+As an example,
+
+```bash
+aligned verify-proof-onchain \
+--aligned-verification-data 19f04bbb143af72105e2287935c320cc2aa9eeda0fe1f3ffabbe4e59cdbab691_0.json --private-key-store config-files/anvil.ecdsa.key.json \
+--eth_rpc_url https://ethereum-holesky-rpc.publicnode.com \
+--chain holesky
+
+```
+
 ## Register as an Aligned operator in testnet
 
 ### Requirements
@@ -609,7 +632,8 @@ aligned \
 --proof <proof_file> \
 --public-input <public_input_file> \
 --vm_program <vm_program_file> \
---proof_generator_addr [proof_generator_addr]
+--proof_generator_addr [proof_generator_addr] \
+--aligned_verification_data_path [aligned_verification_data_path]
 ```
 
 ### Task Sender
@@ -1069,7 +1093,8 @@ cargo run --release -- \
 --proof <proof_path> \
 --vm_program <vm_program_path> \
 --conn wss://batcher.alignedlayer.com \
---proof_generator_addr [proof_generator_addr]
+--proof_generator_addr [proof_generator_addr] \
+--aligned_verification_data_path [aligned_verification_data_path]
 ```
 
 ## FAQ

batcher/Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-alloy-primitives = { version = "0.7.4", features = ["serde"] }
+ethers = { version = "2.0", features = ["ws", "rustls"] }
 anyhow = "1.0.83"
 log = { version = "0.4.21"}
 serde = { version = "1.0.201", features = ["derive"] }

batcher/aligned-batcher-lib/Cargo.toml

@@ -1,8 +1,10 @@
 use std::fmt;
 
-use alloy_primitives::Address;
 use anyhow::anyhow;
-use lambdaworks_crypto::merkle_tree::{merkle::MerkleTree, proof::Proof, traits::IsMerkleTreeBackend};
+use ethers::types::Address;
+use lambdaworks_crypto::merkle_tree::{
+    merkle::MerkleTree, proof::Proof, traits::IsMerkleTreeBackend,
+};
 use serde::{Deserialize, Serialize};
 use sha3::{Digest, Keccak256};
 
@@ -90,7 +92,6 @@ impl IsMerkleTreeBackend for VerificationCommitmentBatch {
         hasher.update(leaf.proof_commitment);
         hasher.update(leaf.pub_input_commitment);
         hasher.update(leaf.proving_system_aux_data_commitment);
-        hasher.update(leaf.pub_input_commitment);
         hasher.update(leaf.proof_generator_addr);
 
         hasher.finalize().into()
@@ -111,6 +112,7 @@ pub struct BatchInclusionData {
     pub verification_data_commitment: VerificationDataCommitment,
     pub batch_merkle_root: [u8; 32],
     pub batch_inclusion_proof: Proof<[u8; 32]>,
+    pub verification_data_batch_index: usize,
 }
 
 impl BatchInclusionData {
@@ -127,6 +129,7 @@ impl BatchInclusionData {
             verification_data_commitment: verification_data_commitment.clone(),
             batch_merkle_root: batch_merkle_tree.root.clone(),
             batch_inclusion_proof,
+            verification_data_batch_index,
         }
     }
 }

batcher/aligned-batcher-lib/src/types/mod.rs

@@ -18,7 +18,7 @@ pub struct BatchVerified {
 }
 
 pub type AlignedLayerServiceManager =
-AlignedLayerServiceManagerContract<SignerMiddleware<Provider<Http>, Wallet<SigningKey>>>;
+    AlignedLayerServiceManagerContract<SignerMiddleware<Provider<Http>, Wallet<SigningKey>>>;
 
 pub type BatchVerifiedEventStream<'s> = EventStream<
     's,
@@ -43,7 +43,7 @@ pub async fn get_contract(
         &ecdsa_config.private_key_store_path,
         &ecdsa_config.private_key_store_password,
     )?
-        .with_chain_id(chain_id.as_u64());
+    .with_chain_id(chain_id.as_u64());
 
     let signer = Arc::new(SignerMiddleware::new(provider, wallet));
 

batcher/aligned-batcher/src/eth/abi/AlignedLayerServiceManager.json

@@ -23,7 +23,7 @@ impl From<&[u8]> for ListRef {
     fn from(v: &[u8]) -> Self {
         let len = v.len();
         let data = v.as_ptr().cast();
-        ListRef{data, len}
+        ListRef { data, len }
     }
 }
 

batcher/aligned-batcher/src/eth/mod.rs

@@ -71,7 +71,7 @@ pub fn verify_halo2_ipa(proof: &[u8], public_input: &[u8], verification_key: &[u
                     >(
                         &params, &vk, strategy, &[&[instances]], &mut transcript
                     )
-                        .is_ok();
+                    .is_ok();
                 }
             }
         }