wip

Author: z2trillion

Makefile

@@ -15,7 +15,7 @@ fmt: ## Check whether the code is formatted correctly
 	@cargo fmt --all -- --check
 
 test-light: ## Run light tests
-	@cargo test --release --workspace --exclude integration-tests --exclude circuit-benchmarks
+	@cargo test --release --workspace --exclude integration-tests --exclude circuit-benchmarks batch_circuit_raw
 
 test-heavy: ## Run heavy tests serially to avoid OOM
 	@cargo test --release --features scroll --all --exclude integration-tests --exclude circuit-benchmarks serial_  -- --ignored --skip max_tx # --test-threads 1

aggregator/src/aggregation/circuit.rs

@@ -1,4 +1,5 @@
 use ark_std::{end_timer, start_timer};
+use eth_types::U256;
 use halo2_proofs::{
     circuit::{Layouter, SimpleFloorPlanner, Value},
     halo2curves::bn256::{Bn256, Fr, G1Affine},
@@ -248,12 +249,8 @@ impl<const N_SNARKS: usize> Circuit<Fr> for BatchCircuit<N_SNARKS> {
                     let barycentric = config.blob_consistency_config.assign_barycentric(
                         &mut ctx,
                         &self.batch_hash.blob_bytes,
-                        self.batch_hash
-                            .blob_consistency_witness
-                            .challenge()
-                            .0
-                            .into(),
-                    );
+                        self.batch_hash.challenge_digest(),
+\                    );
 
                     ctx.print_stats(&["barycentric"]);
 

aggregator/src/batch.rs

@@ -28,6 +28,7 @@ pub struct BatchHeader<const N_SNARKS: usize> {
     pub data_hash: H256,
     // /// information needed to check that the blobs in the circuit match the blob the data availability provided.
     #[serde(flatten)]
+    // don't touch this one!!!
     pub blob_consistency_witness: BlobConsistencyWitness,
 }
 
@@ -169,7 +170,7 @@ pub struct BatchHash<const N_SNARKS: usize> {
     pub(crate) batch_header: BatchHeader<N_SNARKS>,
     /// The blob bytes (may be encoded batch bytes, or may be raw batch bytes).
     pub(crate) blob_bytes: Vec<u8>,
-
+    // update this one!!
     pub blob_consistency_witness: BlobConsistencyWitness,
 }
 
@@ -286,6 +287,7 @@ impl<const N_SNARKS: usize> BatchHash<N_SNARKS> {
 
         let batch_data = BatchData::<N_SNARKS>::new(number_of_valid_chunks, chunks_with_padding);
         let current_batch_hash = batch_header.batch_hash();
+        dbg!(current_batch_hash);
         let blob_consistency_witness = BlobConsistencyWitness::new(&blob_bytes, &batch_data);
 
         log::info!(

aggregator/src/blob_consistency/avail.rs

@@ -1,4 +1,4 @@
-use super::{AssignedBlobDataExport};
+use super::AssignedBlobDataExport;
 use crate::{BatchData, RlcConfig};
 use eth_types::{H256, U256};
 use halo2_base::{gates::range::RangeConfig, AssignedValue, Context};

aggregator/src/blob_consistency/eip4844.rs

@@ -177,6 +177,8 @@ impl BlobConsistencyWitness {
         let versioned_hash = get_versioned_hash(&coeffs);
         let point_evaluation_assignments =
             PointEvaluationAssignments::new(&batch_data, bytes, versioned_hash);
+        dbg!(point_evaluation_assignments.challenge);
+        dbg!(point_evaluation_assignments.challenge_digest);
         let blob_data_proof = [
             point_evaluation_assignments.challenge,
             point_evaluation_assignments.evaluation,

aggregator/src/blob_consistency/eip4844/barycentric.rs

@@ -128,6 +128,10 @@ impl BarycentricEvaluationConfig {
         let (_, challenge) = challenge_digest.div_mod(*BLS_MODULUS);
         let challenge_scalar = Scalar::from_raw(challenge.0);
 
+        dbg!(challenge_digest);
+        dbg!(challenge);
+        panic!();
+
         let challenge_digest_crt = self.load_u256(ctx, challenge_digest);
         let challenge_le = self.scalar.range().gate.assign_witnesses(
             ctx,