Merge branch 'release/0.5'

Author: hdevalence

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zkp"
-version = "0.4.3"
+version = "0.5.0"
 authors = ["Henry de Valence <hdevalence@hdevalence.ca>"]
 license = "CC0-1.0"
 repository = "https://github.com/hdevalence/zkp"
@@ -13,9 +13,9 @@ exclude = [
 ]
 
 [dependencies]
-sha2 = "0.7"
-merlin = "0.2"
-rand = "0.5"
+sha2 = "0.8"
+merlin = "1"
+rand = "0.6"
 serde = "1.0"
 serde_derive = "1.0"
 
@@ -24,7 +24,7 @@ bincode = "1"
 
 [dependencies.curve25519-dalek]
 features = ["serde", "nightly", "alloc"]
-version = "0.21"
+version = "1"
 default-features = false
 
 [features]
@@ -33,4 +33,4 @@ u32_backend = ["curve25519-dalek/u32_backend"]
 u64_backend = ["curve25519-dalek/u64_backend"]
 avx2_backend = ["curve25519-dalek/avx2_backend"]
 nightly = ["curve25519-dalek/nightly"]
-bench = [ ]
+bench = [ ]

src/lib.rs

@@ -305,14 +305,14 @@ macro_rules! create_nipk {
                     )+
 
                     // Construct a TranscriptRng
-                    let rng_ctor = transcript.fork_transcript();
+                    let rng_builder = transcript.build_rng();
                     $(
-                        let rng_ctor = rng_ctor.commit_witness_bytes(
+                        let rng_builder = rng_builder.commit_witness_bytes(
                             stringify!($secret).as_bytes(),
                             secrets.$secret.as_bytes(),
                         );
                     )+
-                    let mut transcript_rng = rng_ctor.reseed_from_rng(&mut thread_rng());
+                    let mut transcript_rng = rng_builder.finalize(&mut thread_rng());
 
                     // Use the TranscriptRng to generate blinding factors
                     let rand = Randomnesses{