fix: use the chunk aggregator program IDs in verification

Author: maximopalopoli

aggregation_mode/src/backend/mod.rs

@@ -37,7 +37,6 @@ use fetcher::{ProofsFetcher, ProofsFetcherError};
 use merkle_tree::compute_proofs_merkle_root;
 use risc0_ethereum_contracts::encode_seal;
 use secp256k1::SecretKey;
-use sp1_sdk::HashableKey;
 use std::str::FromStr;
 use tracing::{error, info, warn};
 use types::{AlignedProofAggregationService, AlignedProofAggregationServiceContract};
@@ -56,6 +55,7 @@ pub enum AggregatedProofSubmissionError {
     ZKVMAggregation(ProofAggregationError),
     BuildingMerkleRoot,
     MerkleRootMisMatch,
+    BuildingVKHash(String),
 }
 
 pub struct ProofAggregator {
@@ -191,7 +191,24 @@ impl ProofAggregator {
     ) -> Result<H256, AggregatedProofSubmissionError> {
         let calldata = match aggregated_proof {
             AlignedProof::SP1(proof) => {
-                let vk_hash = proof.vk.hash_bytes();
+                let vk_hash: [u8; 32] = {
+                    let hex_str = self
+                        .config
+                        .sp1_chunk_aggregator_vk_hash
+                        .strip_prefix("0x")
+                        .unwrap_or(&self.config.sp1_chunk_aggregator_vk_hash);
+                    let bytes = hex::decode(hex_str).map_err(|e| {
+                        AggregatedProofSubmissionError::BuildingVKHash(e.to_string())
+                    })?;
+                    if bytes.len() != 32 {
+                        return Err(AggregatedProofSubmissionError::BuildingVKHash(
+                            "vk hash not 32 bytes".into(),
+                        ));
+                    }
+                    let mut arr = [0u8; 32];
+                    arr.copy_from_slice(&bytes);
+                    arr
+                };
 
                 encode_calldata(
                     "verifySP1(bytes32,bytes,bytes,bytes32)",
@@ -215,6 +232,25 @@ impl ProofAggregator {
                     AggregatedProofSubmissionError::Risc0EncodingSeal(e.to_string())
                 })?;
 
+                let risc0_image_id: [u8; 32] = {
+                    let hex_str = self
+                        .config
+                        .risc0_chunk_aggregator_image_id
+                        .strip_prefix("0x")
+                        .unwrap_or(&self.config.risc0_chunk_aggregator_image_id);
+                    let bytes = hex::decode(hex_str).map_err(|e| {
+                        AggregatedProofSubmissionError::BuildingVKHash(e.to_string())
+                    })?;
+                    if bytes.len() != 32 {
+                        return Err(AggregatedProofSubmissionError::BuildingVKHash(
+                            "risc0 image id not 32 bytes".into(),
+                        ));
+                    }
+                    let mut arr = [0u8; 32];
+                    arr.copy_from_slice(&bytes);
+                    arr
+                };
+
                 encode_calldata(
                     "verifyRisc0(bytes32,bytes,bytes,bytes32)",
                     &[
@@ -226,7 +262,7 @@ impl ProofAggregator {
                             proof.receipt.journal.bytes.into(),
                         ),
                         ethrex_l2_common::calldata::Value::FixedBytes(
-                            proof.image_id.to_vec().into(),
+                            risc0_image_id.to_vec().into(),
                         ),
                     ],
                 )

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

@@ -13,6 +13,11 @@ proofs_per_chunk: 512 # Amount of proofs to process per chunk
 # We can aggregate as much proofs as 126.976 / 32 = 3968 per blob
 total_proofs_limit: 3968
 
+# These program ids are the ones from the chunk aggregator programs
+# Can be found in the Proof Aggregation Service deployment config
+sp1_chunk_aggregator_vk_hash: "0x00a18429d092a8e1f58aea6ff650ad715ad4e6d7056600bb201d38460244507b"
+risc0_chunk_aggregator_image_id: "0x4cc11a4ac146ce4fc71493d694a9707194316cbb609603a195ffbe0c4c099c97"
+
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"
   private_key_store_password: ""

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

@@ -13,6 +13,11 @@ proofs_per_chunk: 512 # Amount of proofs to process per chunk
 # We can aggregate as much proofs as 126.976 / 32 = 3968 per blob
 total_proofs_limit: 3968
 
+# These program ids are the ones from the chunk aggregator programs
+# Can be found in the Proof Aggregation Service deployment config
+sp1_chunk_aggregator_vk_hash: "0x00a18429d092a8e1f58aea6ff650ad715ad4e6d7056600bb201d38460244507b"
+risc0_chunk_aggregator_image_id: "0x4cc11a4ac146ce4fc71493d694a9707194316cbb609603a195ffbe0c4c099c97"
+
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator-mock.yaml

@@ -13,6 +13,11 @@ proofs_per_chunk: 512 # Amount of proofs to process per chunk
 # We can aggregate as much proofs as 126.976 / 32 = 3968 per blob
 total_proofs_limit: 3968
 
+# These program ids are the ones from the chunk aggregator programs
+# Can be found in the Proof Aggregation Service deployment config
+sp1_chunk_aggregator_vk_hash: "0x00a18429d092a8e1f58aea6ff650ad715ad4e6d7056600bb201d38460244507b"
+risc0_chunk_aggregator_image_id: "0x4cc11a4ac146ce4fc71493d694a9707194316cbb609603a195ffbe0c4c099c97"
+
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator.yaml

@@ -13,6 +13,11 @@ proofs_per_chunk: 512 # Amount of proofs to process per chunk
 # We can aggregate as much proofs as 126.976 / 32 = 3968 per blob
 total_proofs_limit: 3968
 
+# These program ids are the ones from the chunk aggregator programs
+# Can be found in the Proof Aggregation Service deployment config
+sp1_chunk_aggregator_vk_hash: "0x00a18429d092a8e1f58aea6ff650ad715ad4e6d7056600bb201d38460244507b"
+risc0_chunk_aggregator_image_id: "0x4cc11a4ac146ce4fc71493d694a9707194316cbb609603a195ffbe0c4c099c97"
+
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"