diff --git a/Cargo.toml b/Cargo.toml index 94e569ee..b7878ae8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,3 @@ members = [ "halo2_gadgets", "halo2_proofs", ] - -[patch.crates-io] -ff = { git = "https://github.com/zkcrypto/ff.git", rev = "c555625ab4e6e26560ec5323fd99fef6eba18365" } -pasta_curves = { git = "https://github.com/zcash/pasta_curves.git", rev = "825cb944decfab4b1a64380d15a43eb93899dfad" } diff --git a/halo2_gadgets/CHANGELOG.md b/halo2_gadgets/CHANGELOG.md index 43e17cf5..d81268d1 100644 --- a/halo2_gadgets/CHANGELOG.md +++ b/halo2_gadgets/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to Rust's notion of - `halo2_gadgets::poseidon::primitives::{Mds, generate_constants}` ### Changed +- Migrated to `ff 0.13`, `group 0.13`, `pasta_curves 0.5`. - APIs with `F: pasta_curves::arithmetic::FieldExt` bounds have been changed to use `ff` traits directly. diff --git a/halo2_gadgets/Cargo.toml b/halo2_gadgets/Cargo.toml index 758a43a1..c2e80d10 100644 --- a/halo2_gadgets/Cargo.toml +++ b/halo2_gadgets/Cargo.toml @@ -24,11 +24,11 @@ rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"] [dependencies] arrayvec = "0.7.0" bitvec = "1" -ff = "0.12" -group = "0.12" +ff = "0.13" +group = "0.13" halo2_proofs = { version = "0.2", path = "../halo2_proofs" } lazy_static = "1" -pasta_curves = "0.4" +pasta_curves = "0.5" proptest = { version = "1.0.0", optional = true } rand = "0.8" subtle = "2.3" diff --git a/halo2_proofs/CHANGELOG.md b/halo2_proofs/CHANGELOG.md index 597838a5..a98c82eb 100644 --- a/halo2_proofs/CHANGELOG.md +++ b/halo2_proofs/CHANGELOG.md @@ -21,7 +21,7 @@ and this project adheres to Rust's notion of instance values within a region. ### Changed -- Migrated to `ff 0.13`. +- Migrated to `ff 0.13`, `group 0.13`, `pasta_curves 0.5`. - APIs with `F: pasta_curves::arithmetic::FieldExt` bounds have been changed to use `ff` traits directly. - `halo2_proofs::arithmetic`: diff --git a/halo2_proofs/Cargo.toml b/halo2_proofs/Cargo.toml index e4338ae8..c541afc2 100644 --- a/halo2_proofs/Cargo.toml +++ b/halo2_proofs/Cargo.toml @@ -46,9 +46,9 @@ harness = false [dependencies] backtrace = { version = "0.3", optional = true } rayon = "1.5.1" -ff = "0.12" -group = "0.12" -pasta_curves = "0.4" +ff = "0.13" +group = "0.13" +pasta_curves = "0.5" rand_core = { version = "0.6", default-features = false } tracing = "0.1" blake2b_simd = "1"