Merge pull request #395 from str4d/bump-deps
Migrate to bitvec 0.22, ff 0.10, etc.
This commit is contained in:
commit
2ba8073971
|
@ -14,3 +14,12 @@ members = [
|
||||||
lto = true
|
lto = true
|
||||||
panic = 'abort'
|
panic = 'abort'
|
||||||
codegen-units = 1
|
codegen-units = 1
|
||||||
|
|
||||||
|
[patch.crates-io]
|
||||||
|
# To resolve the funty mess. Removing this probably blocks on a nom 7 release.
|
||||||
|
# - https://github.com/Geal/nom/issues/1302
|
||||||
|
# - https://github.com/Geal/nom/pull/1304
|
||||||
|
nom = { git = "https://github.com/myrrlyn/nom.git", rev = "d6b81f5303b0a347726e1f3f428751f376e7b771" }
|
||||||
|
|
||||||
|
# In development.
|
||||||
|
orchard = { git = "https://github.com/zcash/orchard.git", rev = "87a3d52641df732e4d0661699e7b32ad1299cd75" }
|
||||||
|
|
|
@ -15,11 +15,11 @@ edition = "2018"
|
||||||
blake2b_simd = "0.5"
|
blake2b_simd = "0.5"
|
||||||
byteorder = "1"
|
byteorder = "1"
|
||||||
crypto_api_chachapoly = "0.4"
|
crypto_api_chachapoly = "0.4"
|
||||||
ff = "0.9"
|
ff = "0.10"
|
||||||
group = "0.9"
|
group = "0.10"
|
||||||
rand_core = "0.6"
|
rand_core = "0.6"
|
||||||
subtle = "2.2.3"
|
subtle = "2.2.3"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
zcash_primitives = { version = "0.5", path = "../../zcash_primitives" }
|
zcash_primitives = { version = "0.5", path = "../../zcash_primitives" }
|
||||||
jubjub = "0.6"
|
jubjub = "0.7"
|
||||||
|
|
|
@ -14,13 +14,13 @@ edition = "2018"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bech32 = "0.8"
|
bech32 = "0.8"
|
||||||
bls12_381 = "0.4"
|
bls12_381 = "0.5"
|
||||||
bs58 = { version = "0.4", features = ["check"] }
|
bs58 = { version = "0.4", features = ["check"] }
|
||||||
base64 = "0.13"
|
base64 = "0.13"
|
||||||
ff = "0.9"
|
ff = "0.10"
|
||||||
group = "0.9"
|
group = "0.10"
|
||||||
hex = "0.4"
|
hex = "0.4"
|
||||||
jubjub = "0.6"
|
jubjub = "0.7"
|
||||||
nom = "6.1"
|
nom = "6.1"
|
||||||
percent-encoding = "2.1.0"
|
percent-encoding = "2.1.0"
|
||||||
proptest = { version = "1.0.0", optional = true }
|
proptest = { version = "1.0.0", optional = true }
|
||||||
|
|
|
@ -15,9 +15,9 @@ edition = "2018"
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bech32 = "0.8"
|
bech32 = "0.8"
|
||||||
bs58 = { version = "0.4", features = ["check"] }
|
bs58 = { version = "0.4", features = ["check"] }
|
||||||
ff = "0.9"
|
ff = "0.10"
|
||||||
group = "0.9"
|
group = "0.10"
|
||||||
jubjub = "0.6"
|
jubjub = "0.7"
|
||||||
protobuf = "2.20"
|
protobuf = "2.20"
|
||||||
rand_core = "0.6"
|
rand_core = "0.6"
|
||||||
rusqlite = { version = "0.24", features = ["bundled", "time"] }
|
rusqlite = { version = "0.24", features = ["bundled", "time"] }
|
||||||
|
|
|
@ -13,11 +13,11 @@ blake2b_simd = "0.5"
|
||||||
zcash_primitives = { version = "0.5", path = "../zcash_primitives", features = ["zfuture"] }
|
zcash_primitives = { version = "0.5", path = "../zcash_primitives", features = ["zfuture"] }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
ff = "0.9"
|
ff = "0.10"
|
||||||
jubjub = "0.6"
|
jubjub = "0.7"
|
||||||
|
orchard = "0.0"
|
||||||
rand_core = "0.6"
|
rand_core = "0.6"
|
||||||
zcash_proofs = { version = "0.5", path = "../zcash_proofs" }
|
zcash_proofs = { version = "0.5", path = "../zcash_proofs" }
|
||||||
orchard = { git = "https://github.com/zcash/orchard", branch = "main" }
|
|
||||||
secp256k1 = { version = "0.20", features = ["rand", "bitcoin_hashes"] }
|
secp256k1 = { version = "0.20", features = ["rand", "bitcoin_hashes"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
|
|
@ -17,22 +17,23 @@ all-features = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
aes = "0.6"
|
aes = "0.6"
|
||||||
bitvec = "0.20"
|
bitvec = "0.22"
|
||||||
blake2b_simd = "0.5"
|
blake2b_simd = "0.5"
|
||||||
blake2s_simd = "0.5"
|
blake2s_simd = "0.5"
|
||||||
bls12_381 = "0.4"
|
bls12_381 = "0.5"
|
||||||
byteorder = "1"
|
byteorder = "1"
|
||||||
crypto_api_chachapoly = "0.4"
|
crypto_api_chachapoly = "0.4"
|
||||||
equihash = { version = "0.1", path = "../components/equihash" }
|
equihash = { version = "0.1", path = "../components/equihash" }
|
||||||
ff = "0.9"
|
ff = "0.10"
|
||||||
fpe = "0.4"
|
fpe = "0.4"
|
||||||
group = "0.9"
|
group = "0.10"
|
||||||
hex = "0.4"
|
hex = "0.4"
|
||||||
jubjub = "0.6"
|
jubjub = "0.7"
|
||||||
lazy_static = "1"
|
lazy_static = "1"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
nonempty = "0.6"
|
nonempty = "0.6"
|
||||||
orchard = { git = "https://github.com/zcash/orchard", branch = "main" }
|
orchard = "0.0"
|
||||||
|
pasta_curves = "0.1"
|
||||||
proptest = { version = "1.0.0", optional = true }
|
proptest = { version = "1.0.0", optional = true }
|
||||||
rand = "0.8"
|
rand = "0.8"
|
||||||
rand_core = "0.6"
|
rand_core = "0.6"
|
||||||
|
@ -42,19 +43,12 @@ sha2 = "0.9"
|
||||||
subtle = "2.2.3"
|
subtle = "2.2.3"
|
||||||
zcash_note_encryption = { version = "0.0", path = "../components/zcash_note_encryption" }
|
zcash_note_encryption = { version = "0.0", path = "../components/zcash_note_encryption" }
|
||||||
|
|
||||||
# Temporary workaround for https://github.com/myrrlyn/funty/issues/3
|
|
||||||
funty = "=1.1.0"
|
|
||||||
|
|
||||||
[dependencies.pasta_curves]
|
|
||||||
git = "https://github.com/zcash/pasta_curves.git"
|
|
||||||
rev = "b55a6960dfafd7f767e2820ddf1adaa499322f98"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
criterion = "0.3"
|
criterion = "0.3"
|
||||||
hex-literal = "0.3"
|
hex-literal = "0.3"
|
||||||
proptest = "1.0.0"
|
proptest = "1.0.0"
|
||||||
rand_xorshift = "0.3"
|
rand_xorshift = "0.3"
|
||||||
orchard = { git = "https://github.com/zcash/orchard", branch = "main", features = ["test-dependencies"] }
|
orchard = { version = "0.0", features = ["test-dependencies"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
transparent-inputs = ["ripemd160", "secp256k1"]
|
transparent-inputs = ["ripemd160", "secp256k1"]
|
||||||
|
|
|
@ -15,14 +15,14 @@ edition = "2018"
|
||||||
all-features = true
|
all-features = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bellman = { version = "0.9", default-features = false, features = ["groth16"] }
|
bellman = { version = "0.10", default-features = false, features = ["groth16"] }
|
||||||
blake2b_simd = "0.5"
|
blake2b_simd = "0.5"
|
||||||
bls12_381 = "0.4"
|
bls12_381 = "0.5"
|
||||||
byteorder = "1"
|
byteorder = "1"
|
||||||
directories = { version = "3", optional = true }
|
directories = { version = "3", optional = true }
|
||||||
ff = "0.9"
|
ff = "0.10"
|
||||||
group = "0.9"
|
group = "0.10"
|
||||||
jubjub = "0.6"
|
jubjub = "0.7"
|
||||||
lazy_static = "1"
|
lazy_static = "1"
|
||||||
minreq = { version = "2", features = ["https"], optional = true }
|
minreq = { version = "2", features = ["https"], optional = true }
|
||||||
rand_core = "0.6"
|
rand_core = "0.6"
|
||||||
|
|
|
@ -620,7 +620,7 @@ impl MontgomeryPoint {
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use bellman::ConstraintSystem;
|
use bellman::ConstraintSystem;
|
||||||
use ff::{Field, PrimeField};
|
use ff::{Field, PrimeField, PrimeFieldBits};
|
||||||
use group::{Curve, Group};
|
use group::{Curve, Group};
|
||||||
use rand_core::{RngCore, SeedableRng};
|
use rand_core::{RngCore, SeedableRng};
|
||||||
use rand_xorshift::XorShiftRng;
|
use rand_xorshift::XorShiftRng;
|
||||||
|
|
|
@ -24,6 +24,9 @@ use bellman::gadgets::multipack;
|
||||||
use bellman::gadgets::num;
|
use bellman::gadgets::num;
|
||||||
use bellman::gadgets::Assignment;
|
use bellman::gadgets::Assignment;
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
use ff::PrimeFieldBits;
|
||||||
|
|
||||||
pub const TREE_DEPTH: usize = SAPLING_COMMITMENT_TREE_DEPTH;
|
pub const TREE_DEPTH: usize = SAPLING_COMMITMENT_TREE_DEPTH;
|
||||||
|
|
||||||
/// This is an instance of the `Spend` circuit.
|
/// This is an instance of the `Spend` circuit.
|
||||||
|
|
Loading…
Reference in New Issue