fix build

Author: ChihChengLiang

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

@@ -27,7 +27,7 @@ use crate::{
     },
 };
 use bus_mapping::state_db::CodeDB;
-use eth_types::{evm_types::PRECOMPILE_COUNT, keccak256, Field, ToWord, U256};
+use eth_types::{evm_types::PRECOMPILE_COUNT, keccak256, Field, OpsIdentity, ToWord, U256};
 use halo2_proofs::{
     circuit::Value,
     plonk::{Error, Expression},

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

@@ -31,7 +31,9 @@ use bus_mapping::{
     evm::OpcodeId,
     precompile::{is_precompiled, PrecompileCalls},
 };
-use eth_types::{evm_types::GAS_STIPEND_CALL_WITH_VALUE, Field, ToAddress, ToScalar, U256};
+use eth_types::{
+    evm_types::GAS_STIPEND_CALL_WITH_VALUE, Field, OpsIdentity, ToAddress, ToScalar, U256,
+};
 use halo2_proofs::{circuit::Value, plonk::Error};
 use std::cmp::min;
 

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

@@ -34,7 +34,7 @@ use bus_mapping::{
 };
 use eth_types::{
     evm_types::{GasCost, INIT_CODE_WORD_GAS},
-    Field, ToBigEndian, ToScalar, ToWord, U256,
+    Field, OpsIdentity, ToBigEndian, ToScalar, ToWord, U256,
 };
 use ethers_core::utils::keccak256;
 use gadgets::util::{and, select};

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

@@ -14,7 +14,7 @@ use crate::{
     table::{CallContextFieldTag, TxContextFieldTag},
     util::{word::Word, Expr},
 };
-use eth_types::Field;
+use eth_types::{Field, OpsIdentity};
 use gadgets::util::select;
 use halo2_proofs::{circuit::Value, plonk::Error};
 

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

@@ -17,7 +17,7 @@ use crate::{
     witness::{Block, Call, ExecStep, Transaction},
 };
 use bus_mapping::evm::OpcodeId;
-use eth_types::{Field, U256};
+use eth_types::{Field, OpsIdentity, U256};
 use halo2_proofs::{circuit::Value, plonk::Error};
 
 #[derive(Clone, Debug)]

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

@@ -16,7 +16,7 @@ use crate::{
         Expr,
     },
 };
-use eth_types::{evm_types::OpcodeId, Field, ToAddress, U256};
+use eth_types::{evm_types::OpcodeId, Field, OpsIdentity, ToAddress, U256};
 use halo2_proofs::{circuit::Value, plonk::Error};
 
 #[derive(Clone, Debug)]

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

@@ -21,7 +21,7 @@ use crate::{
     },
 };
 use bus_mapping::evm::OpcodeId;
-use eth_types::Field;
+use eth_types::{Field, OpsIdentity};
 use halo2_proofs::{circuit::Value, plonk::Error};
 
 #[derive(Clone, Debug)]

zkevm-circuits/src/evm_circuit/util/common_gadget.rs

@@ -28,7 +28,9 @@ use crate::{
     witness::{Block, Call, ExecStep},
 };
 use bus_mapping::state_db::CodeDB;
-use eth_types::{evm_types::GasCost, Field, ToAddress, ToLittleEndian, ToScalar, ToWord, U256};
+use eth_types::{
+    evm_types::GasCost, Field, OpsIdentity, ToAddress, ToLittleEndian, ToScalar, ToWord, U256,
+};
 use gadgets::util::{select, sum};
 use halo2_proofs::{
     circuit::Value,

zkevm-circuits/src/evm_circuit/util/constraint_builder.rs

@@ -18,7 +18,7 @@ use crate::{
 use bus_mapping::{
     circuit_input_builder::FeatureConfig, operation::Target, state_db::EMPTY_CODE_HASH_LE,
 };
-use eth_types::Field;
+use eth_types::{Field, OpsIdentity};
 use gadgets::util::{not, sum};
 use halo2_proofs::{
     circuit::Value,

zkevm-circuits/src/mpt_circuit/account_leaf.rs

@@ -1,4 +1,4 @@
-use eth_types::{Field, U256};
+use eth_types::{Field, OpsIdentity, U256};
 use gadgets::util::{pow, Scalar};
 use halo2_proofs::{
     circuit::Value,
@@ -554,10 +554,10 @@ impl<F: Field> AccountLeafConfig<F> {
 
         // Key
         let mut key_rlc = vec![0.scalar(); 2];
-        let mut nonce = vec![Word::zero_f(); 2];
-        let mut balance = vec![Word::zero_f(); 2];
-        let mut storage = vec![Word::zero_f(); 2];
-        let mut codehash = vec![Word::zero_f(); 2];
+        let mut nonce = vec![Word::zero(); 2];
+        let mut balance = vec![Word::zero(); 2];
+        let mut storage = vec![Word::zero(); 2];
+        let mut codehash = vec![Word::zero(); 2];
         let mut key_data = vec![KeyDataWitness::default(); 2];
         let mut parent_data = vec![ParentDataWitness::default(); 2];
         for is_s in [true, false] {
@@ -727,11 +727,11 @@ impl<F: Field> AccountLeafConfig<F> {
         } else if is_codehash_mod {
             (MPTProofType::CodeHashChanged, codehash)
         } else if is_account_delete_mod {
-            (MPTProofType::AccountDestructed, vec![Word::zero_f(); 2])
+            (MPTProofType::AccountDestructed, vec![Word::zero(); 2])
         } else if is_non_existing_proof {
-            (MPTProofType::AccountDoesNotExist, vec![Word::zero_f(); 2])
+            (MPTProofType::AccountDoesNotExist, vec![Word::zero(); 2])
         } else {
-            (MPTProofType::Disabled, vec![Word::zero_f(); 2])
+            (MPTProofType::Disabled, vec![Word::zero(); 2])
         };
 
         if account.is_mod_extension[0] || account.is_mod_extension[1] {
@@ -746,10 +746,10 @@ impl<F: Field> AccountLeafConfig<F> {
         let mut new_value = value[false.idx()];
         let mut old_value = value[true.idx()];
         if parent_data[false.idx()].is_placeholder {
-            new_value = word::Word::zero_f();
+            new_value = word::Word::zero();
         } else if is_non_existing_proof {
-            new_value = word::Word::zero_f();
-            old_value = word::Word::zero_f();
+            new_value = word::Word::zero();
+            old_value = word::Word::zero();
         }
         mpt_config.mpt_table.assign_cached(
             region,
@@ -758,7 +758,7 @@ impl<F: Field> AccountLeafConfig<F> {
                 address: Value::known(from_bytes::value(
                     &account.address.iter().cloned().rev().collect::<Vec<_>>(),
                 )),
-                storage_key: word::Word::zero_f().into_value(),
+                storage_key: word::Word::zero().into_value(),
                 proof_type: Value::known(proof_type.scalar()),
                 new_root: main_data.new_root.into_value(),
                 old_root: main_data.old_root.into_value(),