Decoder "input region"

aggregator/src/aggregation.rs

@@ -9,7 +9,7 @@ mod circuit;
 /// Config for aggregation circuit
 mod config;
 /// Config for decoding zstd-encoded data.
-mod decompression;
+mod decoder;
 /// config for RLC circuit
 mod rlc;
 
@@ -18,7 +18,7 @@ pub(crate) use barycentric::{
 };
 pub(crate) use batch_data::BatchDataConfig;
 pub(crate) use blob_data::BlobDataConfig;
-pub(crate) use decompression::decoder::DecoderConfig;
+pub(crate) use decoder::DecoderConfig;
 pub(crate) use rlc::RlcConfig;
 
 pub use circuit::AggregationCircuit;

aggregator/src/aggregation/batch_data.rs

@@ -81,7 +81,7 @@ pub struct AssignedBatchDataConfig {
 impl BatchDataConfig {
     pub fn configure(
         meta: &mut ConstraintSystem<Fr>,
-        challenge: Challenges<Expression<Fr>>,
+        challenge: &Challenges<Expression<Fr>>,
         u8_table: U8Table,
         range_table: RangeTable<MAX_AGG_SNARKS>,
         keccak_table: &KeccakTable,
@@ -357,7 +357,7 @@ impl BatchDataConfig {
             },
         );
 
-        assert!(meta.degree() <= 5);
+        assert!(meta.degree() <= 4);
 
         config
     }

aggregator/src/aggregation/blob_data.rs

@@ -49,7 +49,7 @@ impl BlobDataConfig {
             vec![(byte_value, u8_table.into())]
         });
 
-        assert!(meta.degree() <= 5);
+        assert!(meta.degree() <= 4);
 
         config
     }

aggregator/src/aggregation/config.rs

@@ -12,7 +12,7 @@ use snark_verifier::{
 };
 use zkevm_circuits::{
     keccak_circuit::{KeccakCircuitConfig, KeccakCircuitConfigArgs},
-    table::{KeccakTable, RangeTable, U8Table},
+    table::{KeccakTable, PowOfRandTable, RangeTable, U8Table},
     util::{Challenges, SubCircuitConfig},
 };
 
@@ -116,11 +116,26 @@ impl AggregationConfig {
         let range_table = RangeTable::construct(meta);
         let challenges_expr = challenges.exprs(meta);
         let blob_data_config = BlobDataConfig::configure(meta, u8_table);
-        let batch_data_config =
-            BatchDataConfig::configure(meta, challenges_expr, u8_table, range_table, &keccak_table);
+        let batch_data_config = BatchDataConfig::configure(
+            meta,
+            &challenges_expr,
+            u8_table,
+            range_table,
+            &keccak_table,
+        );
 
         // Zstd decoder.
-        let decoder_config = DecoderConfig::configure(meta);
+        let pow_rand_table = PowOfRandTable::construct(meta, &challenges_expr);
+        let range8 = RangeTable::construct(meta);
+        let range16 = RangeTable::construct(meta);
+        let decoder_config = DecoderConfig::configure(
+            meta,
+            &challenges_expr,
+            pow_rand_table,
+            u8_table,
+            range8,
+            range16,
+        );
 
         // Instance column stores public input column
         // - the accumulator
@@ -129,6 +144,8 @@ impl AggregationConfig {
         let instance = meta.instance_column();
         meta.enable_equality(instance);
 
+        println!("meta degree = {:?}", meta.degree());
+
         Self {
             base_field_config,
             rlc_config,