Merge branch 'staging' into feat/aggregation-mode-rename-endpoints

Author: maximopalopoli

.github/workflows/build-and-test-go.yml

@@ -13,7 +13,7 @@ on:
       - "common/**"
       - "core/**"
       - "metrics/**"
-      - ".github/workflows/build-go.yml"
+      - ".github/workflows/build-and-test-go.yml"
 env:
   FFI_FOR_RELEASE: false
 jobs:
@@ -34,18 +34,33 @@ jobs:
       - name: Build SP1 bindings
         run: make build_sp1_linux
 
+      - name: Clean SP1 build artifacts
+        run: rm -rf operator/sp1/lib/target
+
       - name: Build Risc Zero go bindings
         run: make build_risc_zero_linux
 
+      - name: Clean Risc Zero build artifacts
+        run: rm -rf operator/risc_zero/lib/target
+
       - name: Build Merkle Tree bindings
         run: make build_merkle_tree_linux
-        
+
+      - name: Clean Merkle Tree build artifacts
+        run: rm -rf operator/merkle_tree/lib/target
+
       - name: Build Mina bindings
         run: make build_mina_linux
-      
+
+      - name: Clean Mina build artifacts
+        run: rm -rf operator/mina/lib/target
+
       - name: Build Mina Account bindings
         run: make build_mina_account_linux
-      
+
+      - name: Clean Mina Account build artifacts
+        run: rm -rf operator/mina_account/lib/target
+
       - name: Build operator
         run: go build operator/cmd/main.go
 

aggregation_mode/batcher/abi/AggregationModePaymentService.json

@@ -74,9 +74,11 @@ make proof_aggregator_write_program_ids
 
 We are using docker to produce deterministic builds so that the program ids are the same for all systems.
 
-### Updating the program id in `AlignedProofAggregationService` contract
+### Updating the verifier program commitment in `AlignedProofAggregationService` contract
 
-If the program ids have changed, you will also need to update them in the `AlignedProofAggregationService` contract.
+If the verifier program commitments have changed, you will also need to add the updated one to the `AlignedProofAggregationService` contract. You can do this by calling the `allowVerifyingProgram` method with the new commitment and the proving system ID as parameters (you can check the last parameter in the ProvingSystemId definition at `contracts/src/core/IAlignedProofAggregationService.sol`).
 
--   Risc0: call `setRisc0AggregatorProgramImageId` method with the value of `risc0_root_aggregator_image_id` from `aggregation_mode/program_ids.json`.
--   SP1: call: `setSP1AggregatorProgramVKHash` method with the value of `sp1_root_aggregator_vk_hash` from `aggregation_mode/program_ids.json`.
+You can fetch the verifier program commitment values from the following:
+
+- Risc0: Use the value of `risc0_chunk_aggregator_image_id` from `aggregation_mode/program_ids.json`.
+- SP1: Use the value of `sp1_chunk_aggregator_vk_hash` from `aggregation_mode/program_ids.json`.

aggregation_mode/proof_aggregator/README.md

@@ -23,6 +23,8 @@ pub struct Config {
     pub ecdsa: ECDSAConfig,
     pub proofs_per_chunk: u16,
     pub total_proofs_limit: u16,
+    pub sp1_chunk_aggregator_vk_hash: String,
+    pub risc0_chunk_aggregator_image_id: String,
 }
 
 impl Config {

aggregation_mode/proof_aggregator/abi/AlignedProofAggregationService.json

@@ -44,6 +44,8 @@ pub struct ProofAggregator {
     proof_aggregation_service: AlignedProofAggregationServiceContract,
     fetcher: ProofsFetcher,
     config: Config,
+    sp1_chunk_aggregator_vk_hash_bytes: [u8; 32],
+    risc0_chunk_aggregator_image_id_bytes: [u8; 32],
 }
 
 impl ProofAggregator {
@@ -66,11 +68,25 @@ impl ProofAggregator {
             ZKVMEngine::from_env().expect("AGGREGATOR env variable to be set to one of sp1|risc0");
         let fetcher = ProofsFetcher::new(&config);
 
+        let sp1_chunk_aggregator_vk_hash_bytes: [u8; 32] =
+            hex::decode(&config.sp1_chunk_aggregator_vk_hash)
+                .expect("Failed to decode SP1 chunk aggregator VK hash")
+                .try_into()
+                .expect("SP1 chunk aggregator VK hash must be 32 bytes");
+
+        let risc0_chunk_aggregator_image_id_bytes: [u8; 32] =
+            hex::decode(&config.risc0_chunk_aggregator_image_id)
+                .expect("Failed to decode Risc0 chunk aggregator image id")
+                .try_into()
+                .expect("Risc0 chunk aggregator image id must be 32 bytes");
+
         Self {
             engine,
             proof_aggregation_service,
             fetcher,
             config,
+            sp1_chunk_aggregator_vk_hash_bytes,
+            risc0_chunk_aggregator_image_id_bytes,
         }
     }
 
@@ -157,10 +173,11 @@ impl ProofAggregator {
         let tx_req = match aggregated_proof {
             AlignedProof::SP1(proof) => self
                 .proof_aggregation_service
-                .verifySP1(
+                .verifyAggregationSP1(
                     blob_versioned_hash.into(),
                     proof.proof_with_pub_values.public_values.to_vec().into(),
                     proof.proof_with_pub_values.bytes().into(),
+                    self.sp1_chunk_aggregator_vk_hash_bytes.into(),
                 )
                 .sidecar(blob)
                 .into_transaction_request(),
@@ -169,10 +186,11 @@ impl ProofAggregator {
                     AggregatedProofSubmissionError::Risc0EncodingSeal(e.to_string())
                 })?;
                 self.proof_aggregation_service
-                    .verifyRisc0(
+                    .verifyAggregationRisc0(
                         blob_versioned_hash.into(),
                         encoded_seal.into(),
                         proof.receipt.journal.bytes.into(),
+                        self.risc0_chunk_aggregator_image_id_bytes.into(),
                     )
                     .sidecar(blob)
                     .into_transaction_request()

aggregation_mode/proof_aggregator/src/backend/config.rs

@@ -13,6 +13,12 @@ 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
+# (remember to trim the 0x prefix)
+sp1_chunk_aggregator_vk_hash: "00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509"
+risc0_chunk_aggregator_image_id: "d8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf"
+
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"
   private_key_store_password: ""

aggregation_mode/proof_aggregator/src/backend/mod.rs

@@ -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
+# (remember to trim the 0x prefix)
+sp1_chunk_aggregator_vk_hash: "00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509"
+risc0_chunk_aggregator_image_id: "d8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf"
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

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
+# (remember to trim the 0x prefix)
+sp1_chunk_aggregator_vk_hash: "00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509"
+risc0_chunk_aggregator_image_id: "d8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf"
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

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
+# (remember to trim the 0x prefix)
+sp1_chunk_aggregator_vk_hash: "00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509"
+risc0_chunk_aggregator_image_id: "d8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf"
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"