feat(aggregation-mode): proving system id for proof commitments

Makefile

@@ -1444,7 +1444,7 @@ ansible_telemetry_deploy: ## Deploy the Telemetry. Parameters: INVENTORY
 __ETHEREUM_PACKAGE__: ## ____
 
 ethereum_package_start: ## Starts the ethereum_package environment
-	kurtosis run --enclave aligned github.com/ethpandaops/ethereum-package@5.0.1 --args-file network_params.yaml
+	kurtosis run --enclave aligned github.com/ethpandaops/ethereum-package --args-file network_params.yaml
 
 ethereum_package_inspect: ## Prints detailed information about the net
 	kurtosis enclave inspect aligned

aggregation_mode/aggregation_programs/risc0/src/chunk_aggregator_main.rs

@@ -8,8 +8,8 @@ risc0_zkvm::guest::entry!(main);
 
 // Generated with `make proof_aggregator_write_program_ids` and copied from program_ids.json
 pub const USER_PROOFS_AGGREGATOR_PROGRAM_IMAGE_ID: [u8; 32] = [
-246, 152, 137, 29, 200, 71, 68, 14, 148, 211, 69, 210, 38, 88, 167, 181, 85, 190, 249, 99, 59,
-170, 43, 133, 188, 222, 95, 79, 87, 222, 76, 175,
+213, 222, 129, 66, 92, 168, 117, 175, 141, 69, 249, 171, 248, 137, 130, 165, 149, 72, 165, 91,
+229, 255, 250, 13, 76, 25, 181, 189, 202, 45, 149, 122,
 ];
 
 fn main() {

aggregation_mode/aggregation_programs/risc0/src/lib.rs

@@ -2,6 +2,8 @@ use lambdaworks_crypto::merkle_tree::traits::IsMerkleTreeBackend;
 use serde::{Deserialize, Serialize};
 use tiny_keccak::{Hasher, Keccak};
 
+const RISC0_PROVING_SYSTEM_ID: u8 = 1;
+
 #[derive(Serialize, Deserialize)]
 pub struct Risc0ImageIdAndPubInputs {
  pub image_id: [u8; 32],
@@ -11,6 +13,7 @@ pub struct Risc0ImageIdAndPubInputs {
 impl Risc0ImageIdAndPubInputs {
  pub fn commitment(&self) -> [u8; 32] {
  let mut hasher = Keccak::v256();
+ hasher.update(&[RISC0_PROVING_SYSTEM_ID]);
  for &word in &self.image_id {
  hasher.update(&word.to_be_bytes());
  }

aggregation_mode/aggregation_programs/sp1/src/chunk_aggregator_main.rs

@@ -7,7 +7,7 @@ use sp1_aggregation_program::{ChunkAggregatorInput, Hash32};
 
 // Generated with `make proof_aggregator_write_program_ids` and copied from program_ids.json
 pub const USER_PROOFS_AGGREGATOR_PROGRAM_VK_HASH: [u32; 8] = [
-1568672557, 1699162914, 9186125, 1196115399, 1766446440, 1385693297, 1976910968, 278007428,
+1604331145, 1194976706, 1126366403, 163615647, 1719592475, 1205418691, 1853877927, 874366977,
 ];
 
 pub fn main() {

aggregation_mode/aggregation_programs/sp1/src/lib.rs

@@ -2,6 +2,8 @@ use lambdaworks_crypto::merkle_tree::traits::IsMerkleTreeBackend;
 use serde::{Deserialize, Serialize};
 use sha3::{Digest, Keccak256};
 
+const SP1_PROVING_SYSTEM_ID: u8 = 0;
+
 #[derive(Serialize, Deserialize)]
 pub struct SP1VkAndPubInputs {
  pub vk: [u32; 8],
@@ -11,6 +13,7 @@ pub struct SP1VkAndPubInputs {
 impl SP1VkAndPubInputs {
  pub fn commitment(&self) -> [u8; 32] {
  let mut hasher = Keccak256::new();
+ hasher.update(&[SP1_PROVING_SYSTEM_ID]);
  for &word in &self.vk {
  hasher.update(word.to_be_bytes());
  }

aggregation_mode/programs_ids.json

@@ -1,8 +1,8 @@
 {
- "risc0_chunk_aggregator_image_id": "0x4cc11a4ac146ce4fc71493d694a9707194316cbb609603a195ffbe0c4c099c97",
- "risc0_user_proofs_aggregator_image_id": "0xf698891dc847440e94d345d22658a7b555bef9633baa2b85bcde5f4f57de4caf",
- "risc0_user_proofs_aggregator_image_id_bytes": "[246, 152, 137, 29, 200, 71, 68, 14, 148, 211, 69, 210, 38, 88, 167, 181, 85, 190, 249, 99, 59, 170, 43, 133, 188, 222, 95, 79, 87, 222, 76, 175]",
- "sp1_chunk_aggregator_vk_hash": "0x00a18429d092a8e1f58aea6ff650ad715ad4e6d7056600bb201d38460244507b",
- "sp1_user_proofs_aggregator_vk_hash": "0x00bb00165b951cac8804615a6c74b45c7d293aad14a6001c7aeaa23c10920e84",
- "sp1_user_proofs_aggregator_vk_hash_words": "[1568672557, 1699162914, 9186125, 1196115399, 1766446440, 1385693297, 1976910968, 278007428]"
+ "risc0_chunk_aggregator_image_id": "0xefab5ffddb0cd08d9f8345821658c1d4581dac70de408778e0ea11c75774fcce",
+ "risc0_user_proofs_aggregator_image_id": "0xd5de81425ca875af8d45f9abf88982a59548a55be5fffa0d4c19b5bdca2d957a",
+ "risc0_user_proofs_aggregator_image_id_bytes": "[213, 222, 129, 66, 92, 168, 117, 175, 141, 69, 249, 171, 248, 137, 130, 165, 149, 72, 165, 91, 229, 255, 250, 13, 76, 25, 181, 189, 202, 45, 149, 122]",
+ "sp1_chunk_aggregator_vk_hash": "0x0059be80b30c42b742ede3a19c61188de126258103c579d5a3b75c85e7b1ee83",
+ "sp1_user_proofs_aggregator_vk_hash": "0x00bf404d131ce7970a1917e6189c0939fccfdcc371f64eb0f73ff753b41dc801",
+ "sp1_user_proofs_aggregator_vk_hash_words": "[1604331145, 1194976706, 1126366403, 163615647, 1719592475, 1205418691, 1853877927, 874366977]"
 }

aggregation_mode/src/aggregators/risc0_aggregator.rs

@@ -1,5 +1,6 @@
 include!(concat!(env!("OUT_DIR"), "/methods.rs"));
 
+use aligned_sdk::aggregation_layer::RISC0_PROVING_SYSTEM_ID;
 use risc0_zkvm::{default_prover, ExecutorEnv, ProverOpts, Receipt};
 use sha3::{Digest, Keccak256};
 
@@ -80,6 +81,7 @@ pub const RISC0_CHUNK_AGGREGATOR_PROGRAM_ID_BYTES: [u8; 32] = {
 impl Risc0ProofReceiptAndImageId {
  pub fn hash_image_id_and_public_inputs(&self) -> [u8; 32] {
  let mut hasher = Keccak256::new();
+ hasher.update(&[RISC0_PROVING_SYSTEM_ID]);
  hasher.update(self.image_id);
  hasher.update(self.public_inputs());
  hasher.finalize().into()

aggregation_mode/src/aggregators/sp1_aggregator.rs

@@ -1,5 +1,6 @@
 use std::sync::LazyLock;
 
+use aligned_sdk::aggregation_layer::SP1_PROVING_SYSTEM_ID;
 use alloy::primitives::Keccak256;
 use sp1_aggregation_program::SP1VkAndPubInputs;
 #[cfg(feature = "prove")]
@@ -63,6 +64,7 @@ impl SP1ProofWithPubValuesAndElf {
 
  pub fn hash_vk_and_pub_inputs(&self) -> [u8; 32] {
  let mut hasher = Keccak256::new();
+ hasher.update(&[SP1_PROVING_SYSTEM_ID]);
  let vk_bytes = &self.vk.hash_bytes();
  hasher.update(vk_bytes);
  hasher.update(self.proof_with_pub_values.public_values.as_slice());

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

@@ -4,9 +4,9 @@ environment: "production"
 aligned_layer_deployment_config_file_path: "./contracts/script/output/devnet/alignedlayer_deployment_output.json"
 eigen_layer_deployment_config_file_path: "./contracts/script/output/devnet/eigenlayer_deployment_output.json"
 eth_rpc_url: "http://localhost:8545"
-eth_rpc_url_fallback: "http://localhost:8551"
+eth_rpc_url_fallback: "http://localhost:8552"
 eth_ws_url: "ws://localhost:8546"
-eth_ws_url_fallback: "ws://localhost:8552"
+eth_ws_url_fallback: "ws://localhost:8553"
 eigen_metrics_ip_port_address: "localhost:9090"
 
 ## ECDSA Configurations

config-files/config-batcher-ethereum-package.yaml

@@ -4,9 +4,9 @@ environment: "production"
 aligned_layer_deployment_config_file_path: "./contracts/script/output/devnet/alignedlayer_deployment_output.json"
 eigen_layer_deployment_config_file_path: "./contracts/script/output/devnet/eigenlayer_deployment_output.json"
 eth_rpc_url: "http://localhost:8545"
-eth_rpc_url_fallback: "http://localhost:8551"
+eth_rpc_url_fallback: "http://localhost:8552"
 eth_ws_url: "ws://localhost:8546"
-eth_ws_url_fallback: "ws://localhost:8552"
+eth_ws_url_fallback: "ws://localhost:8553"
 eigen_metrics_ip_port_address: "localhost:9090"
 
 ## ECDSA Configurations

config-files/config-operator-1-ethereum-package.yaml

@@ -4,9 +4,9 @@ environment: 'development'
 aligned_layer_deployment_config_file_path: './contracts/script/output/devnet/alignedlayer_deployment_output.json'
 eigen_layer_deployment_config_file_path: './contracts/script/output/devnet/eigenlayer_deployment_output.json'
 eth_rpc_url: "http://localhost:8545"
-eth_rpc_url_fallback: "http://localhost:8551"
+eth_rpc_url_fallback: "http://localhost:8552"
 eth_ws_url: "ws://localhost:8546"
-eth_ws_url_fallback: "ws://localhost:8552"
+eth_ws_url_fallback: "ws://localhost:8553"
 eigen_metrics_ip_port_address: 'localhost:9090'
 
 ## ECDSA Configurations

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

@@ -6,8 +6,8 @@
  "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
  },
  "programs_id": {
- "sp1AggregationProgramVKHash": "0x00a18429d092a8e1f58aea6ff650ad715ad4e6d7056600bb201d38460244507b",
- "risc0AggregationProgramImageId": "0x4cc11a4ac146ce4fc71493d694a9707194316cbb609603a195ffbe0c4c099c97"
+ "sp1AggregationProgramVKHash": "0x0059be80b30c42b742ede3a19c61188de126258103c579d5a3b75c85e7b1ee83",
+ "risc0AggregationProgramImageId": "0xefab5ffddb0cd08d9f8345821658c1d4581dac70de408778e0ea11c75774fcce"
  },
  "permissions": {
  "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"

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

@@ -6,8 +6,8 @@
  "alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
  },
  "programs_id": {
- "sp1AggregationProgramVKHash": "0x00a18429d092a8e1f58aea6ff650ad715ad4e6d7056600bb201d38460244507b",
- "risc0AggregationProgramImageId": "0x4cc11a4ac146ce4fc71493d694a9707194316cbb609603a195ffbe0c4c099c97"
+ "sp1AggregationProgramVKHash": "0x0059be80b30c42b742ede3a19c61188de126258103c579d5a3b75c85e7b1ee83",
+ "risc0AggregationProgramImageId": "0xefab5ffddb0cd08d9f8345821658c1d4581dac70de408778e0ea11c75774fcce"
  },
  "permissions": {
  "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"