Skip to content
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

Standalone BatchHeader Constructor #1362

Merged
merged 4 commits into from
Jul 10, 2024
Merged

Standalone BatchHeader Constructor #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f3c573
Create standalone constructor for batch header
darth-cy Jul 10, 2024
43d0f58
Recover decoder config subcomponent
darth-cy Jul 10, 2024
ceae85e
Merge branch 'feat/agg_recursion' into feat/batch_header_constructor
roynalnaruto Jul 10, 2024
216c5ac
corresponding changes to prover
roynalnaruto Jul 10, 2024
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
70 changes: 34 additions & 36 deletions aggregator/src/aggregation/circuit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,21 +506,20 @@ impl<const N_SNARKS: usize> Circuit<Fr> for BatchCircuit<N_SNARKS> {
"original and recovered bytes mismatch"
);

// batch_circuit_debug
// let decoder_exports = config.decoder_config.assign(
// &mut layouter,
// &batch_bytes,
// &encoded_batch_bytes,
// witness_rows,
// decoded_literals,
// fse_aux_tables,
// block_info_arr,
// sequence_info_arr,
// address_table_arr,
// sequence_exec_info_arr,
// &challenges,
// LOG_DEGREE, // TODO: configure k for batch circuit instead of hard-coded here.
// )?;
let decoder_exports = config.decoder_config.assign(
&mut layouter,
&batch_bytes,
&encoded_batch_bytes,
witness_rows,
decoded_literals,
fse_aux_tables,
block_info_arr,
sequence_info_arr,
address_table_arr,
sequence_exec_info_arr,
&challenges,
LOG_DEGREE, // TODO: configure k for batch circuit instead of hard-coded here.
)?;

layouter.assign_region(
|| "consistency checks",
Expand Down Expand Up @@ -569,27 +568,26 @@ impl<const N_SNARKS: usize> Circuit<Fr> for BatchCircuit<N_SNARKS> {
region.constrain_equal(c.cell(), ec.cell())?;
}

// batch_circuit_debug
// // equate rlc (from blob data) with decoder's encoded_rlc
// region.constrain_equal(
// blob_data_exports.bytes_rlc.cell(),
// decoder_exports.encoded_rlc.cell(),
// )?;
// // equate len(blob_bytes) with decoder's encoded_len
// region.constrain_equal(
// blob_data_exports.bytes_len.cell(),
// decoder_exports.encoded_len.cell(),
// )?;
// // equate rlc (from batch data) with decoder's decoded_rlc
// region.constrain_equal(
// batch_data_exports.bytes_rlc.cell(),
// decoder_exports.decoded_rlc.cell(),
// )?;
// // equate len(batch_data) with decoder's decoded_len
// region.constrain_equal(
// batch_data_exports.batch_data_len.cell(),
// decoder_exports.decoded_len.cell(),
// )?;
// equate rlc (from blob data) with decoder's encoded_rlc
region.constrain_equal(
blob_data_exports.bytes_rlc.cell(),
decoder_exports.encoded_rlc.cell(),
)?;
// equate len(blob_bytes) with decoder's encoded_len
region.constrain_equal(
blob_data_exports.bytes_len.cell(),
decoder_exports.encoded_len.cell(),
)?;
// equate rlc (from batch data) with decoder's decoded_rlc
region.constrain_equal(
batch_data_exports.bytes_rlc.cell(),
decoder_exports.decoded_rlc.cell(),
)?;
// equate len(batch_data) with decoder's decoded_len
region.constrain_equal(
batch_data_exports.batch_data_len.cell(),
decoder_exports.decoded_len.cell(),
)?;

Ok(())
},
Expand Down
55 changes: 26 additions & 29 deletions aggregator/src/aggregation/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ pub struct BatchCircuitConfig<const N_SNARKS: usize> {
pub blob_data_config: BlobDataConfig<N_SNARKS>,
/// The batch data's config.
pub batch_data_config: BatchDataConfig<N_SNARKS>,
// batch_circuit_debug
// /// The zstd decoder's config.
// pub decoder_config: DecoderConfig<1024, 512>,
/// The zstd decoder's config.
pub decoder_config: DecoderConfig<1024, 512>,
/// Config to do the barycentric evaluation on blob polynomial.
pub barycentric: BarycentricEvaluationConfig,
/// Instance for public input; stores
Expand Down Expand Up @@ -131,30 +130,29 @@ impl<const N_SNARKS: usize> BatchCircuitConfig<N_SNARKS> {
);

// Zstd decoder.
// batch_circuit_debug
// let pow_rand_table = PowOfRandTable::construct(meta, &challenges_expr);

// let pow2_table = Pow2Table::construct(meta);
// let range8 = RangeTable::construct(meta);
// let range16 = RangeTable::construct(meta);
// let range512 = RangeTable::construct(meta);
// let range_block_len = RangeTable::construct(meta);
// let bitwise_op_table = BitwiseOpTable::construct(meta);

// let decoder_config = DecoderConfig::configure(
// meta,
// &challenges_expr,
// DecoderConfigArgs {
// pow_rand_table,
// pow2_table,
// u8_table,
// range8,
// range16,
// range512,
// range_block_len,
// bitwise_op_table,
// },
// );
let pow_rand_table = PowOfRandTable::construct(meta, &challenges_expr);

let pow2_table = Pow2Table::construct(meta);
let range8 = RangeTable::construct(meta);
let range16 = RangeTable::construct(meta);
let range512 = RangeTable::construct(meta);
let range_block_len = RangeTable::construct(meta);
let bitwise_op_table = BitwiseOpTable::construct(meta);

let decoder_config = DecoderConfig::configure(
meta,
&challenges_expr,
DecoderConfigArgs {
pow_rand_table,
pow2_table,
u8_table,
range8,
range16,
range512,
range_block_len,
bitwise_op_table,
},
);

// Instance column stores public input column
// the public instance for this circuit consists of
Expand All @@ -179,8 +177,7 @@ impl<const N_SNARKS: usize> BatchCircuitConfig<N_SNARKS> {
instance,
barycentric,
batch_data_config,
// batch_circuit_debug
// decoder_config,
decoder_config,
}
}

Expand Down
110 changes: 91 additions & 19 deletions aggregator/src/batch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::{
/// Batch header provides additional fields from the context (within recursion)
/// for constructing the preimage of the batch hash.
#[derive(Default, Debug, Clone, Copy, Serialize, Deserialize)]
pub struct BatchHeader {
pub struct BatchHeader<const N_SNARKS: usize> {
/// the batch version
pub version: u8,
/// the index of the batch
Expand All @@ -35,7 +35,65 @@ pub struct BatchHeader {
pub blob_data_proof: [H256; 2],
}

impl BatchHeader {
impl<const N_SNARKS: usize> BatchHeader<N_SNARKS> {
/// Constructs the correct batch header from chunks data and context variables
pub fn construct_from_chunks(
version: u8,
batch_index: u64,
l1_message_popped: u64,
total_l1_message_popped: u64,
parent_batch_hash: H256,
last_block_timestamp: u64,
chunks: &[ChunkInfo],
) -> Self {
assert_ne!(chunks.len(), 0);
assert!(chunks.len() <= N_SNARKS);

let mut chunks_with_padding = chunks.to_vec();
if chunks.len() < N_SNARKS {
let last_chunk = chunks.last().unwrap();
let mut padding_chunk = last_chunk.clone();
padding_chunk.is_padding = true;
chunks_with_padding
.extend(std::iter::repeat(padding_chunk).take(N_SNARKS - chunks.len()));
}

let number_of_valid_chunks = match chunks_with_padding
.iter()
.enumerate()
.find(|(_index, chunk)| chunk.is_padding)
{
Some((index, _)) => index,
None => N_SNARKS,
};

let batch_data_hash_preimage = chunks_with_padding
.iter()
.take(number_of_valid_chunks)
.flat_map(|chunk_info| chunk_info.data_hash.0.iter())
.cloned()
.collect::<Vec<_>>();
let batch_data_hash = keccak256(batch_data_hash_preimage);

let batch_data = BatchData::<N_SNARKS>::new(number_of_valid_chunks, &chunks_with_padding);
let point_evaluation_assignments = PointEvaluationAssignments::from(&batch_data);

Self {
version,
batch_index,
l1_message_popped,
total_l1_message_popped,
parent_batch_hash,
last_block_timestamp,
data_hash: batch_data_hash.into(),
blob_versioned_hash: batch_data.get_versioned_hash(),
blob_data_proof: [
H256::from_slice(&point_evaluation_assignments.challenge.to_be_bytes()),
H256::from_slice(&point_evaluation_assignments.evaluation.to_be_bytes()),
],
}
}

/// Returns the batch hash as per BatchHeaderV3.
pub fn batch_hash(&self) -> H256 {
// the current batch hash is build as
Expand Down Expand Up @@ -107,12 +165,15 @@ pub struct BatchHash<const N_SNARKS: usize> {
/// The 4844 versioned hash for the blob.
pub(crate) versioned_hash: H256,
/// The context batch header
pub(crate) batch_header: BatchHeader,
pub(crate) batch_header: BatchHeader<N_SNARKS>,
}

impl<const N_SNARKS: usize> BatchHash<N_SNARKS> {
/// Build Batch hash from an ordered list of chunks. Will pad if needed
pub fn construct_with_unpadded(chunks: &[ChunkInfo], batch_header: BatchHeader) -> Self {
pub fn construct_with_unpadded(
chunks: &[ChunkInfo],
batch_header: BatchHeader<N_SNARKS>,
) -> Self {
assert_ne!(chunks.len(), 0);
assert!(chunks.len() <= N_SNARKS);
let mut chunks_with_padding = chunks.to_vec();
Expand All @@ -132,15 +193,16 @@ impl<const N_SNARKS: usize> BatchHash<N_SNARKS> {
}

/// Build Batch hash from an ordered list of #N_SNARKS of chunks.
pub fn construct(chunks_with_padding: &[ChunkInfo], batch_header: BatchHeader) -> Self {
pub fn construct(
chunks_with_padding: &[ChunkInfo],
batch_header: BatchHeader<N_SNARKS>,
) -> Self {
assert_eq!(
chunks_with_padding.len(),
N_SNARKS,
"input chunk slice does not match N_SNARKS"
);

let mut export_batch_header = batch_header;

let number_of_valid_chunks = match chunks_with_padding
.iter()
.enumerate()
Expand Down Expand Up @@ -209,24 +271,34 @@ impl<const N_SNARKS: usize> BatchHash<N_SNARKS> {
.collect::<Vec<_>>();
let batch_data_hash = keccak256(preimage);

// Update export value
export_batch_header.data_hash = batch_data_hash.into();
assert_eq!(
batch_header.data_hash,
H256::from_slice(&batch_data_hash),
"Expect provided BatchHeader's data_hash field to be correct"
);

let batch_data = BatchData::<N_SNARKS>::new(number_of_valid_chunks, chunks_with_padding);
let point_evaluation_assignments = PointEvaluationAssignments::from(&batch_data);

// Update export value
export_batch_header.blob_data_proof[0] =
H256::from_slice(&point_evaluation_assignments.challenge.to_be_bytes());
export_batch_header.blob_data_proof[1] =
H256::from_slice(&point_evaluation_assignments.evaluation.to_be_bytes());
assert_eq!(
batch_header.blob_data_proof[0],
H256::from_slice(&point_evaluation_assignments.challenge.to_be_bytes()),
"Expect provided BatchHeader's blob_data_proof field 0 to be correct"
);
assert_eq!(
batch_header.blob_data_proof[1],
H256::from_slice(&point_evaluation_assignments.evaluation.to_be_bytes()),
"Expect provided BatchHeader's blob_data_proof field 1 to be correct"
);

let versioned_hash = batch_data.get_versioned_hash();

// Update export value
export_batch_header.blob_versioned_hash = versioned_hash;
assert_eq!(
batch_header.blob_versioned_hash, versioned_hash,
"Expect provided BatchHeader's blob_versioned_hash field to be correct"
);

let current_batch_hash = export_batch_header.batch_hash();
let current_batch_hash = batch_header.batch_hash();

log::info!(
"batch hash {:?}, datahash {}, z {}, y {}, versioned hash {:x}",
Expand All @@ -248,7 +320,7 @@ impl<const N_SNARKS: usize> BatchHash<N_SNARKS> {
number_of_valid_chunks,
point_evaluation_assignments,
versioned_hash,
batch_header: export_batch_header,
batch_header,
}
}

Expand Down Expand Up @@ -378,7 +450,7 @@ impl<const N_SNARKS: usize> BatchHash<N_SNARKS> {
}

/// ...
pub fn batch_header(&self) -> BatchHeader {
pub fn batch_header(&self) -> BatchHeader<N_SNARKS> {
self.batch_header
}
}
Loading
Loading