SuperCircuit

bus-mapping/src/circuit_input_builder/execution.rs

@@ -6,7 +6,7 @@ use eth_types::{
     GethExecStep, H256,
 };
 use gadgets::impl_expr;
-use halo2_proofs::{arithmetic::FieldExt, plonk::Expression};
+use halo2_proofs::plonk::Expression;
 use strum_macros::EnumIter;
 
 /// An execution step of the EVM.
@@ -201,7 +201,7 @@ pub enum NumberOrHash {
 
 /// Defines a copy event associated with EVM opcodes such as CALLDATACOPY,
 /// CODECOPY, CREATE, etc. More information:
-/// https://github.com/privacy-scaling-explorations/zkevm-specs/blob/master/specs/copy-proof.md.
+/// <https://github.com/privacy-scaling-explorations/zkevm-specs/blob/master/specs/copy-proof.md>.
 #[derive(Clone, Debug)]
 pub struct CopyEvent {
     /// Represents the start address at the source of the copy event.

circuit-benchmarks/src/evm_circuit.rs

@@ -6,6 +6,7 @@ use halo2_proofs::{
     plonk::{Circuit, ConstraintSystem, Error, Expression},
 };
 use zkevm_circuits::evm_circuit::{witness::Block, EvmCircuit};
+use zkevm_circuits::table::{BlockTable, BytecodeTable, RwTable, TxTable};
 
 #[derive(Debug, Default)]
 pub struct TestCircuit<F> {
@@ -21,10 +22,10 @@ impl<F: Field> Circuit<F> for TestCircuit<F> {
     }
 
     fn configure(meta: &mut ConstraintSystem<F>) -> Self::Config {
-        let tx_table = [(); 4].map(|_| meta.advice_column());
-        let rw_table = [(); 11].map(|_| meta.advice_column());
-        let bytecode_table = [(); 5].map(|_| meta.advice_column());
-        let block_table = [(); 3].map(|_| meta.advice_column());
+        let tx_table = TxTable::construct(meta);
+        let rw_table = RwTable::construct(meta);
+        let bytecode_table = BytecodeTable::construct(meta);
+        let block_table = BlockTable::construct(meta);
         let copy_table = [(); 11].map(|_| meta.advice_column());
         // Use constant expression to mock constant instance column for a more
         // reasonable benchmark.

gadgets/src/util.rs

@@ -126,15 +126,15 @@ pub trait Expr<F: FieldExt> {
 #[macro_export]
 macro_rules! impl_expr {
     ($type:ty) => {
-        impl<F: FieldExt> $crate::util::Expr<F> for $type {
+        impl<F: halo2_proofs::arithmetic::FieldExt> $crate::util::Expr<F> for $type {
             #[inline]
             fn expr(&self) -> Expression<F> {
                 Expression::Constant(F::from(*self as u64))
             }
         }
     };
     ($type:ty, $method:path) => {
-        impl<F: FieldExt> $crate::util::Expr<F> for $type {
+        impl<F: halo2_proofs::arithmetic::FieldExt> $crate::util::Expr<F> for $type {
             #[inline]
             fn expr(&self) -> Expression<F> {
                 Expression::Constant(F::from($method(self) as u64))