Skip to content

fix: merkle tree and blob data exceeding BLS_MODULUS #1848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MauroToscano merged 2 commits into from
Apr 4, 2025
Merged

fix: merkle tree and blob data exceeding BLS_MODULUS #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
286cec8
fix: merkle tree not returning actual leaves but second layer
MarcosNicolau Apr 3, 2025
227e2cd
fix: blob data exceeding BLS_MODULUS
MarcosNicolau Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions aggregation_mode/src/backend/merkle_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@ pub fn combine_hashes(hash_a: &[u8; 32], hash_b: &[u8; 32]) -> [u8; 32] {

/// Returns (merkle_root, leaves)
pub fn compute_proofs_merkle_root(proofs: &[AlignedProof]) -> ([u8; 32], Vec<[u8; 32]>) {
let leaves: Vec<[u8; 32]> = proofs
.chunks(2)
.map(|chunk| match chunk {
[a, b] => combine_hashes(&a.hash(), &b.hash()),
[a] => combine_hashes(&a.hash(), &a.hash()),
_ => panic!("Unexpected chunk leaves"),
})
.collect();
let leaves: Vec<[u8; 32]> = proofs.iter().map(|proof| proof.hash()).collect();

let mut root = leaves.clone();

Expand Down
24 changes: 17 additions & 7 deletions aggregation_mode/src/backend/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ mod merkle_tree;
mod s3;
mod types;

use crate::aggregators::{lib::{AggregatedProof, ProofAggregationError}, sp1_aggregator::{aggregate_proofs, SP1AggregationInput}, AlignedProof, ZKVMEngine};

use crate::aggregators::{
lib::{AggregatedProof, ProofAggregationError},
sp1_aggregator::{aggregate_proofs, SP1AggregationInput},
AlignedProof, ZKVMEngine,
};

use alloy::{
consensus::{Blob, BlobTransactionSidecar},
Expand All @@ -25,7 +28,6 @@ use std::str::FromStr;
use tracing::{error, info, warn};
use types::{AlignedProofAggregationService, AlignedProofAggregationServiceContract};


#[derive(Debug)]
pub enum AggregatedProofSubmissionError {
Aggregation(ProofAggregationError),
Expand Down Expand Up @@ -122,8 +124,7 @@ impl ProofAggregator {
merkle_root,
};

aggregate_proofs(input)
.map_err(AggregatedProofSubmissionError::Aggregation)?
aggregate_proofs(input).map_err(AggregatedProofSubmissionError::Aggregation)?
}
};
info!("Proof aggregation program finished");
Expand Down Expand Up @@ -184,8 +185,17 @@ impl ProofAggregator {
let data: Vec<u8> = leaves.iter().flat_map(|arr| arr.iter().copied()).collect();
let mut blob_data: [u8; BYTES_PER_BLOB] = [0u8; BYTES_PER_BLOB];

for (i, byte) in data.iter().enumerate() {
blob_data[i] = *byte;
// We pad the data with 0x0 byte every 31 bytes so that the field elements
// constructed from the bytes are less than BLS_MODULUS.
//
// See https://github.com/ethereum/consensus-specs/blob/86fb82b221474cc89387fa6436806507b3849d88/specs/deneb/polynomial-commitments.md#bytes_to_bls_field
let mut offset = 0;
for chunk in data.chunks(31) {
blob_data[offset] = 0x00;
let start = offset + 1;
let end = start + chunk.len();
blob_data[start..end].copy_from_slice(chunk);
offset += 32;
}

// calculate kzg commitments for blob
Expand Down