refactor: proving system id replace constants for enum

Author: MarcosNicolau

aggregation_mode/src/aggregators/risc0_aggregator.rs

@@ -1,6 +1,6 @@
 include!(concat!(env!("OUT_DIR"), "/methods.rs"));
 
-use aligned_sdk::aggregation_layer::RISC0_PROVING_SYSTEM_ID;
+use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
 use risc0_zkvm::{default_prover, ExecutorEnv, ProverOpts, Receipt};
 use sha3::{Digest, Keccak256};
 
@@ -81,7 +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(&[AggregationModeProvingSystem::RISC0.id()]);
         hasher.update(self.image_id);
         hasher.update(self.public_inputs());
         hasher.finalize().into()

aggregation_mode/src/aggregators/sp1_aggregator.rs

@@ -1,6 +1,6 @@
 use std::sync::LazyLock;
 
-use aligned_sdk::aggregation_layer::SP1_PROVING_SYSTEM_ID;
+use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
 use alloy::primitives::Keccak256;
 use sp1_aggregation_program::SP1VkAndPubInputs;
 #[cfg(feature = "prove")]
@@ -64,7 +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]);
+        hasher.update(&[AggregationModeProvingSystem::SP1.id()]);
         let vk_bytes = &self.vk.hash_bytes();
         hasher.update(vk_bytes);
         hasher.update(self.proof_with_pub_values.public_values.as_slice());

crates/sdk/src/aggregation_layer/mod.rs

@@ -4,8 +4,7 @@ mod types;
 
 // Makes only the two types on this use public
 pub use types::{
-    AggregationModeVerificationData, ProofVerificationAggModeError, RISC0_PROVING_SYSTEM_ID,
-    SP1_PROVING_SYSTEM_ID,
+    AggregationModeProvingSystem, AggregationModeVerificationData, ProofVerificationAggModeError,
 };
 
 use crate::{

crates/sdk/src/aggregation_layer/types.rs

@@ -3,8 +3,34 @@ use sha3::{Digest, Keccak256};
 
 use crate::beacon::BeaconClientError;
 
-pub const SP1_PROVING_SYSTEM_ID: u8 = 0;
-pub const RISC0_PROVING_SYSTEM_ID: u8 = 1;
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum AggregationModeProvingSystem {
+    SP1 = 0,
+    RISC0 = 1,
+}
+
+impl AggregationModeProvingSystem {
+    pub const fn as_u8(self) -> u8 {
+        self as u8
+    }
+
+    pub const fn id(self) -> u8 {
+        self.as_u8()
+    }
+}
+
+impl TryFrom<u8> for AggregationModeProvingSystem {
+    type Error = ();
+
+    fn try_from(v: u8) -> Result<Self, Self::Error> {
+        match v {
+            0 => Ok(AggregationModeProvingSystem::SP1),
+            1 => Ok(AggregationModeProvingSystem::RISC0),
+            _ => Err(()),
+        }
+    }
+}
 
 #[derive(Debug)]
 pub enum AggregationModeVerificationData {
@@ -35,16 +61,16 @@ impl AggregationModeVerificationData {
 
     pub fn proving_system_id(&self) -> u8 {
         match self {
-            Self::SP1 { .. } => SP1_PROVING_SYSTEM_ID,
-            Self::Risc0 { .. } => RISC0_PROVING_SYSTEM_ID,
+            Self::SP1 { .. } => AggregationModeProvingSystem::SP1.id(),
+            Self::Risc0 { .. } => AggregationModeProvingSystem::RISC0.id(),
         }
     }
 
     pub fn commitment(&self) -> [u8; 32] {
         match self {
             AggregationModeVerificationData::SP1 { vk, public_inputs } => {
                 let mut hasher = Keccak256::new();
-                hasher.update(&[0u8]);
+                hasher.update(&[self.proving_system_id()]);
                 hasher.update(vk);
                 hasher.update(public_inputs);
                 hasher.finalize().into()
@@ -54,7 +80,7 @@ impl AggregationModeVerificationData {
                 public_inputs,
             } => {
                 let mut hasher = Keccak256::new();
-                hasher.update(&[1u8]);
+                hasher.update(&[self.proving_system_id()]);
                 hasher.update(image_id);
                 hasher.update(public_inputs);
                 hasher.finalize().into()

examples/l2/crates/l2/src/eth.rs

@@ -1,5 +1,6 @@
 use std::str::FromStr;
 
+use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
 use alloy::{
     network::EthereumWallet, primitives::Address, providers::ProviderBuilder,
     rpc::types::TransactionReceipt, signers::local::LocalSigner, sol,
@@ -37,7 +38,7 @@ pub async fn send_state_transition_to_chain(
 
     let res = state_transition_contract
         .updateState(
-            SP1_PROVING_SYSTEM_ID.into(),
+            AggregationModeProvingSystem::SP1.id().into(),
             public_inputs.into(),
             merkle_proof,
         )