cargo: patch halo2_proofs on crates.io and remove redundant git overr…

…ides (scroll-tech#555)
Admiral-U · Jun 7, 2022 · ba79d96 · ba79d96
1 parent 9da18be
commit ba79d96
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,6 +19,7 @@ members = [
 # and leads to a compilation error.  This can be removed once the upstream PR
 # is resolved: https://github.com/bitvecto-rs/bitvec/pull/141
 bitvec = { git = "https://github.com/ed255/bitvec.git", rev = "5cfc5fa8496c66872d21905e677120fc3e79693c" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_06_03" }
 
 # Definition of benchmarks profile to use.
 [profile.bench]

diff --git a/circuit-benchmarks/Cargo.toml b/circuit-benchmarks/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 ff = "0.11"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_06_03" }
+halo2_proofs = { version = "0.1.0-beta.1" }
 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
@@ -9,7 +9,7 @@ ethers-core = "0.6"
 ethers-providers = "0.6"
 hex = "0.4"
 lazy_static = "1.4"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_06_03" }
+halo2_proofs = { version = "0.1.0-beta.1" }
 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
@@ -5,7 +5,7 @@ edition = "2021"
 authors = ["The appliedzkp team"]
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_06_03" }
+halo2_proofs = { version = "0.1.0-beta.1" }
 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
@@ -18,7 +18,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_06_03" }
+halo2_proofs = { version = "0.1.0-beta.1" }
 ff =  "0.11"
 
 [dev-dependencies]

diff --git a/keccak256/Cargo.toml b/keccak256/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 dev-graph = ["halo2_proofs/dev-graph", "plotters"]
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_06_03" }
+halo2_proofs = { version = "0.1.0-beta.1" }
 itertools = "0.10.1"
 num-bigint = "0.4.2"
 num-traits = "0.2.14"
 plotters = { version = "0.3.0", optional = true }
-eth-types = { path = "../eth-types" } 
+eth-types = { path = "../eth-types" }
 lazy_static = "1.4"
 gadgets = { path = "../gadgets" }
 

diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -10,7 +10,7 @@ ethers-providers = "0.6"
 eth-types = { path = "../eth-types" }
 hyper = { version = "0.14.16", features = ["server"] }
 rand_xorshift = "0.3"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_06_03" }
+halo2_proofs = { version = "0.1.0-beta.1" }
 log = "0.4.14"
 rand = "0.8.4"
 serde = { version = "1.0.136", features = ["derive"] }

diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 ff = "0.11"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_06_03" }
+halo2_proofs = { version = "0.1.0-beta.1" }
 bigint = "4"
 num = "0.4"
 sha3 = "0.10"