Merge pull request #216 from ebfull/crate-updates

Crate updates
zcash · Mar 12, 2020 · 53bd5d4 · 53bd5d4
2 parents d9ac7bd + 100878c
commit 53bd5d4
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bellman/Cargo.toml b/bellman/Cargo.toml
@@ -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"
 

diff --git a/bellman/src/groth16/tests/dummy_engine.rs b/bellman/src/groth16/tests/dummy_engine.rs
@@ -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)
     }
 

diff --git a/ff/Cargo.toml b/ff/Cargo.toml
@@ -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"
@@ -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]

diff --git a/ff/ff_derive/Cargo.toml b/ff/ff_derive/Cargo.toml
@@ -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/"

diff --git a/group/Cargo.toml b/group/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "group"
-version = "0.2.0"
+version = "0.6.0"
 authors = [
     "Sean Bowe <[email protected]>",
     "Jack Grigg <[email protected]>",
@@ -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"
 

diff --git a/group/src/lib.rs b/group/src/lib.rs
@@ -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;

diff --git a/librustzcash/Cargo.toml b/librustzcash/Cargo.toml
@@ -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" }
diff --git a/pairing/Cargo.toml b/pairing/Cargo.toml
@@ -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]>",
@@ -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]

diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml
@@ -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]>",
 ]
@@ -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"

diff --git a/zcash_history/Cargo.toml b/zcash_history/Cargo.toml
@@ -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"

diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
@@ -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]>",
 ]
@@ -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 }

diff --git a/zcash_proofs/Cargo.toml b/zcash_proofs/Cargo.toml
@@ -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]>",
 ]
@@ -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"