zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #549 from zcash/ff-0.12 

Migrate to `ff 0.12`
This commit is contained in:
str4d 2022-05-06 21:59:39 +01:00 committed by GitHub
parent 2e72579bed 144512b547
commit b8dee161e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.toml
View File

@ -19,10 +19,11 @@ panic = 'abort'
codegen-units = 1
[patch.crates-io]
halo2_gadgets = { git = "https://github.com/zcash/halo2.git", rev = "0c33fa4e6e41464884765c8fb4cefebafd300ca2" }
halo2_proofs = { git = "https://github.com/zcash/halo2.git", rev = "0c33fa4e6e41464884765c8fb4cefebafd300ca2" }
halo2_gadgets = { git = "https://github.com/zcash/halo2.git", rev = "30f92f3f4b785ea2a32392bf65c1b08f0411567c" }
halo2_proofs = { git = "https://github.com/zcash/halo2.git", rev = "30f92f3f4b785ea2a32392bf65c1b08f0411567c" }
hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "9b4c1bdbe0517e3a7a8f285d6048a37d472ba3bc" }
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "f23e3d89507849a24543121839eea6f40b141aff" }
orchard = { git = "https://github.com/zcash/orchard", rev = "a30caec124aa6c6e7818b5100293204425c49de3" }
orchard = { git = "https://github.com/zcash/orchard", rev = "15007026b1181b14f45c5c8cbf32e4fe86bc8d6b" }
reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "0e912de3000fe165daf58ad98d1a22f1a66e7f18" }
zcash_encoding = { path = "components/zcash_encoding" }
zcash_note_encryption = { path = "components/zcash_note_encryption" }

4
components/zcash_note_encryption/Cargo.toml
View File

@ -24,9 +24,9 @@ rand_core = { version = "0.6", default-features = false }
subtle = { version = "2.2.3", default-features = false }
[dev-dependencies]
ff = { version = "0.11", default-features = false }
ff = { version = "0.12", default-features = false }
zcash_primitives = { version = "0.5", path = "../../zcash_primitives" }
jubjub = "0.8"
jubjub = "0.9"
[features]
default = ["alloc"]

2
zcash_client_backend/CHANGELOG.md
View File

@ -42,7 +42,7 @@ and this library adheres to Rust's notion of
### Changed
- MSRV is now 1.56.1.
- Bumped dependencies to `ff 0.11`, `group 0.11`, `bls12_381 0.6`, `jubjub 0.8`.
- Bumped dependencies to `ff 0.12`, `group 0.12`, `bls12_381 0.7`, `jubjub 0.9`.
- `zcash_client_backend::proto`:
- `compact_formats::CompactSpend` has been renamed to `CompactSaplingSpend`,
and its `epk` field (and associated `set_epk` method) has been renamed to

8
zcash_client_backend/Cargo.toml
View File

@ -14,14 +14,14 @@ edition = "2018"
[dependencies]
bech32 = "0.8"
bls12_381 = "0.6"
bls12_381 = "0.7"
bs58 = { version = "0.4", features = ["check"] }
base64 = "0.13"
ff = "0.11"
group = "0.11"
ff = "0.12"
group = "0.12"
hex = "0.4"
hdwallet = { version = "0.3.0", optional = true }
jubjub = "0.8"
jubjub = "0.9"
log = "0.4"
nom = "7"
percent-encoding = "2.1.0"

2
zcash_client_sqlite/CHANGELOG.md
View File

@ -19,7 +19,7 @@ and this library adheres to Rust's notion of
### Changed
- MSRV is now 1.56.1.
- Bumped dependencies to `ff 0.11`, `group 0.11`, `jubjub 0.8`.
- Bumped dependencies to `ff 0.12`, `group 0.12`, `jubjub 0.9`.
- Renamed the following to use lower-case abbreviations (matching Rust
naming conventions):
- `zcash_client_sqlite::BlockDB` to `BlockDb`

6
zcash_client_sqlite/Cargo.toml
View File

@ -15,9 +15,9 @@ edition = "2018"
[dependencies]
bech32 = "0.8"
bs58 = { version = "0.4", features = ["check"] }
ff = "0.11"
group = "0.11"
jubjub = "0.8"
ff = "0.12"
group = "0.12"
jubjub = "0.9"
protobuf = "~2.27.1" # MSRV 1.52.1
rand_core = "0.6"
rusqlite = { version = "0.24", features = ["bundled", "time"] }

4
zcash_extensions/Cargo.toml
View File

@ -13,8 +13,8 @@ blake2b_simd = "1"
zcash_primitives = { version = "0.5", path = "../zcash_primitives", features = ["zfuture" ] }
[dev-dependencies]
ff = "0.11"
jubjub = "0.8"
ff = "0.12"
jubjub = "0.9"
rand_core = "0.6"
zcash_proofs = { version = "0.5", path = "../zcash_proofs" }

3
zcash_primitives/CHANGELOG.md
View File

@ -102,7 +102,8 @@ and this library adheres to Rust's notion of
### Changed
- MSRV is now 1.56.1.
- Bumped dependencies to `ff 0.11`, `group 0.11`, `bls12_381 0.6`, `jubjub 0.8`.
- Bumped dependencies to `ff 0.12`, `group 0.12`, `bls12_381 0.7`, `jubjub 0.9`,
`bitvec 1`.
- The following modules and helpers have been moved into
`zcash_primitives::sapling`:
- `zcash_primitives::group_hash`

10
zcash_primitives/Cargo.toml
View File

@ -17,22 +17,22 @@ all-features = true
[dependencies]
aes = "0.7"
bitvec = "0.22"
bitvec = "1"
bip0039 = { version = "0.9", features = ["std", "all-languages"] }
blake2b_simd = "1"
blake2s_simd = "1"
bls12_381 = "0.6"
bls12_381 = "0.7"
bs58 = { version = "0.4", features = ["check"], optional = true }
byteorder = "1"
chacha20poly1305 = "0.9"
equihash = { version = "0.1", path = "../components/equihash" }
ff = "0.11"
ff = "0.12"
fpe = "0.5"
group = "0.11"
group = "0.12"
hdwallet = { version = "0.3.0", optional = true }
hex = "0.4"
incrementalmerkletree = "=0.3.0-beta.2"
jubjub = "0.8"
jubjub = "0.9"
lazy_static = "1"
memuse = "0.2"
nonempty = "0.7"

4
zcash_proofs/CHANGELOG.md
View File

@ -8,8 +8,8 @@ and this library adheres to Rust's notion of
## [Unreleased]
### Changed
- MSRV is now 1.56.1.
- Bumped dependencies to `ff 0.11`, `group 0.11`, `bellman 0.11.1`,
`bls12_381 0.6`, `jubjub 0.8`.
- Bumped dependencies to `ff 0.12`, `group 0.12`, `bellman 0.12`,
`bls12_381 0.7`, `jubjub 0.9`.
- `zcash_proofs::sapling::SaplingVerificationContext::new` now takes a
`zip216_enabled` boolean; this is used to control how RedJubjub signatures are
validated.

10
zcash_proofs/Cargo.toml
View File

@ -15,14 +15,14 @@ edition = "2018"
all-features = true
[dependencies]
bellman = { version = "0.11.1", default-features = false, features = ["groth16"] }
bellman = { version = "0.12", default-features = false, features = ["groth16"] }
blake2b_simd = "1"
bls12_381 = "0.6"
bls12_381 = "0.7"
byteorder = "1"
directories = { version = "4", optional = true }
ff = "0.11"
group = "0.11"
jubjub = "0.8"
ff = "0.12"
group = "0.12"
jubjub = "0.9"
lazy_static = "1"
minreq = { version = "2", features = ["https"], optional = true }
rand_core = "0.6"

4
zcash_proofs/src/circuit/ecc.rs
View File

@ -738,7 +738,7 @@ mod test {
let s_bits = s
.to_le_bits()
.iter()
.by_val()
.by_vals()
.take(jubjub::Fr::NUM_BITS as usize)
.enumerate()
.map(|(i, b)| {
@ -789,7 +789,7 @@ mod test {
let s_bits = s
.to_le_bits()
.iter()
.by_val()
.by_vals()
.take(jubjub::Fr::NUM_BITS as usize)
.enumerate()
.map(|(i, b)| {

8
zcash_proofs/src/circuit/sapling.rs
View File

@ -595,11 +595,11 @@ fn test_input_circuit_with_bls12_381() {
cur = jubjub::ExtendedPoint::from(pedersen_hash::pedersen_hash(
pedersen_hash::Personalization::MerkleTree(i),
lhs.iter()
.by_val()
.by_vals()
.take(bls12_381::Scalar::NUM_BITS as usize)
.chain(
rhs.iter()
.by_val()
.by_vals()
.take(bls12_381::Scalar::NUM_BITS as usize),
),
))
@ -773,11 +773,11 @@ fn test_input_circuit_with_bls12_381_external_test_vectors() {
cur = jubjub::ExtendedPoint::from(pedersen_hash::pedersen_hash(
pedersen_hash::Personalization::MerkleTree(i),
lhs.iter()
.by_val()
.by_vals()
.take(bls12_381::Scalar::NUM_BITS as usize)
.chain(
rhs.iter()
.by_val()
.by_vals()
.take(bls12_381::Scalar::NUM_BITS as usize),
),
))