Add da-avail feature flag

Cargo.toml

@@ -26,6 +26,7 @@ anyhow = "1.0"
 ark-std = "0.3"
 base64 = "0.13.0"
 bincode = "1"
+cfg-if = "1"
 ctor = "0.1"
 env_logger = "0.10"
 ethers = { version = "=2.0.7", features = ["ethers-solc"] }

Makefile

@@ -30,6 +30,9 @@ test-benches: ## Compiles the benchmarks
 
 test-all: fmt doc clippy test-doc test-benches test ## Run all the CI checks locally (in your actual toolchain)
 
+test-da-avail: ## Run light tests
+	@cargo test --release --workspace --exclude integration-tests --exclude circuit-benchmarks --features da-avail batch_circuit
+
 super_bench: ## Run Super Circuit benchmarks
 	@cargo test --profile bench bench_super_circuit_prover -p circuit-benchmarks --features benches  -- --nocapture
 

aggregator/Cargo.toml

@@ -11,6 +11,7 @@ gadgets = { path = "../gadgets" }
 zkevm-circuits = { path = "../zkevm-circuits", default-features=false, features = ["debug-annotations", "parallel_syn"] }
 
 ark-std.workspace = true
+cfg-if.workspace = true
 ctor.workspace = true
 env_logger.workspace = true
 ethers-core.workspace = true
@@ -47,6 +48,7 @@ csv = "1.1"
 default = ["revm-precompile/c-kzg", "halo2_proofs/circuit-params"]
 display = []
 print-trace = ["ark-std/print-trace"]
+da-avail = []
 
 [lints]
 workspace = true

aggregator/src/aggregation.rs

@@ -1,9 +1,5 @@
-/// Config to evaluate blob polynomial at a random challenge.
-mod barycentric;
 /// Config to constrain batch data (decoded blob data)
-mod batch_data;
-/// Config to constrain blob data (encoded batch data)
-mod blob_data;
+pub mod batch_data;
 /// Circuit implementation of aggregation circuit.
 mod circuit;
 /// Config for aggregation circuit
@@ -15,13 +11,11 @@ mod rlc;
 /// Utility module
 mod util;
 
-pub(crate) use barycentric::{
-    interpolate, AssignedBarycentricEvaluationConfig, BarycentricEvaluationConfig, BLS_MODULUS,
-};
+pub use batch_data::BatchData;
 pub(crate) use batch_data::BatchDataConfig;
-pub(crate) use blob_data::BlobDataConfig;
+pub use decoder::{decode_bytes, encode_bytes};
 pub(crate) use decoder::{witgen, DecoderConfig, DecoderConfigArgs};
-pub(crate) use rlc::RlcConfig;
+pub(crate) use rlc::{RlcConfig, POWS_OF_256};
 
 pub use circuit::BatchCircuit;
 pub use config::BatchCircuitConfig;