fix: u8 for u16 in proving system id

Author: MarcosNicolau

aggregation_mode/abi/AlignedProofAggregationService.json

@@ -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([AggregationModeProvingSystem::RISC0.id()]);
+        hasher.update(AggregationModeProvingSystem::RISC0.id_bytes());
         hasher.update(self.image_id);
         hasher.update(self.public_inputs());
         hasher.finalize().into()

aggregation_mode/src/aggregators/risc0_aggregator.rs

@@ -64,7 +64,7 @@ impl SP1ProofWithPubValuesAndElf {
 
     pub fn hash_vk_and_pub_inputs(&self) -> [u8; 32] {
         let mut hasher = Keccak256::new();
-        hasher.update([AggregationModeProvingSystem::SP1.id()]);
+        hasher.update(AggregationModeProvingSystem::SP1.id_bytes());
         let vk_bytes = &self.vk.hash_bytes();
         hasher.update(vk_bytes);
         hasher.update(self.proof_with_pub_values.public_values.as_slice());

aggregation_mode/src/aggregators/sp1_aggregator.rs

@@ -111,14 +111,14 @@ contract AlignedProofAggregationService is
     /// - The function returns `true` if this Merkle root is known to correspond to a valid aggregated proof.
     ///
     /// @param merklePath The Merkle proof (sibling hashes) needed to reconstruct the Merkle root.
-    /// @param provingSystemId The id of the proving system (0 for SP1, 1 for RISC0).
+    /// @param provingSystemId The id of the proving system (1 for SP1, 2 for RISC0).
     /// @param programId The identifier for the ZK program (image_id in RISC0 or vk hash in SP1).
     /// @param publicInputs The public inputs bytes of the proof.
     ///
     /// @return bool Returns true if the computed Merkle root is a recognized valid aggregated proof.
     function verifyProofInclusion(
         bytes32[] calldata merklePath,
-        uint8 provingSystemId,
+        uint16 provingSystemId,
         bytes32 programId,
         bytes calldata publicInputs
     ) public view returns (bool) {

contracts/src/core/AlignedProofAggregationService.sol

@@ -30,7 +30,7 @@ interface IAlignedProofAggregationService {
 
     function verifyProofInclusion(
         bytes32[] calldata merklePath,
-        uint8 provingSystemId,
+        uint16 provingSystemId,
         bytes32 programId,
         bytes calldata publicInputs
     ) external view returns (bool);

contracts/src/core/IAlignedProofAggregationService.sol

@@ -3,20 +3,24 @@ use sha3::{Digest, Keccak256};
 
 use crate::beacon::BeaconClientError;
 
-#[repr(u8)]
+#[repr(u16)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum AggregationModeProvingSystem {
-    SP1 = 0,
-    RISC0 = 1,
+    SP1 = 1,
+    RISC0 = 2,
 }
 
 impl AggregationModeProvingSystem {
-    pub const fn as_u8(self) -> u8 {
-        self as u8
+    pub const fn as_u16(self) -> u16 {
+        self as u16
     }
 
-    pub const fn id(self) -> u8 {
-        self.as_u8()
+    pub const fn id(self) -> u16 {
+        self.as_u16()
+    }
+
+    pub const fn id_bytes(self) -> [u8; 2] {
+        self.as_u16().to_be_bytes()
     }
 }
 
@@ -59,18 +63,25 @@ impl AggregationModeVerificationData {
         }
     }
 
-    pub fn proving_system_id(&self) -> u8 {
+    pub fn proving_system_id(&self) -> u16 {
         match self {
             Self::SP1 { .. } => AggregationModeProvingSystem::SP1.id(),
             Self::Risc0 { .. } => AggregationModeProvingSystem::RISC0.id(),
         }
     }
 
+    pub fn proving_system_id_bytes(&self) -> [u8; 2] {
+        match self {
+            Self::SP1 { .. } => AggregationModeProvingSystem::SP1.id_bytes(),
+            Self::Risc0 { .. } => AggregationModeProvingSystem::RISC0.id_bytes(),
+        }
+    }
+
     pub fn commitment(&self) -> [u8; 32] {
         match self {
             AggregationModeVerificationData::SP1 { vk, public_inputs } => {
                 let mut hasher = Keccak256::new();
-                hasher.update([self.proving_system_id()]);
+                hasher.update(self.proving_system_id_bytes());
                 hasher.update(vk);
                 hasher.update(public_inputs);
                 hasher.finalize().into()
@@ -80,7 +91,7 @@ impl AggregationModeVerificationData {
                 public_inputs,
             } => {
                 let mut hasher = Keccak256::new();
-                hasher.update([self.proving_system_id()]);
+                hasher.update(self.proving_system_id_bytes());
                 hasher.update(image_id);
                 hasher.update(public_inputs);
                 hasher.finalize().into()

crates/sdk/abi/AlignedProofAggregationService.json

@@ -22,12 +22,12 @@ contract StateTransition {
         stateRoot = initialStateRoot;
     }
 
-    function updateState(uint8 provingSystemId, bytes calldata publicInputs, bytes32[] calldata merkleProof)
+    function updateState(uint16 provingSystemId, bytes calldata publicInputs, bytes32[] calldata merkleProof)
         public
         onlyOwner
     {
         bytes memory callData = abi.encodeWithSignature(
-            "verifyProofInclusion(bytes32[],uint8,bytes32,bytes)",
+            "verifyProofInclusion(bytes32[],uint16,bytes32,bytes)",
             merkleProof,
             provingSystemId,
             PROGRAM_ID,

crates/sdk/src/aggregation_layer/types.rs

@@ -38,7 +38,7 @@ pub async fn send_state_transition_to_chain(
 
     let res = state_transition_contract
         .updateState(
-            AggregationModeProvingSystem::SP1.id().into(),
+            AggregationModeProvingSystem::SP1.id(),
             public_inputs.into(),
             merkle_proof,
         )