diff --git a/Cargo.lock b/Cargo.lock index 8bd1ed6b9d..f13adce1ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2468,18 +2468,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "halo2wrong" -version = "0.1.0" -source = "git+https://github.com/scroll-tech/halo2wrong?branch=halo2-ecc-snark-verifier-0323#939d679cb16abf0e820bd606248661e400328afa" -dependencies = [ - "group 0.12.1", - "halo2_proofs", - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "handlebars" version = "4.4.0" @@ -3046,20 +3034,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "maingate" -version = "0.1.0" -source = "git+https://github.com/scroll-tech/halo2wrong?branch=halo2-ecc-snark-verifier-0323#939d679cb16abf0e820bd606248661e400328afa" -dependencies = [ - "group 0.12.1", - "halo2wrong", - "num-bigint", - "num-integer", - "num-traits", - "rand", - "subtle", -] - [[package]] name = "md-5" version = "0.10.5" @@ -5835,7 +5809,6 @@ dependencies = [ "keccak256", "lazy_static", "log", - "maingate", "misc-precompiled-circuit", "mock", "mpt-zktrie", diff --git a/Cargo.toml b/Cargo.toml index 71c84e5283..872fbe754b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,8 +68,6 @@ halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "dev poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "scroll-dev-0220" } [patch."https://github.com/privacy-scaling-explorations/halo2curves.git"] halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" } -[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] diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml index 3ba0770015..bab2f3692d 100644 --- a/zkevm-circuits/Cargo.toml +++ b/zkevm-circuits/Cargo.toml @@ -37,8 +37,6 @@ misc-precompiled-circuit = { package = "misc-precompiled-circuit", git = "https: 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"] } -maingate = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2023_02_02" } - num-bigint.workspace = true subtle.workspace = true rand_chacha.workspace = true @@ -76,4 +74,4 @@ debug-annotations = [] enable-stack = ["bus-mapping/enable-stack"] enable-memory = ["bus-mapping/enable-memory"] -enable-storage = ["bus-mapping/enable-storage"] \ No newline at end of file +enable-storage = ["bus-mapping/enable-storage"]