Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crate updates #216

Merged
merged 2 commits into from
Mar 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bellman/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ homepage = "https://github.com/ebfull/bellman"
license = "MIT/Apache-2.0"
name = "bellman"
repository = "https://github.com/ebfull/bellman"
version = "0.2.0"
version = "0.6.0"
edition = "2018"

[dependencies]
bit-vec = "0.4.4"
blake2s_simd = "0.5"
ff = { version = "0.5.0", path = "../ff" }
ff = { version = "0.6", path = "../ff" }
futures = "0.1"
futures-cpupool = { version = "0.1", optional = true }
group = { version = "0.2.0", path = "../group" }
group = { version = "0.6", path = "../group" }
num_cpus = { version = "1", optional = true }
crossbeam = { version = "0.7", optional = true }
pairing = { version = "0.15.0", path = "../pairing", optional = true }
pairing = { version = "0.16", path = "../pairing", optional = true }
rand_core = "0.5"
byteorder = "1"

Expand Down
2 changes: 1 addition & 1 deletion bellman/src/groth16/tests/dummy_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ impl CurveProjective for Fr {
type Scalar = Fr;
type Engine = DummyEngine;

fn random<R: RngCore>(rng: &mut R) -> Self {
fn random<R: RngCore + ?std::marker::Sized>(rng: &mut R) -> Self {
<Fr as Field>::random(rng)
}

Expand Down
4 changes: 2 additions & 2 deletions ff/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ff"
version = "0.5.2"
version = "0.6.0"
authors = ["Sean Bowe <[email protected]>"]
description = "Library for building and interfacing with finite fields"
readme = "README.md"
Expand All @@ -12,7 +12,7 @@ edition = "2018"

[dependencies]
byteorder = "1"
ff_derive = { version = "^0.4.1", path = "ff_derive", optional = true }
ff_derive = { version = "0.6", path = "ff_derive", optional = true }
rand_core = "0.5"

[features]
Expand Down
2 changes: 1 addition & 1 deletion ff/ff_derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ff_derive"
version = "0.4.1"
version = "0.6.0"
authors = ["Sean Bowe <[email protected]>"]
description = "Procedural macro library used to build custom prime field implementations"
documentation = "https://docs.rs/ff/"
Expand Down
4 changes: 2 additions & 2 deletions group/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "group"
version = "0.2.0"
version = "0.6.0"
authors = [
"Sean Bowe <[email protected]>",
"Jack Grigg <[email protected]>",
Expand All @@ -15,7 +15,7 @@ repository = "https://github.com/ebfull/group"
edition = "2018"

[dependencies]
ff = { version = "0.5.0", path = "../ff" }
ff = { version = "0.6", path = "../ff" }
rand = "0.7"
rand_xorshift = "0.2"

Expand Down
2 changes: 1 addition & 1 deletion group/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub trait CurveProjective:
type Affine: CurveAffine<Projective = Self, Scalar = Self::Scalar>;

/// Returns an element chosen uniformly at random using a user-provided RNG.
fn random<R: RngCore>(rng: &mut R) -> Self;
fn random<R: RngCore + ?std::marker::Sized>(rng: &mut R) -> Self;

/// Returns the additive identity.
fn zero() -> Self;
Expand Down
12 changes: 6 additions & 6 deletions librustzcash/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ path = "src/rustzcash.rs"
crate-type = ["staticlib"]

[dependencies]
bellman = { version = "0.2.0", path = "../bellman" }
bellman = { version = "0.6", path = "../bellman" }
blake2b_simd = "0.5"
blake2s_simd = "0.5"
ff = { version = "0.5.0", path = "../ff" }
ff = { version = "0.6", path = "../ff" }
libc = "0.2"
pairing = { version = "0.15.0", path = "../pairing" }
pairing = { version = "0.16", path = "../pairing" }
lazy_static = "1"
rand_core = "0.5.1"
zcash_history = { version = "0.0.1", path = "../zcash_history" }
zcash_primitives = { version = "0.1.0", path = "../zcash_primitives" }
zcash_proofs = { version = "0.1.0", path = "../zcash_proofs" }
zcash_history = { version = "0.2", path = "../zcash_history" }
zcash_primitives = { version = "0.2", path = "../zcash_primitives" }
zcash_proofs = { version = "0.2", path = "../zcash_proofs" }

[badges]
maintenance = { status = "deprecated" }
6 changes: 3 additions & 3 deletions pairing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "pairing"

# Remember to change version string in README.md.
version = "0.15.1"
version = "0.16.0"
authors = [
"Sean Bowe <[email protected]>",
"Jack Grigg <[email protected]>",
Expand All @@ -18,8 +18,8 @@ edition ="2018"

[dependencies]
byteorder = "1"
ff = { version = "^0.5.2", path = "../ff", features = ["derive"] }
group = { version = "0.2.0", path = "../group" }
ff = { version = "0.6", path = "../ff", features = ["derive"] }
group = { version = "0.6", path = "../group" }
rand_core = "0.5"

[dev-dependencies]
Expand Down
8 changes: 4 additions & 4 deletions zcash_client_backend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_client_backend"
description = "APIs for creating shielded Zcash light clients"
version = "0.1.0"
version = "0.2.0"
authors = [
"Jack Grigg <[email protected]>",
]
Expand All @@ -13,12 +13,12 @@ edition = "2018"

[dependencies]
bech32 = "0.7"
ff = { version = "0.5.0", path = "../ff" }
ff = { version = "0.6", path = "../ff" }
hex = "0.3"
pairing = { version = "0.15.0", path = "../pairing" }
pairing = { version = "0.16", path = "../pairing" }
protobuf = "2"
subtle = "2"
zcash_primitives = { version = "0.1.0", path = "../zcash_primitives" }
zcash_primitives = { version = "0.2", path = "../zcash_primitives" }

[build-dependencies]
protobuf-codegen-pure = "2"
Expand Down
2 changes: 1 addition & 1 deletion zcash_history/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zcash_history"
version = "0.0.1"
version = "0.2.0"
authors = ["NikVolf <[email protected]>"]
edition = "2018"
license = "MIT/Apache-2.0"
Expand Down
6 changes: 3 additions & 3 deletions zcash_primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_primitives"
description = "Rust implementations of the Zcash primitives"
version = "0.1.0"
version = "0.2.0"
authors = [
"Jack Grigg <[email protected]>",
]
Expand All @@ -17,12 +17,12 @@ blake2b_simd = "0.5"
blake2s_simd = "0.5"
byteorder = "1"
crypto_api_chachapoly = "0.2.1"
ff = { version = "0.5.0", path = "../ff" }
ff = { version = "0.6", path = "../ff" }
fpe = "0.2"
hex = "0.3"
lazy_static = "1"
log = "0.4"
pairing = { version = "0.15.0", path = "../pairing" }
pairing = { version = "0.16", path = "../pairing" }
rand = "0.7"
rand_core = "0.5.1"
ripemd160 = { version = "0.8", optional = true }
Expand Down
10 changes: 5 additions & 5 deletions zcash_proofs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_proofs"
description = "Zcash zk-SNARK circuits and proving APIs"
version = "0.1.0"
version = "0.2.0"
authors = [
"Jack Grigg <[email protected]>",
]
Expand All @@ -12,14 +12,14 @@ license = "MIT OR Apache-2.0"
edition = "2018"

[dependencies]
bellman = { version = "0.2.0", path = "../bellman", default-features = false, features = ["groth16"] }
bellman = { version = "0.6", path = "../bellman", default-features = false, features = ["groth16"] }
blake2b_simd = "0.5"
byteorder = "1"
directories = { version = "1", optional = true }
ff = { version = "0.5.0", path = "../ff" }
pairing = { version = "0.15.0", path = "../pairing" }
ff = { version = "0.6", path = "../ff" }
pairing = { version = "0.16", path = "../pairing" }
rand_core = "0.5.1"
zcash_primitives = { version = "0.1.0", path = "../zcash_primitives" }
zcash_primitives = { version = "0.2", path = "../zcash_primitives" }

[dev-dependencies]
rand_xorshift = "0.2"
Expand Down