diff --git a/Cargo.lock b/Cargo.lock index 54559fc977..70397d65d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "ecc" version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_08_24#56639b615295e08e0ef145d8a0c3876f606a7c5c" +source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" dependencies = [ "group", "integer", @@ -992,7 +992,7 @@ dependencies = [ [[package]] name = "ecdsa" version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_08_24#56639b615295e08e0ef145d8a0c3876f606a7c5c" +source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" dependencies = [ "ecc", "group", @@ -1778,7 +1778,7 @@ dependencies = [ [[package]] name = "halo2_proofs" version = "0.2.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2.git?tag=v2022_08_19#0cccba00d16065465c36dce51714637c428bd24c" +source = "git+https://github.com/privacy-scaling-explorations/halo2.git?tag=v2022_09_10#a9e99a72a65d7c98e8a4258c2c94269c834d1c10" dependencies = [ "blake2b_simd", "ff", @@ -1809,7 +1809,7 @@ dependencies = [ [[package]] name = "halo2wrong" version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_08_24#56639b615295e08e0ef145d8a0c3876f606a7c5c" +source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" dependencies = [ "group", "halo2_proofs 0.2.0", @@ -2079,7 +2079,7 @@ dependencies = [ [[package]] name = "integer" version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_08_24#56639b615295e08e0ef145d8a0c3876f606a7c5c" +source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" dependencies = [ "group", "maingate", @@ -2311,7 +2311,7 @@ dependencies = [ [[package]] name = "maingate" version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_08_24#56639b615295e08e0ef145d8a0c3876f606a7c5c" +source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" dependencies = [ "group", "halo2wrong", diff --git a/Cargo.toml b/Cargo.toml index c3f3cc449d..a7deb1a3db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ members = [ ] [patch.crates-io] -halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_08_19" } +halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" } # Definition of benchmarks profile to use. [profile.bench] diff --git a/bus-mapping/Cargo.toml b/bus-mapping/Cargo.toml index d8d47aa727..9da3ba6d1b 100644 --- a/bus-mapping/Cargo.toml +++ b/bus-mapping/Cargo.toml @@ -13,7 +13,7 @@ mock = { path = "../mock", optional = true } ethers-core = "0.17.0" ethers-providers = "0.17.0" -halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_08_19" } +halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" } itertools = "0.10" lazy_static = "1.4" log = "0.4.14" diff --git a/circuit-benchmarks/Cargo.toml b/circuit-benchmarks/Cargo.toml index 1ee2b8e1ad..eaced86c4c 100644 --- a/circuit-benchmarks/Cargo.toml +++ b/circuit-benchmarks/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_08_19" } +halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" } ark-std = { version = "0.3", features = ["print-trace"] } zkevm-circuits = { path = "../zkevm-circuits" } keccak256 = { path = "../keccak256" } diff --git a/eth-types/Cargo.toml b/eth-types/Cargo.toml index a7cb1ff00c..4f533f551b 100644 --- a/eth-types/Cargo.toml +++ b/eth-types/Cargo.toml @@ -10,7 +10,7 @@ ethers-core = "0.17.0" ethers-signers = "0.17.0" hex = "0.4" lazy_static = "1.4" -halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_08_19" } +halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" } regex = "1.5.4" serde = {version = "1.0.130", features = ["derive"] } serde_json = "1.0.66" diff --git a/gadgets/Cargo.toml b/gadgets/Cargo.toml index 252614040e..3e72f464c5 100644 --- a/gadgets/Cargo.toml +++ b/gadgets/Cargo.toml @@ -6,7 +6,7 @@ authors = ["The appliedzkp team"] license = "MIT OR Apache-2.0" [dependencies] -halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_08_19" } +halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" } sha3 = "0.7.2" eth-types = { path = "../eth-types" } digest = "0.7.6" diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index f5e79b9d68..c2c84b8004 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -19,7 +19,7 @@ url = "2.2.2" pretty_assertions = "1.0.0" log = "0.4.14" env_logger = "0.9" -halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_08_19" } +halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" } rand_chacha = "0.3" paste = "1.0" diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml index f9f753f03e..0e8782632c 100644 --- a/zkevm-circuits/Cargo.toml +++ b/zkevm-circuits/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_08_19" } +halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" } num = "0.4" sha3 = "0.10" array-init = "2.0.0" @@ -25,10 +25,10 @@ lazy_static = "1.4" keccak256 = { path = "../keccak256"} log = "0.4" env_logger = "0.9" -ecdsa = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_08_24" } -ecc = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_08_24" } -maingate = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_08_24" } -integer = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_08_24" } +ecdsa = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09" } +ecc = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09" } +maingate = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09" } +integer = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09" } libsecp256k1 = "0.7" num-bigint = { version = "0.4" } subtle = "2.4" diff --git a/zkevm-circuits/src/evm_circuit/util.rs b/zkevm-circuits/src/evm_circuit/util.rs index 79867a4d7a..6ada68a301 100644 --- a/zkevm-circuits/src/evm_circuit/util.rs +++ b/zkevm-circuits/src/evm_circuit/util.rs @@ -169,6 +169,7 @@ impl StoredExpression { instance_query.rotation(), ) }, + &|_| unimplemented!(), &|a| -a, &|a, b| a + b, &|a, b| a * b, diff --git a/zkevm-circuits/src/tx_circuit/sign_verify.rs b/zkevm-circuits/src/tx_circuit/sign_verify.rs index 7ea50c9b32..6d9bd15bd2 100644 --- a/zkevm-circuits/src/tx_circuit/sign_verify.rs +++ b/zkevm-circuits/src/tx_circuit/sign_verify.rs @@ -257,10 +257,7 @@ pub(crate) struct KeccakAux { impl SignVerifyConfig { pub(crate) fn load_range(&self, layouter: &mut impl Layouter) -> Result<(), Error> { let range_chip = RangeChip::::new(self.range_config.clone()); - range_chip.load_composition_tables(layouter)?; - range_chip.load_overflow_tables(layouter)?; - - Ok(()) + range_chip.load_table(layouter) } pub(crate) fn ecc_chip_config(&self) -> EccConfig {