fix(aggregation-mode): hardcode image_id and vk_hash from solidity contract (#1910)

Co-authored-by: Julian Arce <52429267+JuArce@users.noreply.github.com>

Author: MarcosNicolau

Makefile

@@ -171,13 +171,13 @@ reset_last_aggregated_block:
 	@echo '{"last_aggregated_block":0}' > config-files/proof-aggregator.last_aggregated_block.json
 
 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 -- config-files/config-proof-aggregator-mock.yaml
+	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: 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 -- config-files/config-proof-aggregator.yaml
+	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 -- config-files/config-proof-aggregator.yaml
+	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..."
@@ -204,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,gpu
+	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_:
 

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"
@@ -41,3 +40,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

@@ -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

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

aggregation_mode/programs_ids.json

@@ -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 {

aggregation_mode/src/aggregators/risc0_aggregator.rs

@@ -20,7 +20,6 @@ use config::Config;
 use fetcher::{ProofsFetcher, ProofsFetcherError};
 use merkle_tree::compute_proofs_merkle_root;
 use risc0_ethereum_contracts::encode_seal;
-use sp1_sdk::HashableKey;
 use std::str::FromStr;
 use tracing::{error, info, warn};
 use types::{AlignedProofAggregationService, AlignedProofAggregationServiceContract};
@@ -154,7 +153,6 @@ impl ProofAggregator {
                 self.proof_aggregation_service
                     .verifySP1(
                         blob_versioned_hash.into(),
-                        proof.vk().bytes32_raw().into(),
                         proof.proof_with_pub_values.public_values.to_vec().into(),
                         proof.proof_with_pub_values.bytes().into(),
                     )
@@ -170,7 +168,6 @@ impl ProofAggregator {
                     .verifyRisc0(
                         blob_versioned_hash.into(),
                         encoded_seal.into(),
-                        proof.image_id.into(),
                         proof.receipt.journal.bytes.into(),
                     )
                     .sidecar(blob)

aggregation_mode/src/backend/mod.rs

@@ -12,7 +12,11 @@ contract AlignedProofAggregationServiceDeployer is Script {
 
         address alignedAggregatorAddress = stdJson.readAddress(config_data, ".address.alignedAggregatorAddress");
         address sp1VerifierAddress = stdJson.readAddress(config_data, ".address.sp1VerifierAddress");
+        bytes32 sp1AggregationProgramVKHash =
+            stdJson.readBytes32(config_data, ".programs_id.sp1AggregationProgramVKHash");
         address risc0VerifierAddress = stdJson.readAddress(config_data, ".address.risc0VerifierAddress");
+        bytes32 risc0AggregationProgramImageId =
+            stdJson.readBytes32(config_data, ".programs_id.risc0AggregationProgramImageId");
 
         address ownerAddress = stdJson.readAddress(config_data, ".permissions.owner");
 
@@ -23,11 +27,13 @@ contract AlignedProofAggregationServiceDeployer is Script {
         ERC1967Proxy proxy = new ERC1967Proxy(
             address(alignedProofAggregationService),
             abi.encodeWithSignature(
-                "initialize(address,address,address,address)",
+                "initialize(address,address,address,address,bytes32,bytes32)",
                 ownerAddress,
                 alignedAggregatorAddress,
                 sp1VerifierAddress,
-                risc0VerifierAddress
+                risc0VerifierAddress,
+                risc0AggregationProgramImageId,
+                sp1AggregationProgramVKHash
             )
         );
 

contracts/script/deploy/AlignedProofAggregationServiceDeployer.s.sol

@@ -5,6 +5,10 @@
     "alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
     "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
   },
+  "programs_id": {
+    "sp1AggregationProgramVKHash": "0x00eb8139c8360fc371b9a6decdec55ba01aaae0f4739f68139e0b3d40397d1d6",
+    "risc0AggregationProgramImageId": "0xa2966b3e63b5e73848dd3fb8ff1e03ac68ca10fa961ca0c0d8dbbb0a85b60acd"
+  },
   "permissions": {
     "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
   }

contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.config.json

@@ -5,6 +5,10 @@
     "alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
     "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
   },
+  "programs_id": {
+    "sp1AggregationProgramVKHash": "0x00eb8139c8360fc371b9a6decdec55ba01aaae0f4739f68139e0b3d40397d1d6",
+    "risc0AggregationProgramImageId": "0xa2966b3e63b5e73848dd3fb8ff1e03ac68ca10fa961ca0c0d8dbbb0a85b60acd"
+  },
   "permissions": {
     "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
   }