fix: dont upload nonce to bucket (#699)

Co-authored-by: Urix <43704209+uri-99@users.noreply.github.com>

Author: taturosati

batcher/aligned-batcher/src/lib.rs

@@ -15,7 +15,8 @@ use std::sync::Arc;
 
 use aligned_sdk::core::types::{
     BatchInclusionData, ClientMessage, NoncedVerificationData, ResponseMessage,
-    ValidityResponseMessage, VerificationCommitmentBatch, VerificationDataCommitment,
+    ValidityResponseMessage, VerificationCommitmentBatch, VerificationData,
+    VerificationDataCommitment,
 };
 use aws_sdk_s3::client::Client as S3Client;
 use eth::BatcherPaymentService;
@@ -464,12 +465,17 @@ impl Batcher {
         block_number: u64,
         finalized_batch: BatchQueue,
     ) -> Result<(), BatcherError> {
-        let batch_verification_data: Vec<NoncedVerificationData> = finalized_batch
+        let nonced_batch_verifcation_data: Vec<NoncedVerificationData> = finalized_batch
             .clone()
             .into_iter()
             .map(|(data, _, _, _)| data)
             .collect();
 
+        let batch_verification_data: Vec<VerificationData> = nonced_batch_verifcation_data
+            .iter()
+            .map(|vd| vd.verification_data.clone())
+            .collect();
+
         let batch_bytes = serde_json::to_vec(batch_verification_data.as_slice())
             .expect("Failed to serialize batch");
 

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

@@ -58,8 +58,12 @@ pub struct VerificationDataCommitment {
 
 impl From<&NoncedVerificationData> for VerificationDataCommitment {
     fn from(nonced_verification_data: &NoncedVerificationData) -> Self {
-        let verification_data = nonced_verification_data.verification_data.clone();
+        nonced_verification_data.verification_data.clone().into()
+    }
+}
 
+impl From<VerificationData> for VerificationDataCommitment {
+    fn from(verification_data: VerificationData) -> Self {
         let mut hasher = Keccak256::new();
 
         // compute proof commitment

batcher/aligned-sdk/src/types.rs

@@ -129,7 +129,7 @@ defmodule Utils do
     batch_json
       |> Enum.map(
         fn s3_object ->
-          :crypto.hash(:sha3_256, s3_object["verification_data"]["proof"])
+          :crypto.hash(:sha3_256, s3_object["proof"])
         end)
   end
 

explorer/lib/explorer_web/live/utils.ex

@@ -1,5 +1,5 @@
 use aligned_sdk::core::types::{
-    NoncedVerificationData, VerificationCommitmentBatch, VerificationDataCommitment,
+    VerificationCommitmentBatch, VerificationData, VerificationDataCommitment,
 };
 use lambdaworks_crypto::merkle_tree::merkle::MerkleTree;
 
@@ -15,15 +15,15 @@ pub extern "C" fn verify_merkle_tree_batch_ffi(
 
     let batch_bytes = unsafe { std::slice::from_raw_parts(batch_ptr, batch_len) };
 
-    let batch = match serde_json::from_slice::<Vec<NoncedVerificationData>>(batch_bytes) {
+    let batch = match serde_json::from_slice::<Vec<VerificationData>>(batch_bytes) {
         Ok(batch) => batch,
         Err(_e) => {
             return false;
         }
     };
 
     let batch_data_comm: Vec<VerificationDataCommitment> =
-        batch.into_iter().map(|v| v.clone().into()).collect();
+        batch.into_iter().map(|v| v.into()).collect();
 
     let computed_batch_merkle_tree: MerkleTree<VerificationCommitmentBatch> =
         MerkleTree::build(&batch_data_comm);

operator/merkle_tree/lib/src/lib.rs

@@ -50,18 +50,12 @@ func (o *Operator) getBatchFromS3(batchURL string, expectedMerkleRoot [32]byte)
 	}
 	o.Logger.Infof("Batch merkle tree verified")
 
-	var batch []NoncedVerificationData
+	var batch []VerificationData
 
 	err = json.Unmarshal(batchBytes, &batch)
 	if err != nil {
 		return nil, err
 	}
 
-	// get only the verification data
-	var batchData []VerificationData
-	for _, data := range batch {
-		batchData = append(batchData, data.VerificationData)
-	}
-
-	return batchData, nil
+	return batch, nil
 }

operator/pkg/s3.go

@@ -11,8 +11,3 @@ type VerificationData struct {
 	VerificationKey []byte                 `json:"verification_key"`
 	VmProgramCode   []byte                 `json:"vm_program_code"`
 }
-
-type NoncedVerificationData struct {
-	VerificationData VerificationData `json:"verification_data"`
-	Nonce            []byte           `json:"nonce"`
-}