diff --git a/zkevm-circuits/src/circuit_tools/cell_manager.rs b/zkevm-circuits/src/circuit_tools/cell_manager.rs index 395964c93c..7408577a69 100644 --- a/zkevm-circuits/src/circuit_tools/cell_manager.rs +++ b/zkevm-circuits/src/circuit_tools/cell_manager.rs @@ -1,7 +1,7 @@ //! Cell manager use crate::{ circuit_tools::cached_region::CachedRegion, - util::{query_expression, Expr}, evm_circuit::util::rlc, + util::{query_expression, Expr}, }; use crate::table::LookupTable; diff --git a/zkevm-circuits/src/table/keccak_table.rs b/zkevm-circuits/src/table/keccak_table.rs index aa2cb94d47..14b33d6ecf 100644 --- a/zkevm-circuits/src/table/keccak_table.rs +++ b/zkevm-circuits/src/table/keccak_table.rs @@ -1,4 +1,4 @@ -use eth_types::ToBigEndian; + use super::*; diff --git a/zkevm-circuits/src/taiko_pi_circuit.rs b/zkevm-circuits/src/taiko_pi_circuit.rs index f8f688dead..930c349030 100644 --- a/zkevm-circuits/src/taiko_pi_circuit.rs +++ b/zkevm-circuits/src/taiko_pi_circuit.rs @@ -3,31 +3,30 @@ use crate::{ assign, evm_circuit::table::Table::*, - evm_circuit::{util::{constraint_builder::{BaseConstraintBuilder, ConstrainBuilderCommon}, rlc}, table::Table}, + evm_circuit::{util::{constraint_builder::{ConstrainBuilderCommon}}, table::Table}, table::{byte_table::ByteTable, BlockContextFieldTag, BlockTable, KeccakTable, LookupTable}, util::{Challenges, SubCircuitConfig, SubCircuit}, circuit_tools::{ - constraint_builder::{ConstraintBuilder, RLCable, RLCChainable, TO_FIX, COMPRESS, REDUCE, RLCableValue}, - cell_manager::{CellManager, CellType, Cell, CellConfig, CellColumn}, gadgets::{IsEqualGadget, IsZeroGadget}, cached_region::{CachedRegion, self}, + constraint_builder::{ConstraintBuilder, RLCable, TO_FIX, RLCableValue}, + cell_manager::{CellManager, CellType, Cell, CellColumn}, gadgets::{IsEqualGadget}, cached_region::{CachedRegion}, }, - witness::{self, BlockContext}, circuit, assignf, + witness::{self, BlockContext}, circuit, }; -use bus_mapping::{evm, operation::Op}; + use gadgets::util::{Scalar, not}; use eth_types::{Address, Field, ToBigEndian, ToWord, Word, H256}; use ethers_core::utils::keccak256; -use gadgets::{util::{or, select, Expr, and}, impl_expr}; +use gadgets::{util::{Expr}}; use halo2_proofs::{ - circuit::{AssignedCell, Layouter, Region, SimpleFloorPlanner, Value}, + circuit::{Layouter, SimpleFloorPlanner, Value}, plonk::{ - Advice, Circuit, Column, ConstraintSystem, Error, Expression, Fixed, Instance, SecondPhase, - Selector, VirtualCells, + Circuit, Column, ConstraintSystem, Error, Expression, Instance, + Selector, }, - poly::{Rotation}, }; -use rand_chacha::rand_core::block; -use std::{marker::PhantomData, ops::Range, usize, default, vec}; + +use std::{marker::PhantomData, usize, vec}; const BYTE_POW_BASE: u64 = 1 << 8; const N: usize = 32; @@ -348,7 +347,7 @@ impl SubCircuitConfig for TaikoPiCircuitConfig { // meta.pinned().print_config_states(); // meta.pinned().print_layout_states(); - let mut col_configs = cm.columns().to_vec(); + let col_configs = cm.columns().to_vec(); Self { q_enable, public_input, @@ -394,7 +393,7 @@ impl TaikoPiCircuitConfig { let mut offset = 0; let mut state = 0; let mut pi_cells = Vec::new(); - for (annotation, block_number, bytes) in assignments { + for (_annotation, block_number, bytes) in assignments { self.state.assign(&mut region, offset, state)?; if state != KECCAK_OUTPUT { let next = block_acc * keccak_mult