everything compiles now

Author: zhenfeizhang

Cargo.lock

@@ -65,8 +65,8 @@ ethers-etherscan = { git = "https://github.com/scroll-tech/ethers-rs.git", branc
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "sync-halo2-lib-0.4.0" }
 [patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
 poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "sync-halo2-lib-0.4.0" }
-[patch."https://github.com/privacy-scaling-explorations/halo2wrong.git"]
-maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-ecc-snark-verifier-0323" }
+# [patch."https://github.com/privacy-scaling-explorations/halo2wrong.git"]
+# maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-ecc-snark-verifier-0323" }
 
 # Definition of benchmarks profile to use.
 [profile.bench]

Cargo.toml

@@ -1,7 +1,7 @@
 //! Evm types needed for parsing instruction sets as well
 
 use serde::{Deserialize, Serialize};
-use std::fmt;
+use std::{fmt, marker::ConstParamTy};
 
 pub mod block_utils;
 pub mod gas_utils;
@@ -78,8 +78,7 @@ mod gas_create {
     // [gasCreate2Eip3860](https://github.com/ethereum/go-ethereum/blob/eb83e7c54021573eaceb14236af3a7a8c64f6027/core/vm/gas_table.go#L321)
     // (similar for CREATE).
     // 1. size <= 49152 (MaxInitCodeSize)
-    // 2. gasCost = memoryGasCost + (2 + 6) * ((size + 31) / 32) should not
-    //    overflow for Uint64.
+    // 2. gasCost = memoryGasCost + (2 + 6) * ((size + 31) / 32) should not overflow for Uint64.
     // No need to constrain the second condition, since the maximum gas cost
     // cannot overflow for Uint64 (36028809887100925 calculated by
     // `memorySize = 0x1FFFFFFFE0` and `size = 49152`) if the first condition is
@@ -106,7 +105,7 @@ mod gas_create {
 pub use gas_create::*;
 
 /// Defines the gas consumption.
-#[derive(Clone, Copy, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+#[derive(Clone, Copy, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize, ConstParamTy)]
 pub struct GasCost(pub u64);
 
 impl fmt::Debug for GasCost {

eth-types/src/evm_types.rs

@@ -11,6 +11,7 @@
 //#![deny(unsafe_code)] Allowed now until we find a
 // better way to handle downcasting from Operation into it's variants.
 #![allow(clippy::upper_case_acronyms)] // Too pedantic
+#![feature(adt_const_params)]
 
 #[macro_use]
 pub mod macros;
@@ -25,7 +26,7 @@ pub mod sign_types;
 
 pub use bytecode::Bytecode;
 pub use error::Error;
-use halo2_proofs::halo2curves::{bn256::Fr, group::ff::PrimeField};
+use halo2_proofs::halo2curves::{bn256::Fr, ff::FromUniformBytes, group::ff::PrimeField};
 
 use crate::evm_types::{
     memory::Memory, stack::Stack, storage::Storage, Gas, GasCost, OpcodeId, ProgramCounter,
@@ -46,15 +47,33 @@ use std::{collections::HashMap, fmt, str::FromStr};
 /// Trait used to reduce verbosity with the declaration of the [`FieldExt`]
 /// trait and its repr.
 pub trait Field:
-    PrimeField<Repr = [u8; 32]> + hash_circuit::hash::Hashable + std::convert::From<Fr>
+    PrimeField<Repr = [u8; 32]>
+    + hash_circuit::hash::Hashable
+    + std::convert::From<Fr>
+    + FromUniformBytes<64>
+    + From<bool>
 {
+    /// Re-expose zero element as a function
+    fn zero() -> Self {
+        Self::ZERO
+    }
+
+    /// Re-expose one element as a function
+    fn one() -> Self {
+        Self::ONE
+    }
+
+    /// Expose the lower 128 bits
+    fn get_lower_128(&self) -> u128 {
+        u128::from_le_bytes(self.to_repr().as_ref()[..16].try_into().unwrap())
+    }
 }
 
 // Impl custom `Field` trait for BN256 Fr to be used and consistent with the
 // rest of the workspace.
 impl Field for Fr {}
 
-// Impl custom `Field` trait for BN256 Frq to be used and consistent with the
+// Impl custom `Field` trait for BN256 Fq to be used and consistent with the
 // rest of the workspace.
 // impl Field for Fq {}
 

eth-types/src/lib.rs

@@ -17,13 +17,14 @@ use ethers_core::{
 use halo2_proofs::{
     arithmetic::CurveAffine,
     halo2curves::{
+        ff::FromUniformBytes,
         group::{
             ff::{Field as GroupField, PrimeField},
             prime::PrimeCurveAffine,
             Curve,
         },
         secp256k1::{Fp, Fq, Secp256k1Affine},
-        Coordinates, ff::FromUniformBytes,
+        Coordinates,
     },
 };
 use lazy_static::lazy_static;

eth-types/src/sign_types.rs

@@ -158,6 +158,7 @@ mod test {
     impl<F: Field, const N: usize> Circuit<F> for TestCircuit<F, N> {
         type Config = TestCircuitConfig<N>;
         type FloorPlanner = SimpleFloorPlanner;
+        type Params = ();
 
         fn without_witnesses(&self) -> Self {
             Self::default()

gadgets/src/batched_is_zero.rs

@@ -177,6 +177,7 @@ mod tests {
             // commitment which will be provided as public inputs.
             type Config = (WordConfig<F>, Column<Instance>);
             type FloorPlanner = SimpleFloorPlanner;
+            type Params = ();
 
             fn without_witnesses(&self) -> Self {
                 Self::default()

gadgets/src/evm_word.rs

@@ -149,6 +149,7 @@ mod tests {
     impl<F: Field, const RHS: u64> Circuit<F> for TestCircuit<F, RHS> {
         type Config = TestCircuitConfig<F, RHS>;
         type FloorPlanner = SimpleFloorPlanner;
+        type Params = ();
 
         fn without_witnesses(&self) -> Self {
             Self::default()

gadgets/src/is_equal.rs

@@ -222,6 +222,7 @@ mod test {
         impl<F: Field> Circuit<F> for TestCircuit<F> {
             type Config = TestCircuitConfig<F>;
             type FloorPlanner = SimpleFloorPlanner;
+            type Params = ();
 
             fn without_witnesses(&self) -> Self {
                 Self::default()
@@ -349,6 +350,7 @@ mod test {
         impl<F: Field> Circuit<F> for TestCircuit<F> {
             type Config = TestCircuitConfig<F>;
             type FloorPlanner = SimpleFloorPlanner;
+            type Params = ();
 
             fn without_witnesses(&self) -> Self {
                 Self::default()

gadgets/src/is_zero.rs

@@ -254,6 +254,7 @@ mod test {
         impl<F: Field> Circuit<F> for TestCircuit<F> {
             type Config = TestCircuitConfig<F>;
             type FloorPlanner = SimpleFloorPlanner;
+            type Params = ();
 
             fn without_witnesses(&self) -> Self {
                 Self::default()
@@ -376,6 +377,7 @@ mod test {
         impl<F: Field> Circuit<F> for TestCircuit<F> {
             type Config = TestCircuitConfig<F>;
             type FloorPlanner = SimpleFloorPlanner;
+            type Params = ();
 
             fn without_witnesses(&self) -> Self {
                 Self::default()

gadgets/src/less_than.rs

@@ -138,6 +138,7 @@ mod test {
     {
         type Config = TestCircuitConfig;
         type FloorPlanner = SimpleFloorPlanner;
+        type Params = ();
 
         fn without_witnesses(&self) -> Self {
             Self::default()

gadgets/src/monotone.rs

@@ -501,6 +501,7 @@ mod test {
         impl<F: Field> Circuit<F> for TestCircuit<F> {
             type Config = TestCircuitConfig<F>;
             type FloorPlanner = SimpleFloorPlanner;
+            type Params = ();
 
             fn configure(meta: &mut halo2_proofs::plonk::ConstraintSystem<F>) -> Self::Config {
                 let q_enable = meta.complex_selector();

gadgets/src/mul_add.rs

@@ -1 +1 @@
-nightly-2022-12-10
+nightly-2023-10-27

rust-toolchain

@@ -32,12 +32,12 @@ serde.workspace = true
 serde_json.workspace = true
 
 hash-circuit.workspace = true
-misc-precompiled-circuit = { package = "misc-precompiled-circuit", git = "https://github.com/scroll-tech/misc-precompiled-circuit.git", tag = "v0.1.0" }
+misc-precompiled-circuit = { package = "misc-precompiled-circuit", git = "https://github.com/scroll-tech/misc-precompiled-circuit.git", branch = "sync-halo2-lib-0.4.0" }
 
-halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.5", default-features=false, features=["halo2-pse","display"] }
-halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.5", default-features=false, features=["halo2-pse","display"] }
+halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "sync-halo2-lib-0.4.0", default-features=false, features=["halo2-pse","display"] }
+halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "sync-halo2-lib-0.4.0", default-features=false, features=["halo2-pse","display"] }
 
-maingate = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2023_02_02" }
+# maingate = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2023_02_02" }
 
 num-bigint.workspace = true
 subtle.workspace = true

zkevm-circuits/Cargo.toml

@@ -81,7 +81,7 @@ pub fn unroll_to_hash_input<F: Field, const BYTES_IN_FIELD: usize, const INPUT_L
             if cache.len() == BYTES_IN_FIELD {
                 let mut buf: [u8; 64] = [0; 64];
                 U256::from_big_endian(&cache).to_little_endian(&mut buf[0..32]);
-                msgs.push(F::from_bytes_wide(&buf));
+                msgs.push(F::from_uniform_bytes(&buf));
                 cache.clear();
             }
             (msgs, cache)

zkevm-circuits/src/bytecode_circuit/bytecode_unroller.rs

@@ -28,6 +28,7 @@ pub type CircuitConfig<F> = super::circuit::BytecodeCircuitConfig<F>;
 impl<F: Field> Circuit<F> for BytecodeCircuit<F> {
     type Config = (CircuitConfig<F>, Challenges);
     type FloorPlanner = SimpleFloorPlanner;
+    type Params = ();
 
     fn without_witnesses(&self) -> Self {
         Self::default()

zkevm-circuits/src/bytecode_circuit/dev.rs

@@ -14,6 +14,7 @@ use halo2_proofs::{
 impl<F: Field> Circuit<F> for CopyCircuit<F> {
     type Config = (CopyCircuitConfig<F>, Challenges<Challenge>);
     type FloorPlanner = SimpleFloorPlanner;
+    type Params = ();
 
     fn without_witnesses(&self) -> Self {
         Self::default()

zkevm-circuits/src/copy_circuit/dev.rs

@@ -528,6 +528,9 @@ fn assert_error_matches(result: Result<(), Vec<VerifyFailure>>, names: Vec<&str>
             VerifyFailure::CellNotAssigned { .. } => panic!(),
             VerifyFailure::ConstraintPoisoned { .. } => panic!(),
             VerifyFailure::Permutation { .. } => panic!(),
+            &VerifyFailure::InstanceCellNotAssigned { .. } | &VerifyFailure::Shuffle { .. } => {
+                todo!()
+            }
         }
     }
 }

zkevm-circuits/src/copy_circuit/test.rs

@@ -445,6 +445,7 @@ use crate::util::MockChallenges as Challenges;
 impl<F: Field> Circuit<F> for EvmCircuit<F> {
     type Config = (EvmCircuitConfig<F>, Challenges);
     type FloorPlanner = SimpleFloorPlanner;
+    type Params = ();
 
     fn without_witnesses(&self) -> Self {
         Self::default()

zkevm-circuits/src/evm_circuit.rs

@@ -28,7 +28,6 @@ use bus_mapping::util::read_env_var;
 use eth_types::{Field, ToLittleEndian};
 use gadgets::util::not;
 use halo2_proofs::{
-    arithmetic::FieldExt,
     circuit::{Layouter, Region, Value},
     plonk::{
         Advice, Assigned, Column, ConstraintSystem, Error, Expression, FirstPhase, Fixed, Selector,
@@ -223,7 +222,7 @@ use sstore::SstoreGadget;
 use stop::StopGadget;
 use swap::SwapGadget;
 
-pub(crate) trait ExecutionGadget<F: FieldExt> {
+pub(crate) trait ExecutionGadget<F: Field> {
     const NAME: &'static str;
 
     const EXECUTION_STATE: ExecutionState;

zkevm-circuits/src/evm_circuit/execution.rs

@@ -58,13 +58,13 @@ impl<F: Field> ExecutionGadget<F> for MulModGadget<F> {
         let d = cb.query_word_rlc();
         let e = cb.query_word_rlc();
 
-        // 1.  k1 * n + a_reduced  == a
+        // 1. k1 * n + a_reduced  == a
         let modword = ModGadget::construct(cb, [&a, &n, &a_reduced]);
 
-        // 2.  a_reduced * b + 0 == d * 2^256 + e
+        // 2. a_reduced * b + 0 == d * 2^256 + e
         let mul512_left = MulAddWords512Gadget::construct(cb, [&a_reduced, &b, &d, &e], None);
 
-        // 3.  k2 * n + r == d * 2^256 + e
+        // 3. k2 * n + r == d * 2^256 + e
         let mul512_right = MulAddWords512Gadget::construct(cb, [&k, &n, &d, &e], Some(&r));
 
         // (r < n ) or n == 0

zkevm-circuits/src/evm_circuit/execution/mulmod.rs

@@ -1,3 +1,5 @@
+use std::marker::ConstParamTy;
+
 use eth_types::{Field, ToScalar};
 use gadgets::util::Expr;
 use halo2_proofs::{circuit::Value, plonk::Error};

zkevm-circuits/src/evm_circuit/execution/precompiles/mod.rs

@@ -419,7 +419,7 @@ impl<F: Field> ModExpInputs<F> {
             input_limbs.assign(region, offset, val_r)?;
         }
 
-        for (val, input_bytes) in values.zip([&self.base, &self.exp, &self.modulus]) {
+        for (&val, input_bytes) in values.iter().zip([&self.base, &self.exp, &self.modulus]) {
             assign_word(region, offset, input_bytes, val)?;
         }
 
@@ -977,6 +977,7 @@ mod test {
         precompile::PrecompileCalls,
     };
     use eth_types::{bytecode, word, ToWord};
+    use ethers_core::k256::elliptic_curve::PrimeField;
     use itertools::Itertools;
     use mock::TestContext;
 
@@ -985,7 +986,7 @@ mod test {
     #[test]
     fn test_limbs() {
         use crate::table::ModExpTable;
-        use halo2_proofs::{arithmetic::FieldExt, halo2curves::bn256::Fr};
+        use halo2_proofs::halo2curves::bn256::Fr;
         use misc_precompiled_circuit::circuits::modexp::Number;
         use num_bigint::BigUint;
 

zkevm-circuits/src/evm_circuit/execution/precompiles/modexp.rs

@@ -1,3 +1,5 @@
+use std::marker::ConstParamTy;
+
 use super::util::{CachedRegion, CellManager, CellType};
 use crate::{
     evm_circuit::{
@@ -9,9 +11,8 @@ use crate::{
     witness::Transaction,
 };
 use bus_mapping::{evm::OpcodeId, precompile::PrecompileCalls};
-use eth_types::evm_types::GasCost;
+use eth_types::{evm_types::GasCost, Field};
 use halo2_proofs::{
-    arithmetic::FieldExt,
     circuit::Value,
     plonk::{Advice, Column, ConstraintSystem, Error, Expression},
 };
@@ -36,7 +37,7 @@ impl From<PrecompileCalls> for ExecutionState {
 }
 
 #[allow(non_camel_case_types)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, EnumIter)]
+#[derive(ConstParamTy, Clone, Copy, Debug, PartialEq, Eq, Hash, EnumIter)]
 pub enum ExecutionState {
     // Internal state
     BeginTx,
@@ -433,7 +434,7 @@ pub(crate) struct DynamicSelectorHalf<F> {
     pub(crate) target_pairs: Vec<Cell<F>>,
 }
 
-impl<F: FieldExt> DynamicSelectorHalf<F> {
+impl<F: Field> DynamicSelectorHalf<F> {
     pub(crate) fn new(cell_manager: &mut CellManager<F>, count: usize) -> Self {
         let target_pairs = cell_manager.query_cells(CellType::StoragePhase1, (count + 1) / 2);
         let target_odd = cell_manager.query_cell(CellType::StoragePhase1);
@@ -567,7 +568,7 @@ pub(crate) struct Step<F> {
     pub(crate) cell_manager: CellManager<F>,
 }
 
-impl<F: FieldExt> Step<F> {
+impl<F: Field> Step<F> {
     pub(crate) fn new(
         meta: &mut ConstraintSystem<F>,
         advices: [Column<Advice>; STEP_WIDTH],