feat: add proving system to vk or program code commitment (#939)

Co-authored-by: MauroFab <maurotoscano2@gmail.com>

Author: entropidelic

Makefile

@@ -296,6 +296,7 @@ batcher_send_plonk_bn254_burst: batcher/target/release/aligned
 		--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 		--rpc_url $(RPC_URL) \
+		--repetitions 4 \
 		--payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
 
 batcher_send_plonk_bls12_381_task: batcher/target/release/aligned

batcher/aligned-sdk/src/core/types.rs

@@ -91,32 +91,40 @@ impl From<VerificationData> for VerificationDataCommitment {
     fn from(verification_data: VerificationData) -> Self {
         let mut hasher = Keccak256::new();
 
-        // compute proof commitment
+        // Compute proof commitment
+
         hasher.update(verification_data.proof.as_slice());
         let proof_commitment = hasher.finalize_reset().into();
 
-        // compute public input commitment
+        // Compute public input commitment
+
         let mut pub_input_commitment = [0u8; 32];
         if let Some(pub_input) = &verification_data.pub_input {
             hasher.update(pub_input);
             pub_input_commitment = hasher.finalize_reset().into();
         }
 
-        // compute proving system auxiliary data commitment
-        let mut proving_system_aux_data_commitment = [0u8; 32];
+        // Compute proving system auxiliary data commitment
+
         // FIXME(marian): This should probably be reworked, for the moment when the proving
-        // system is SP1, `proving_system_aux_data` stands for the compiled ELF, while in the case
-        // of Groth16 and PLONK, stands for the verification key.
-
-        if let Some(vm_program_code) = &verification_data.vm_program_code {
-            hasher.update(vm_program_code);
-            proving_system_aux_data_commitment = hasher.finalize_reset().into();
-        } else if let Some(verification_key) = &verification_data.verification_key {
-            hasher.update(verification_key);
-            proving_system_aux_data_commitment = hasher.finalize_reset().into();
-        }
+        // system is SP1 or Risc0, `proving_system_aux_data` stands for information related to the
+        // compiled ELF, while in the rest of the proving systems, stands for the verification key.
+        let proving_system_byte = verification_data.proving_system as u8;
+        let proving_system_aux_data_commitment =
+            if let Some(vm_program_code) = &verification_data.vm_program_code {
+                hasher.update(vm_program_code);
+                hasher.update([proving_system_byte]);
+                hasher.finalize_reset().into()
+            } else if let Some(verification_key) = &verification_data.verification_key {
+                hasher.update(verification_key);
+                hasher.update([proving_system_byte]);
+                hasher.finalize_reset().into()
+            } else {
+                [0u8; 32]
+            };
+
+        // Serialize proof generator address to bytes
 
-        // serialize proof generator address to bytes
         let proof_generator_addr = verification_data.proof_generator_addr.into();
 
         VerificationDataCommitment {

batcher/aligned-sdk/src/sdk.rs

@@ -6,7 +6,10 @@ use crate::{
     },
     core::{
         errors,
-        types::{AlignedVerificationData, Chain, VerificationData, VerificationDataCommitment},
+        types::{
+            AlignedVerificationData, Chain, ProvingSystemId, VerificationData,
+            VerificationDataCommitment,
+        },
     },
     eth::{
         aligned_service_manager::aligned_service_manager,
@@ -415,16 +418,22 @@ async fn _is_proof_verified(
     Ok(result)
 }
 
-/// Returns the commitment for a given input. Input can be verification key, public input, etc.
+/// Returns the commitment for the verification key, taking into account the corresponding proving system.
 /// # Arguments
-/// * `content` - The content for which the commitment will be calculated.
+/// * `verification_key_bytes` - The serialized contents of the verification key.
+/// * `proving_system` - The corresponding proving system ID.
 /// # Returns
 /// * The commitment.
 /// # Errors
 /// * None.
-pub fn get_commitment(content: &[u8]) -> [u8; 32] {
+pub fn get_vk_commitment(
+    verification_key_bytes: &[u8],
+    proving_system: ProvingSystemId,
+) -> [u8; 32] {
+    let proving_system_id_byte = proving_system.clone() as u8;
     let mut hasher = Keccak256::new();
-    hasher.update(content);
+    hasher.update(verification_key_bytes);
+    hasher.update([proving_system_id_byte]);
     hasher.finalize().into()
 }
 

batcher/aligned/src/main.rs

@@ -14,7 +14,7 @@ use aligned_sdk::core::{
 };
 use aligned_sdk::sdk::get_chain_id;
 use aligned_sdk::sdk::get_next_nonce;
-use aligned_sdk::sdk::{get_commitment, is_proof_verified, submit_multiple};
+use aligned_sdk::sdk::{get_vk_commitment, is_proof_verified, submit_multiple};
 use clap::Parser;
 use clap::Subcommand;
 use clap::ValueEnum;
@@ -28,8 +28,8 @@ use log::{error, info};
 use transaction::eip2718::TypedTransaction;
 
 use crate::AlignedCommands::DepositToBatcher;
-use crate::AlignedCommands::GetCommitment;
 use crate::AlignedCommands::GetUserBalance;
+use crate::AlignedCommands::GetVkCommitment;
 use crate::AlignedCommands::Submit;
 use crate::AlignedCommands::VerifyProofOnchain;
 
@@ -47,10 +47,8 @@ pub enum AlignedCommands {
     Submit(SubmitArgs),
     #[clap(about = "Verify the proof was included in a verified batch on Ethereum")]
     VerifyProofOnchain(VerifyProofOnchainArgs),
-
-    // Get commitment for file, command name is get-commitment
-    #[clap(about = "Get commitment for file", name = "get-commitment")]
-    GetCommitment(GetCommitmentArgs),
+    #[clap(about = "Get commitment for file", name = "get-vk-commitment")]
+    GetVkCommitment(GetVkCommitmentArgs),
     #[clap(
         about = "Deposits Ethereum in the batcher to pay for proofs",
         name = "deposit-to-batcher"
@@ -187,9 +185,11 @@ pub struct VerifyProofOnchainArgs {
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
-pub struct GetCommitmentArgs {
-    #[arg(name = "File name", long = "input")]
-    input_file: PathBuf,
+pub struct GetVkCommitmentArgs {
+    #[arg(name = "Verification key file path", long = "verification_key_file")]
+    verification_key_file: PathBuf,
+    #[arg(name = "Proving system", long = "proving_system")]
+    proving_system: ProvingSystemArg,
     #[arg(name = "Output file", long = "output")]
     output_file: Option<PathBuf>,
 }
@@ -409,17 +409,18 @@ async fn main() -> Result<(), AlignedError> {
                 info!("Your proof was not included in the batch.");
             }
         }
-        GetCommitment(args) => {
-            let content = read_file(args.input_file)?;
+        GetVkCommitment(args) => {
+            let verification_key_bytes = read_file(args.verification_key_file)?;
+            let proving_system = args.proving_system.into();
 
-            let hash = get_commitment(&content);
+            let vk_commitment = get_vk_commitment(&verification_key_bytes, proving_system);
 
-            info!("Commitment: {}", hex::encode(hash));
+            info!("Commitment: {}", hex::encode(vk_commitment));
             if let Some(output_file) = args.output_file {
                 let mut file = File::create(output_file.clone())
                     .map_err(|e| SubmitError::IoError(output_file.clone(), e))?;
 
-                file.write_all(hex::encode(hash).as_bytes())
+                file.write_all(hex::encode(vk_commitment).as_bytes())
                     .map_err(|e| SubmitError::IoError(output_file.clone(), e))?;
             }
         }

docs/2_architecture/1_fast_mode.md

@@ -65,8 +65,8 @@ The root of the Merkle tree is posted to Ethereum together with a pointer to whe
 Each leaf contains the following information:
 
 - A commitment to the public input of the proof.
-- A commitment to the proof and information about the proof system.
-- A commitment to the program or a commitment to the verification key (depending on the proof system used).
+- A commitment to the proof
+- A commitment to the program or a commitment to the verification key, plus the Proving System/verifier used.
 - The address of the proof’s generator/submitter (optional).
 
 A diagram for the batch is shown on the figure below:

docs/3_guides/2_integrating_aligned_into_your_application.md

@@ -25,7 +25,7 @@ The Aligned CLI provides a way for you to get the verification key commitment wi
 You can do this by running the following command:
 
 ```bash
-aligned get-commitment --input <path_to_input_file>
+aligned get-vk-commitment --verification_key_file <path_to_input_file> --proving_system <proving_system_id>
 ```
 
 The following is an example of how to call the `verifyBatchInclusionMethod` from the `AlignedServiceManager` contract in your smart contract.