From bfbc57240b4bf94c18d1674bd036e637f5d62ecf Mon Sep 17 00:00:00 2001 From: zhenfei Date: Mon, 4 Dec 2023 22:44:49 -0500 Subject: [PATCH] chore: update links --- Cargo.lock | 27 ++++++++------------------- Cargo.toml | 4 ++-- snark-verifier-sdk/Cargo.toml | 2 +- snark-verifier/Cargo.toml | 4 ++-- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca58b465..26d46661 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -670,11 +670,11 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "halo2-base" version = "0.2.2" -source = "git+https://github.com/scroll-tech/halo2-lib.git?branch=sync-ff-0.13#17318039da63711d307fac5013a4ada227b456fe" +source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#b7c53bb7456063936f4ca6df8fa8e751d9c17d85" dependencies = [ "ff 0.13.0", "halo2_proofs 0.2.0 (git+https://github.com/axiom-crypto/halo2.git?tag=v2023_01_17)", - "halo2_proofs 0.2.0 (git+https://github.com/scroll-tech/halo2.git?branch=sync-ff-0.13)", + "halo2_proofs 0.2.0 (git+https://github.com/scroll-tech/halo2.git?branch=v1.0)", "itertools", "jemallocator", "num-bigint", @@ -687,7 +687,7 @@ dependencies = [ [[package]] name = "halo2-ecc" version = "0.2.2" -source = "git+https://github.com/scroll-tech/halo2-lib.git?branch=sync-ff-0.13#17318039da63711d307fac5013a4ada227b456fe" +source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#b7c53bb7456063936f4ca6df8fa8e751d9c17d85" dependencies = [ "ff 0.13.0", "group 0.13.0", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "halo2_proofs" version = "0.2.0" -source = "git+https://github.com/scroll-tech/halo2.git?branch=sync-ff-0.13#2f80720db08d4354ad9e76e6b273b17f3d6e6fb1" +source = "git+https://github.com/scroll-tech/halo2.git?branch=v1.0#44dbed4515984bbc14cb8283e273794b03c28afa" dependencies = [ "ark-std", "blake2b_simd", @@ -731,12 +731,11 @@ dependencies = [ "group 0.13.0", "halo2curves 0.1.0", "log", - "maybe-rayon", "num-bigint", "num-integer", - "poseidon 0.2.0 (git+https://github.com/scroll-tech/poseidon.git?branch=sync-ff-0.13)", - "rand_chacha", + "poseidon 0.2.0 (git+https://github.com/scroll-tech/poseidon.git?branch=main)", "rand_core", + "rayon", "sha3 0.9.1", "subtle", "tracing", @@ -1010,16 +1009,6 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if 1.0.0", - "rayon", -] - [[package]] name = "memchr" version = "2.6.4" @@ -1349,7 +1338,7 @@ dependencies = [ [[package]] name = "poseidon" version = "0.2.0" -source = "git+https://github.com/scroll-tech/poseidon.git?branch=sync-ff-0.13#5787dd3d2ce7a9e9601a035c396ac0c03449b54d" +source = "git+https://github.com/scroll-tech/poseidon.git?branch=main#5787dd3d2ce7a9e9601a035c396ac0c03449b54d" dependencies = [ "halo2curves 0.1.0", "subtle", @@ -1810,7 +1799,7 @@ dependencies = [ "num-traits", "paste", "poseidon 0.2.0 (git+https://github.com/axiom-crypto/halo2.git?branch=axiom/dev)", - "poseidon 0.2.0 (git+https://github.com/scroll-tech/poseidon.git?branch=sync-ff-0.13)", + "poseidon 0.2.0 (git+https://github.com/scroll-tech/poseidon.git?branch=main)", "rand", "rand_chacha", "rayon", diff --git a/Cargo.toml b/Cargo.toml index 754e750a..02778f0c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ debug = true # patch until PR https://github.com/privacy-scaling-explorations/halo2/pull/111 is merged [patch."https://github.com/privacy-scaling-explorations/halo2.git"] -halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "sync-ff-0.13" } +halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.0" } [patch."https://github.com/privacy-scaling-explorations/poseidon.git"] -poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "sync-ff-0.13" } +poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "main" } diff --git a/snark-verifier-sdk/Cargo.toml b/snark-verifier-sdk/Cargo.toml index 274d7db8..735036c2 100644 --- a/snark-verifier-sdk/Cargo.toml +++ b/snark-verifier-sdk/Cargo.toml @@ -20,7 +20,7 @@ ark-std = { version = "0.3.0", features = ["print-trace"], optional = true } ff = "0.13" # halo2-base = { git = "https://github.com/axiom-crypto/halo2-lib.git", tag = "v0.2.2", default-features = false } -halo2-base = { git = "https://github.com/scroll-tech/halo2-lib.git", branch = "sync-ff-0.13" } +halo2-base = { git = "https://github.com/scroll-tech/halo2-lib.git", branch = "develop" } snark-verifier = { path = "../snark-verifier", default-features = false } # loader_evm diff --git a/snark-verifier/Cargo.toml b/snark-verifier/Cargo.toml index 4edb3ca0..c7f15a6a 100644 --- a/snark-verifier/Cargo.toml +++ b/snark-verifier/Cargo.toml @@ -15,7 +15,7 @@ rustc-hash = "1.1.0" serde = { version = "1.0", features = ["derive"] } # Use halo2-base as non-optional dependency because it re-exports halo2_proofs, halo2curves, and poseidon, using different repos based on feature flag "halo2-axiom" or "halo2-pse" -halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "sync-ff-0.13", default-features=false, features=["halo2-pse","display"] } +halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features=false, features=["halo2-pse","display"] } # This poseidon is identical to PSE (for now) but uses axiom's halo2curves; otherwise would require patching poseidon-axiom = { git = "https://github.com/axiom-crypto/halo2.git", branch = "axiom/dev", package = "poseidon", optional = true } poseidon = { git = "https://github.com/privacy-scaling-explorations/poseidon", optional = true } @@ -31,7 +31,7 @@ bytes = { version = "1.2", optional = true } rlp = { version = "0.5", default-features = false, features = ["std"], optional = true } # loader_halo2 -halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "sync-ff-0.13", optional = true, default-features=false, features=["halo2-pse","display"] } +halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", optional = true, default-features=false, features=["halo2-pse","display"] } [dev-dependencies] ark-std = { version = "0.3.0", features = ["print-trace"] }