Merge branch 'refs/heads/staging' into feat/full-example-and-docs-for-agg-mod

# Conflicts:
#	batcher/aligned-sdk/src/aggregation_layer/helpers.rs
#	batcher/aligned-sdk/src/aggregation_layer/mod.rs

Author: JuArce

Makefile

@@ -190,7 +190,6 @@ start_proof_aggregator_gpu: is_aggregator_set reset_last_aggregated_block ## Sta
 start_proof_aggregator_gpu_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated in ethereum package
 	AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu --bin proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
 
-
 verify_aggregated_proof_sp1_holesky_stage: 
 	@echo "Verifying SP1 in aggregated proofs on holesky..."
 	@cd batcher/aligned/ && \
@@ -221,6 +220,7 @@ install_aggregation_mode: ## Install the aggregation mode with proving enabled
 agg_mode_write_program_ids: ## Write proof aggregator zkvm programs ids 
 	@cd aggregation_mode && \
 	cargo run --release --bin write_program_image_id_vk_hash
+	
 
 _AGGREGATOR_:
 

batcher/aligned-sdk/src/aggregation_layer/helpers.rs

@@ -106,12 +106,12 @@ pub async fn get_blob_data_from_verified_proof_event(
 
     let blob_bytes =
         hex::decode(blob_data.blob.replace("0x", "")).expect("A valid hex encoded data");
-    let proof_commitments = decoded_blob(blob_bytes);
+    let proof_commitments = decoded_blob(&blob_bytes);
 
     Ok((merkle_root, proof_commitments))
 }
 
-fn decoded_blob(blob_data: Vec<u8>) -> Vec<[u8; 32]> {
+fn decoded_blob(blob_data: &[u8]) -> Vec<[u8; 32]> {
     let mut proof_hashes = vec![];
 
     let mut current_hash = [0u8; 32];

batcher/aligned-sdk/src/aggregation_layer/mod.rs

@@ -25,7 +25,7 @@ pub enum ProofStatus {
     NotFound,
 }
 
-/// Given the [`AggregationModeVerificationData`], this function checks whether the proof was included in a
+/// Given the [`AggregationModeVerificationData`], this function checks whether the proof was included
 /// in a recent aggregated proof and verifies the corresponding Merkle root commitment.
 ///
 /// ### Notes
@@ -63,13 +63,15 @@ pub async fn check_proof_verification(
         .await?;
 
         let leaves: Vec<Hash32> = leaves.iter().map(|leaf| Hash32(*leaf)).collect();
-        let Some(merkle_tree) = MerkleTree::<Hash32>::build(&leaves) else {
+
+        let Some(pos) = leaves.iter().position(|p| p.0 == proof_commitment) else {
             continue;
         };
 
-        let Some(pos) = leaves.iter().position(|p| p.0 == proof_commitment) else {
+        let Some(merkle_tree) = MerkleTree::<Hash32>::build(&leaves) else {
             continue;
         };
+
         let Some(proof) = merkle_tree.get_proof_by_pos(pos) else {
             continue;
         };