fix: compilation errors

Author: MarcosNicolau

Makefile

@@ -236,7 +236,7 @@ __AGGREGATION_MODE__: ## ____
 
 is_aggregator_set:
 	@if [ -z "$(AGGREGATOR)" ]; then \
-		echo "Error: AGGREGATOR is not set. Please provide arg AGGREGATOR='sp1' or 'risc0'."; \
+		echo "Error: AGGREGATOR is not set. Please provide arg AGGREGATOR='sp1' or 'risc0' or 'zisk'."; \
 		exit 1; \
 	fi
 
@@ -893,7 +893,7 @@ aligned_get_user_balance_holesky:
 __GENERATE_PROOFS__: ## ____
 
 generate_zisk_proof:
-	@cd scripts/test_files/zisk && cargo-zisk build --release && \
+	@cd scripts/test_files/zisk/sha_hasher && cargo-zisk build --release && \
 	cargo-zisk rom-setup -e target/riscv64ima-zisk-zkvm-elf/release/sha_hasher && \
 	cargo-zisk prove -e target/riscv64ima-zisk-zkvm-elf/release/sha_hasher -i build/input.bin -o proof -a -y 
 

aggregation_mode/proof_aggregator/src/aggregators/mod.rs

@@ -34,6 +34,7 @@ impl Display for ZKVMEngine {
 pub enum ProofAggregationError {
     SP1Aggregation(SP1AggregationError),
     Risc0Aggregation(Risc0AggregationError),
+    ZiskAggregation(zisk_aggregator::AlignedZiskError),
     PublicInputsDeserialization,
 }
 
@@ -184,22 +185,19 @@ impl ZKVMEngine {
 
                 let mut agg_proofs: Vec<(ZiskStarkProof, Vec<[u8; 32]>)> = vec![];
                 for (i, chunk) in chunks.enumerate() {
-                    let leaves_commitment = chunk
-                        .iter()
-                        .map(|e| e.hash_image_id_and_public_inputs())
-                        .collect();
+                    let leaves_commitment = chunk.iter().map(|e| e.hash_proof()).collect();
                     let agg_proof = zisk_aggregator::run_user_proofs_aggregator(chunk)
-                        .map_err(ProofAggregationError::Risc0Aggregation)?;
+                        .map_err(ProofAggregationError::ZiskAggregation)?;
                     agg_proofs.push((agg_proof, leaves_commitment));
 
                     info!("Chunk number {} has been aggregated", i);
                 }
 
                 info!("All chunks have been aggregated, performing last aggregation...");
                 let agg_proof = zisk_aggregator::run_chunk_aggregator(&agg_proofs)
-                    .map_err(ProofAggregationError::Risc0Aggregation)?;
+                    .map_err(ProofAggregationError::ZiskAggregation)?;
 
-                let public_input_bytes = agg_proof.public_values;
+                let public_input_bytes = agg_proof.public_values.clone();
                 let merkle_root: [u8; 32] = public_input_bytes
                     .try_into()
                     .map_err(|_| ProofAggregationError::PublicInputsDeserialization)?;

aggregation_mode/proof_aggregator/src/backend/fetcher.rs

@@ -80,7 +80,10 @@ impl ProofsFetcher {
             ZKVMEngine::ZISK => {
                 let pairs: Vec<(AlignedProof, Uuid)> = tasks
                     .into_par_iter()
-                    .filter_map(|task| Some((ZiskStarkProof::new(task.proof), task.task_id)))
+                    .filter_map(|task| {
+                        let proof = ZiskStarkProof::new(task.proof);
+                        Some((AlignedProof::Zisk(proof.into()), task.task_id))
+                    })
                     .collect();
 
                 pairs.into_iter().unzip()

aggregation_mode/proof_aggregator/src/backend/mod.rs

@@ -123,7 +123,7 @@ impl ProofAggregator {
             config,
             sp1_chunk_aggregator_vk_hash_bytes,
             risc0_chunk_aggregator_image_id_bytes,
-            zisk_chunk_aggregator_vk_hash_bytes: zisk_chunk_aggregator_vk_bytes,
+            zisk_chunk_aggregator_vk_hash_bytes,
             db,
         }
     }
@@ -371,9 +371,9 @@ impl ProofAggregator {
                 .proof_aggregation_service
                 .verifyAggregationZisk(
                     blob_versioned_hash.into(),
-                    proof.vk.into(),
-                    proof.public_values.into(),
-                    proof.proof.into(),
+                    proof.vk.clone().into(),
+                    proof.public_values.to_vec().into(),
+                    proof.proof.to_vec().into(),
                     self.zisk_chunk_aggregator_vk_hash_bytes.into(),
                 )
                 .sidecar(blob)

config-files/config-proof-aggregator-ethereum-package.yaml

@@ -26,6 +26,7 @@ monthly_budget_eth: 15.0
 # (remember to trim the 0x prefix)
 sp1_chunk_aggregator_vk_hash: "00d6e32a34f68ea643362b96615591c94ee0bf99ee871740ab2337966a4f77af"
 risc0_chunk_aggregator_image_id: "8908f01022827e80a5de71908c16ee44f4a467236df20f62e7c994491629d74c"
+zisk_chunk_aggregator_vk_hash_bytes: "fd518d50ee1b5bfe9e594448582fc8556b7313e2607e3d1f10a1d475800912b0"
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator.yaml

@@ -26,6 +26,7 @@ monthly_budget_eth: 15.0
 # (remember to trim the 0x prefix)
 sp1_chunk_aggregator_vk_hash: "00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509"
 risc0_chunk_aggregator_image_id: "d8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf"
+zisk_chunk_aggregator_vk_hash_bytes: "fd518d50ee1b5bfe9e594448582fc8556b7313e2607e3d1f10a1d475800912b0"
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"