chore: undo debug changes

Author: MarcosNicolau

aggregation_mode/Cargo.lock

@@ -24,12 +24,11 @@ sp1-sdk = "4.1.3"
 sp1_aggregation_program = { path = "./aggregation_programs/sp1/" }
 risc0-zkvm = { version = "2.0.1" }
 risc0_aggregation_program = { path = "./aggregation_programs/risc0/" }
-risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum/", tag = "v2.0.1" }
+risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum/", tag = "v2.0.0" }
 
 [build-dependencies]
 sp1-build = { version = "4.1.3" } 
-risc0-build = { version = "2.0.1", features = ["docker"] }
-risc0-build-ethereum = { git = "https://github.com/risc0/risc0-ethereum", tag = "v2.0.1" }
+risc0-build = { version = "2.0.0" }
 
 [package.metadata.risc0]
 # Tell risc0 build to find method in ./aggregation_programs/risc0 package
@@ -39,6 +38,7 @@ methods = ["./aggregation_programs/risc0"]
 opt-level = 3
 
 [features]
+default = []
 prove = []
-sp1 = []
 risc0 = []
+sp1 = []

aggregation_mode/Cargo.toml

@@ -1,7 +1,3 @@
-// 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 {
@@ -10,11 +6,5 @@ fn main() {
         }
     });
 
-    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();
+    risc0_build::embed_methods();
 }

aggregation_mode/abi/AlignedProofAggregationService.json

@@ -9,7 +9,7 @@ const RISC0_AGGREGATOR_PROGRAM_ID_BYTES: [u8; 32] = {
     let mut res = [0u8; 32];
     let mut i = 0;
     while i < 8 {
-        let bytes = RISC0_AGGREGATOR_PROGRAM_ID[i].to_be_bytes();
+        let bytes = RISC0_AGGREGATOR_PROGRAM_ID[i].to_le_bytes();
         res[i * 4] = bytes[0];
         res[i * 4 + 1] = bytes[1];
         res[i * 4 + 2] = bytes[2];

aggregation_mode/build.rs

@@ -25,7 +25,6 @@ use config::Config;
 use fetcher::{ProofsFetcher, ProofsFetcherError};
 use merkle_tree::compute_proofs_merkle_root;
 use risc0_ethereum_contracts::encode_seal;
-use risc0_zkvm::sha::Digestible;
 use sp1_sdk::HashableKey;
 use std::str::FromStr;
 use tracing::{error, info, warn};
@@ -192,14 +191,12 @@ impl ProofAggregator {
                 let encoded_seal = encode_seal(&proof.receipt).map_err(|e| {
                     AggregatedProofSubmissionError::Risc0EncodingSeal(e.to_string())
                 })?;
-                let journal_digest: [u8; 32] = proof.receipt.journal.digest().into();
                 self.proof_aggregation_service
                     .verifyRisc0(
                         blob_versioned_hash.into(),
                         encoded_seal.into(),
                         proof.image_id.into(),
                         proof.receipt.journal.bytes.into(),
-                        journal_digest.into(),
                     )
                     .sidecar(blob)
                     .send()

aggregation_mode/src/aggregators/risc0_aggregator.rs

@@ -1,11 +1,11 @@
 {
-    "address": {
-        "sp1VerifierAddress": "0xB146FbFdFeC2a5182b3Cef9becE03290224256D5",
-        "risc0VerifierAddress": "0x663F3ad617193148711d28f5334eE4Ed07016602",
-        "alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-        "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
-    },
-    "permissions": {
-        "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
-    }
+  "address": {
+    "sp1VerifierAddress": "0xB146FbFdFeC2a5182b3Cef9becE03290224256D5",
+    "risc0VerifierAddress": "0x663F3ad617193148711d28f5334eE4Ed07016602",
+    "alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
+    "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
+  },
+  "permissions": {
+    "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
+  }
 }

aggregation_mode/src/backend/mod.rs

@@ -13,7 +13,6 @@ cd ../../
 
 sleep 1
 
-export CHAINS='DEVNET'
 export RPC_DEVNET='http://localhost:8545'
 
 # Anvil account #2