debug: using static image id

Author: MarcosNicolau

aggregation_mode/Cargo.lock

@@ -28,7 +28,8 @@ risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum/", t
 
 [build-dependencies]
 sp1-build = { version = "4.1.3" } 
-risc0-build = { version = "2.0.0" }
+risc0-build = { version = "2.0.1", features = ["docker"] }
+risc0-build-ethereum = { git = "https://github.com/risc0/risc0-ethereum", tag = "v2.0.1" }
 
 [package.metadata.risc0]
 # Tell risc0 build to find method in ./aggregation_programs/risc0 package

aggregation_mode/Cargo.toml

@@ -1,3 +1,7 @@
+// Paths where the generated Solidity files will be written.
+const SOLIDITY_IMAGE_ID_PATH: &str = "../contracts/src/ImageID.sol";
+const SOLIDITY_ELF_PATH: &str = "../contracts/src/Elf.sol";
+
 fn main() {
     sp1_build::build_program_with_args("./aggregation_programs/sp1", {
         sp1_build::BuildArgs {
@@ -6,5 +10,11 @@ fn main() {
         }
     });
 
-    risc0_build::embed_methods();
+    let guests = risc0_build::embed_methods();
+
+    let solidity_opts = risc0_build_ethereum::Options::default()
+        .with_image_id_sol_path(SOLIDITY_IMAGE_ID_PATH)
+        .with_elf_sol_path(SOLIDITY_ELF_PATH);
+
+    risc0_build_ethereum::generate_solidity_files(guests.as_slice(), &solidity_opts).unwrap();
 }

aggregation_mode/build.rs

@@ -0,0 +1,24 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+// This file is automatically generated
+
+pragma solidity ^0.8.20;
+
+library Elf {
+    string public constant RISC0_AGGREGATOR_PROGRAM_PATH =
+        "/Users/marcos/code/aligned_layer/aggregation_mode/target/riscv-guest/proof_aggregator/risc0_aggregation_program/riscv32im-risc0-zkvm-elf/release/risc0_aggregator_program.bin";
+}

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

@@ -0,0 +1,24 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+// This file is automatically generated
+
+pragma solidity ^0.8.20;
+
+library ImageID {
+    bytes32 public constant RISC0_AGGREGATOR_PROGRAM_ID =
+        bytes32(0x14c9111202a268f839eaa1b0e81975f015f034caecad116adc2f11ab8a7cf29d);
+}

contracts/scripts/anvil/state/eigenlayer-deployed-anvil-state.json

@@ -7,6 +7,7 @@ import {UUPSUpgradeable} from "@openzeppelin-upgrades/contracts/proxy/utils/UUPS
 import {IAlignedProofAggregationService} from "./IAlignedProofAggregationService.sol";
 import {ISP1Verifier} from "@sp1-contracts/ISP1Verifier.sol";
 import {IRiscZeroVerifier} from "@risc0-contracts/IRiscZeroVerifier.sol";
+import {ImageID} from "../ImageID.sol";
 
 contract AlignedProofAggregationService is
     IAlignedProofAggregationService,
@@ -82,11 +83,10 @@ contract AlignedProofAggregationService is
 
         // In dev mode, poofs are mocked, so we skip the verification part
         if (_isRisc0VerificationEnabled()) {
-            bytes32 myDigest = sha256(risc0JournalBytes);
-            if (myDigest != risc0JournalDigest) {
-                revert("Digest did not matc");
-            }
-            IRiscZeroVerifier(risc0VerifierAddress).verify(risc0ReceiptSeal, risc0ImageId, risc0JournalDigest);
+            // bytes32 myDigest = sha256(risc0JournalBytes);
+            IRiscZeroVerifier(risc0VerifierAddress).verify(
+                risc0ReceiptSeal, ImageID.RISC0_AGGREGATOR_PROGRAM_ID, risc0JournalDigest
+            );
         }
 
         aggregatedProofs[merkleRoot] = true;