Merge branch 'feat/aggregation-mode-risc0' into feat/aggregation-mode-risc0-contracts

Author: MarcosNicolau

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

@@ -34,8 +34,8 @@ jobs:
       - name: Install risc0 toolchain
         run: |
           curl -L https://risczero.com/install | bash
-          source /home/runner/.bashrc
-          /home/runner/.risc0/bin/rzup install
+          source ~/.bashrc
+          ~/.risc0/bin/rzup install
 
       - name: Cache Rust dependencies
         uses: actions/cache@v3
@@ -99,8 +99,8 @@ jobs:
       - name: Install risc0 toolchain
         run: |
           curl -L https://risczero.com/install | bash
-          source /home/runner/.bashrc
-          /home/runner/.risc0/bin/rzup install
+          source ~/.bashrc
+          ~/.risc0/bin/rzup install
 
       - name: Cache Rust dependencies
         uses: actions/cache@v3

Makefile

@@ -163,13 +163,13 @@ is_aggregator_set:
 	fi
 
 start_proof_aggregator_dev: is_aggregator_set ## Starts proof aggregator with mock proofs (DEV mode)
-	RISC0_DEV_MODE=1 cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features $(AGGREGATOR) -- config-files/config-proof-aggregator-mock.yaml
+	AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 cargo run --manifest-path ./aggregation_mode/Cargo.toml --release -- config-files/config-proof-aggregator-mock.yaml
 
 start_proof_aggregator: is_aggregator_set ## Starts proof aggregator with proving activated
-	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,$(AGGREGATOR) -- config-files/config-proof-aggregator.yaml
+	AGGREGATOR=$(AGGREGATOR) cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove -- config-files/config-proof-aggregator.yaml
 
 start_proof_aggregator_gpu: is_aggregator_set ## Starts proof aggregator with proving + GPU acceleration (CUDA)
-	SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu,$(AGGREGATOR) -- config-files/config-proof-aggregator.yaml
+	AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu -- config-files/config-proof-aggregator.yaml
 
 _AGGREGATOR_:
 
@@ -717,7 +717,7 @@ build_aligned_contracts:
 
 show_aligned_error_codes:
 	@echo "\nAlignedLayerServiceManager errors:"
-	@cd contracts && forge inspect src/core/IAligedLayerServiceManager.sol:IAlignedLayerServiceManager errors
+	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors  
 	@echo "\nBatcherPaymentService errors:"
 	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors
 

aggregation_mode/Cargo.toml

@@ -40,6 +40,4 @@ opt-level = 3
 [features]
 default = []
 prove = []
-sp1 = []
-risc0 = []
 gpu = ["risc0-zkvm/cuda"]

aggregation_mode/aggregation_programs/Cargo.lock

@@ -4,3 +4,8 @@ version = "0.1.0"
 edition = "2021"
 resolver = "2"
 members = ["sp1", "risc0"]
+
+[patch.crates-io]
+# Adding RISC Zero keccak precompile support
+tiny-keccak = { git = "https://github.com/risc0/tiny-keccak", tag = "tiny-keccak/v2.0.2-risczero.0" }
+

aggregation_mode/aggregation_programs/Cargo.toml

@@ -7,12 +7,10 @@ resolver = "2"
 [dependencies]
 serde = { version = "1.0.203" }
 serde_json = "1.0.117"
-risc0-zkvm = { git = "https://github.com/risc0/risc0", tag="v2.0.0", default-features = false, features = ["std"] }
+# Unstable feature is necessary for tiny-keccak patch, see: https://dev.risczero.com/api/zkvm/precompiles#stability
+risc0-zkvm = { git = "https://github.com/risc0/risc0", tag="v2.0.0", default-features = false, features = ["unstable", "std"] }
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 
-[patch.crates-io]
-tiny-keccak = { git = "https://github.com/risc0/tiny-keccak", tag = "tiny-keccak/v2.0.2-risczero.0", features = ["keccak"]}	
-
 [lib]
 path = "./src/lib.rs"
 

aggregation_mode/aggregation_programs/risc0/Cargo.toml

@@ -16,7 +16,7 @@ fn combine_hashes(hash_a: &[u8; 32], hash_b: &[u8; 32]) -> [u8; 32] {
     hash
 }
 
-/// Computes the merkle root for the given proofs using the vk
+/// Computes the merkle root for the given proofs
 fn compute_merkle_root(proofs: &[Risc0ImageIdAndPubInputs]) -> [u8; 32] {
     let mut leaves: Vec<[u8; 32]> = proofs
         .chunks(2)

aggregation_mode/aggregation_programs/risc0/src/main.rs

@@ -23,18 +23,16 @@ impl Display for ZKVMEngine {
 }
 
 impl ZKVMEngine {
-    pub fn from_rust_features() -> Option<Self> {
-        #[cfg(feature = "sp1")]
-        {
-            return Some(ZKVMEngine::SP1);
-        }
-
-        #[cfg(feature = "risc0")]
-        {
-            return Some(ZKVMEngine::RISC0);
-        }
+    pub fn from_env() -> Option<Self> {
+        let key = "AGGREGATOR";
+        let value = std::env::var(key).ok()?;
+        let engine = match value.as_str() {
+            "sp1" => ZKVMEngine::SP1,
+            "risc0" => ZKVMEngine::RISC0,
+            _ => panic!("Invalid AGGREGATOR, possible options are: sp1|risc0"),
+        };
 
-        None
+        Some(engine)
     }
 }
 

aggregation_mode/src/aggregators/mod.rs

@@ -5,6 +5,7 @@ use sha3::{Digest, Keccak256};
 
 use super::lib::{AggregatedProof, ProgramOutput, ProofAggregationError};
 
+/// Byte representation of the aggregator image_id, converted from `[u32; 8]` to `[u8; 32]`.
 const RISC0_AGGREGATOR_PROGRAM_ID_BYTES: [u8; 32] = {
     let mut res = [0u8; 32];
     let mut i = 0;

aggregation_mode/src/aggregators/risc0_aggregator.rs

@@ -64,7 +64,8 @@ impl ProofAggregator {
             rpc_provider,
         );
 
-        let engine = ZKVMEngine::from_rust_features().expect("A feature defining zkvm engine");
+        let engine =
+            ZKVMEngine::from_env().expect("AGGREGATOR env variable to be set to one of sp1|risc0");
         let fetcher = ProofsFetcher::new(config);
 
         Self {
@@ -75,7 +76,7 @@ impl ProofAggregator {
     }
 
     pub async fn start(&mut self, config: &Config) {
-        info!("Starting proof aggregator service",);
+        info!("Starting proof aggregator service");
 
         info!("About to aggregate and submit proof to be verified on chain");
         let res = self.aggregate_and_submit_proofs_on_chain().await;