From feedd693ddf46cb96e03343c2f528827e6629578 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 22 Mar 2023 12:53:11 -0600 Subject: [PATCH] Update to halo2_proofs and halo2_gadgets v0.3.0 Fixes #376 --- CHANGELOG.md | 2 +- Cargo.toml | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 298478ee..7d56bb2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ and this project adheres to Rust's notion of ### Changed - MSRV is now 1.60.0. - Migrated to `ff 0.13`, `group 0.13`, `pasta_curves 0.5`, `halo2_proofs 0.3`, - `reddsa 0.5`, `zcash_note_encryption 0.3`. + `halo2_gadgets 0.3`, `reddsa 0.5`, `zcash_note_encryption 0.3`. - `orchard::builder`: - `Builder::{add_spend, add_output}` now use concrete error types instead of `&'static str`s. diff --git a/Cargo.toml b/Cargo.toml index 29e11c5e..68747e9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,8 +29,8 @@ blake2b_simd = "1" ff = "0.13" fpe = "0.5" group = { version = "0.13", features = ["wnaf-memuse"] } -halo2_gadgets = "0.2" -halo2_proofs = { version = "0.2", default-features = false, features = ["batch", "floor-planner-v1-legacy-pdqsort"] } +halo2_gadgets = "0.3" +halo2_proofs = { version = "0.3", default-features = false, features = ["batch", "floor-planner-v1-legacy-pdqsort"] } hex = "0.4" lazy_static = "1" memuse = { version = "0.2.1", features = ["nonempty"] } @@ -53,7 +53,7 @@ plotters = { version = "0.3.0", optional = true } [dev-dependencies] criterion = "0.3" -halo2_gadgets = { version = "0.2", features = ["test-dependencies"] } +halo2_gadgets = { version = "0.3", features = ["test-dependencies"] } hex = "0.4" proptest = "1.0.0" zcash_note_encryption = { version = "0.3", features = ["pre-zip-212"] } @@ -88,7 +88,3 @@ debug = true [profile.bench] debug = true - -[patch.crates-io] -halo2_gadgets = { git = "https://github.com/zcash/halo2.git", rev = "642924d614305d882cc122739c59144109f4bd3f" } -halo2_proofs = { git = "https://github.com/zcash/halo2.git", rev = "642924d614305d882cc122739c59144109f4bd3f" }