Fix rebase main issues

privacy-scaling-explorations · May 2, 2022 · 524b2bd · 524b2bd
1 parent 18191e0
commit 524b2bd
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gadgets/src/evm_word.rs b/gadgets/src/evm_word.rs
@@ -25,10 +25,10 @@ use halo2_proofs::circuit::Layouter;
 pub fn r<F: Field>() -> F {
     let mut hasher = Keccak256::new();
     for byte in 0..=u8::MAX {
-        hasher.update(&[byte]);
+        hasher.process(&[byte]);
     }
     let mut r = [0; 64];
-    r[..32].copy_from_slice(hasher.finalize().as_slice());
+    r[..32].copy_from_slice(hasher.fixed_result().as_slice());
     F::from_bytes_wide(&r)
 }
 

diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8"
 itertools = "0.10.3"
 lazy_static = "1.4"
 keccak256 = { path = "../keccak256"}
-log = "0.4.14"
+log = "0.4"
 env_logger = "0.9"
 # ecdsa = { git = "https://github.com/appliedzkp/halo2wrong.git", rev = "00b90e8c3198de0a73cdb6308f7dbea2bd6f24cc", features = ["kzg"] }
 # TODO: Replace by github path once https://github.com/appliedzkp/halo2wrong/pull/25 is merged
@@ -41,7 +41,6 @@ generic-array = "0.12.4"
 libsecp256k1 = "0.7"
 rlp = "0.5"
 num-bigint = { version = "0.4" }
-log = "0.4"
 subtle = "2.4"
 
 [dev-dependencies]

diff --git a/zkevm-circuits/src/tx_circuit/sign_verify.rs b/zkevm-circuits/src/tx_circuit/sign_verify.rs
@@ -1,10 +1,10 @@
 use crate::{
     evm_circuit::util::{not, RandomLinearCombination, Word},
-    gadget::is_zero::{IsZeroChip, IsZeroConfig, IsZeroInstruction},
     util::Expr,
 };
 use ecc::{EccConfig, GeneralEccChip};
 use ecdsa::ecdsa::{AssignedEcdsaSig, AssignedPublicKey, EcdsaChip};
+use gadgets::is_zero::{IsZeroChip, IsZeroConfig, IsZeroInstruction};
 use group::{ff::Field, prime::PrimeCurveAffine, Curve};
 use halo2_proofs::{
     arithmetic::{BaseExt, CurveAffine},