diff --git a/Cargo.toml b/Cargo.toml index 0ddd568e4..1d156cbe4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,3 +21,6 @@ codegen-units = 1 [patch.crates-io] zcash_encoding = { path = "components/zcash_encoding" } zcash_note_encryption = { path = "components/zcash_note_encryption" } +orchard = { git = "https://github.com/zcash/orchard.git", rev = "61a67f018f456da980de7f93a5ea2a1dc5a61e63" } +halo2_gadgets = { git = "https://github.com/zcash/halo2.git", rev = "35eb268e202d76721abde3d6e50e719ae9140605" } +halo2_proofs = { git = "https://github.com/zcash/halo2.git", rev = "35eb268e202d76721abde3d6e50e719ae9140605" } diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md index 6f1b10c5c..58bcb71d6 100644 --- a/zcash_client_backend/CHANGELOG.md +++ b/zcash_client_backend/CHANGELOG.md @@ -7,6 +7,9 @@ and this library adheres to Rust's notion of ## [Unreleased] +### Changed +- Bumped dependencies to `bls12_381 0.8`, `group 0.13`, + ## [0.7.0] - 2023-02-01 ### Added - `zcash_client_backend::data_api::wallet`: diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml index 816d19970..61e1c6668 100644 --- a/zcash_client_backend/Cargo.toml +++ b/zcash_client_backend/Cargo.toml @@ -51,8 +51,8 @@ secrecy = "0.8" subtle = "2.2.3" # - Shielded protocols -bls12_381 = "0.7" -group = "0.12" +bls12_381 = "0.8" +group = "0.13" orchard = "0.3" # - Test dependencies @@ -79,7 +79,7 @@ which = "4" assert_matches = "1.5" gumdrop = "0.8" hex = "0.4" -jubjub = "0.9" +jubjub = "0.10" proptest = "1.0.0" rand_core = "0.6" rand_xorshift = "0.3" diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md index 92e075519..29e7b3670 100644 --- a/zcash_client_sqlite/CHANGELOG.md +++ b/zcash_client_sqlite/CHANGELOG.md @@ -7,6 +7,9 @@ and this library adheres to Rust's notion of ## [Unreleased] +### Changed +- Bumped dependencies to `group 0.13`, `jubjub 0.10` + ## [0.7.0] - 2023-02-01 ### Added - `zcash_client_sqlite::FsBlockDb::rewind_to_height` rewinds the BlockMeta Db diff --git a/zcash_client_sqlite/Cargo.toml b/zcash_client_sqlite/Cargo.toml index 7f0d9e892..6f9babb24 100644 --- a/zcash_client_sqlite/Cargo.toml +++ b/zcash_client_sqlite/Cargo.toml @@ -33,8 +33,8 @@ prost = "0.11" secrecy = "0.8" # - SQLite databases -group = "0.12" -jubjub = "0.9" +group = "0.13" +jubjub = "0.10" rusqlite = { version = "0.25", features = ["bundled", "time", "array"] } schemer = "0.2" schemer-rusqlite = "0.2.1" diff --git a/zcash_extensions/Cargo.toml b/zcash_extensions/Cargo.toml index e4abbb795..928365000 100644 --- a/zcash_extensions/Cargo.toml +++ b/zcash_extensions/Cargo.toml @@ -14,8 +14,8 @@ blake2b_simd = "1" zcash_primitives = { version = "0.10", path = "../zcash_primitives", features = ["zfuture" ] } [dev-dependencies] -ff = "0.12" -jubjub = "0.9" +ff = "0.13" +jubjub = "0.10" rand_core = "0.6" zcash_address = { version = "0.2", path = "../components/zcash_address" } zcash_proofs = { version = "0.10", path = "../zcash_proofs" } diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 7dedd1b59..9eb1c5d4c 100644 --- a/zcash_primitives/CHANGELOG.md +++ b/zcash_primitives/CHANGELOG.md @@ -7,6 +7,9 @@ and this library adheres to Rust's notion of ## [Unreleased] +### Changed +- Bumped dependencies to `bls12_381 0.8`, `ff 0.13`, `group 0.13`, `jubjub 0.10` + ## [0.10.2] - 2023-03-16 ### Added - `zcash_primitives::sapling::note`: diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index 75c1eda48..64d95f42e 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -39,11 +39,11 @@ memuse = "0.2.1" subtle = "2.2.3" # - Shielded protocols -bls12_381 = "0.7" -ff = "0.12" -group = { version = "0.12.1", features = ["wnaf-memuse"] } +bls12_381 = "0.8" +ff = "0.13" +group = { version = "0.13", features = ["wnaf-memuse"] } incrementalmerkletree = "0.3" -jubjub = "0.9" +jubjub = "0.10" nonempty = "0.7" orchard = "0.3" diff --git a/zcash_proofs/CHANGELOG.md b/zcash_proofs/CHANGELOG.md index 5b7f65895..0c99c65b3 100644 --- a/zcash_proofs/CHANGELOG.md +++ b/zcash_proofs/CHANGELOG.md @@ -7,6 +7,9 @@ and this library adheres to Rust's notion of ## [Unreleased] +### Changed +- Bumped dependencies to `bls12_381 0.8`, `group 0.13`, `jubjub 0.10` + ## [0.10.0] - 2023-02-01 ### Added - `zcash_proofs::circuit::sapling`: diff --git a/zcash_proofs/Cargo.toml b/zcash_proofs/Cargo.toml index 81ee5f29c..69cf112ba 100644 --- a/zcash_proofs/Cargo.toml +++ b/zcash_proofs/Cargo.toml @@ -21,10 +21,10 @@ zcash_primitives = { version = "0.10", path = "../zcash_primitives" } # Dependencies exposed in a public API: # (Breaking upgrades to these require a breaking upgrade to this crate.) -bellman = { version = "0.13.1", default-features = false, features = ["groth16"] } -bls12_381 = "0.7" -group = "0.12" -jubjub = "0.9" +bellman = { version = "0.14", default-features = false, features = ["groth16"] } +bls12_381 = "0.8" +group = "0.13" +jubjub = "0.10" lazy_static = "1" minreq = { version = "2", features = ["https"], optional = true } rand_core = "0.6" diff --git a/zcash_proofs/src/circuit/sprout/input.rs b/zcash_proofs/src/circuit/sprout/input.rs index c0f536349..39a2d4170 100644 --- a/zcash_proofs/src/circuit/sprout/input.rs +++ b/zcash_proofs/src/circuit/sprout/input.rs @@ -107,7 +107,7 @@ impl InputNote { // if enforce is one, they must be equal cs.enforce( || format!("conditionally enforce correct root for bit {}", i), - |_| cur.lc(CS::one(), Scalar::one()) - &rt.lc(CS::one(), Scalar::one()), + |_| cur.lc(CS::one(), Scalar::ONE) - &rt.lc(CS::one(), Scalar::ONE), |lc| lc + enforce.get_variable(), |lc| lc, ); @@ -156,9 +156,9 @@ where // x = rhs cs.enforce( || "conditional swap for x", - |lc| lc + &rhs.lc(CS::one(), Scalar::one()) - &lhs.lc(CS::one(), Scalar::one()), + |lc| lc + &rhs.lc(CS::one(), Scalar::ONE) - &lhs.lc(CS::one(), Scalar::ONE), |lc| lc + condition.get_variable(), - |lc| lc + &x.lc(CS::one(), Scalar::one()) - &lhs.lc(CS::one(), Scalar::one()), + |lc| lc + &x.lc(CS::one(), Scalar::ONE) - &lhs.lc(CS::one(), Scalar::ONE), ); let y = Boolean::from(AllocatedBit::alloc( @@ -172,9 +172,9 @@ where // y - rhs = condition (lhs - rhs) cs.enforce( || "conditional swap for y", - |lc| lc + &lhs.lc(CS::one(), Scalar::one()) - &rhs.lc(CS::one(), Scalar::one()), + |lc| lc + &lhs.lc(CS::one(), Scalar::ONE) - &rhs.lc(CS::one(), Scalar::ONE), |lc| lc + condition.get_variable(), - |lc| lc + &y.lc(CS::one(), Scalar::one()) - &rhs.lc(CS::one(), Scalar::one()), + |lc| lc + &y.lc(CS::one(), Scalar::ONE) - &rhs.lc(CS::one(), Scalar::ONE), ); new_lhs.push(x); diff --git a/zcash_proofs/src/circuit/sprout/mod.rs b/zcash_proofs/src/circuit/sprout/mod.rs index 6524bea7f..7adddb079 100644 --- a/zcash_proofs/src/circuit/sprout/mod.rs +++ b/zcash_proofs/src/circuit/sprout/mod.rs @@ -264,7 +264,7 @@ impl NoteValue { fn lc(&self) -> LinearCombination { let mut tmp = LinearCombination::zero(); - let mut coeff = Scalar::one(); + let mut coeff = Scalar::ONE; for b in &self.bits { tmp = tmp + (coeff, b.get_variable()); coeff = coeff.double();