@@ -10,6 +10,7 @@
 use criterion::*;
 use libspartan::dense_mlpoly::{DensePolynomial, PolyCommitmentGens, PolyEvalProof};
 use libspartan::math::Math;
+use libspartan::random::RandomTape;
 use libspartan::scalar::Scalar;
 use libspartan::transcript::ProofTranscript;
 use merlin::Transcript;
@@ -101,12 +102,7 @@
     let name = format!("polycommit_evalproof_{}", n);
     group.bench_function(&name, move |b| {
       b.iter(|| {
-        let mut random_tape = {
-          let mut csprng: OsRng = OsRng;
-          let mut tape = Transcript::new(b"proof");
-          tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-          tape
-        };
+        let mut random_tape = RandomTape::new(b"proof");
         let mut prover_transcript = Transcript::new(b"example");
         PolyEvalProof::prove(
           black_box(&poly),
@@ -151,12 +147,7 @@
     let (poly_commitment, blinds) = poly.commit(false, &gens, None);
     let eval = poly.evaluate(&r);
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, c_zr) = PolyEvalProof::prove(
       black_box(&poly),

@@ -11,6 +11,7 @@ use libspartan::dense_mlpoly::EqPolynomial;
 use libspartan::math::Math;
 use libspartan::r1csinstance::R1CSInstance;
 use libspartan::r1csproof::{R1CSGens, R1CSProof};
+use libspartan::random::RandomTape;
 use libspartan::scalar::Scalar;
 use libspartan::transcript::ProofTranscript;
 use merlin::Transcript;
@@ -35,12 +36,7 @@
     let name = format!("r1cs_prove_{}", n);
     group.bench_function(&name, move |b| {
       b.iter(|| {
-        let mut random_tape = {
-          let mut csprng: OsRng = OsRng;
-          let mut tape = Transcript::new(b"proof");
-          tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-          tape
-        };
+        let mut random_tape = RandomTape::new(b"proof");
         let mut prover_transcript = Transcript::new(b"example");
         R1CSProof::prove(
           black_box(&inst),
@@ -69,12 +65,7 @@ let (inst, vars, input) = R1CSInstance::produce_synthetic_r1cs(num_cons, num_vars, num_inputs);
     let n = inst.get_num_vars();
     let gens = R1CSGens::new(num_cons, num_vars, b"test-m");
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, rx, ry) = R1CSProof::prove(
       &inst,

@@ -14,6 +14,7 @@ use libspartan::commitments::MultiCommitGens;
 use libspartan::dense_mlpoly::DensePolynomial;
 use libspartan::math::Math;
 use libspartan::nizk::DotProductProof;
+use libspartan::random::RandomTape;
 use libspartan::scalar::Scalar;
 use libspartan::sumcheck::ZKSumcheckInstanceProof;
 use libspartan::transcript::ProofTranscript;
@@ -53,12 +54,7 @@
     let name = format!("zksumcheck_prove_{}", n);
     group.bench_function(&name, move |b| {
       b.iter(|| {
-        let mut random_tape = {
-          let mut csprng: OsRng = OsRng;
-          let mut tape = Transcript::new(b"proof");
-          tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-          tape
-        };
+        let mut random_tape = RandomTape::new(b"proof");
         let mut prover_transcript = Transcript::new(b"example");
         ZKSumcheckInstanceProof::prove_quad(
           black_box(&claim),
@@ -105,13 +101,7 @@ let blind_claim = Scalar::random(&mut csprng);
     let comb_func =
       |poly_A_comp: &Scalar, poly_B_comp: &Scalar| -> Scalar { poly_A_comp * poly_B_comp };
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
-
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, _r, _v, _blind_post_claim) = ZKSumcheckInstanceProof::prove_quad(
       &claim,

@@ -3,6 +3,7 @@ use super::errors::ProofVerifyError;
 use super::group::{CompressedGroup, GroupElement, VartimeMultiscalarMul};
 use super::math::Math;
 use super::nizk::{DotProductProofGens, DotProductProofLog};
+use super::random::RandomTape;
 use super::scalar::Scalar;
 use super::transcript::{AppendToTranscript, ProofTranscript};
 use core::ops::Index;
@@ -230,7 +231,7 @@ pub fn commit(
     &self,
     hiding: bool,
     gens: &PolyCommitmentGens,
-    random_tape: Option<&mut Transcript>,
+    random_tape: Option<&mut RandomTape>,
   ) -> (PolyCommitment, PolyCommitmentBlinds) {
     let n = self.Z.len();
     let ell = self.get_num_vars();
@@ -243,9 +244,7 @@ assert_eq!(L_size * R_size, n);
 
     let blinds = match hiding {
       true => PolyCommitmentBlinds {
-        blinds: random_tape
-          .unwrap()
-          .challenge_vector(b"poly_blinds", L_size),
+        blinds: random_tape.unwrap().random_vector(b"poly_blinds", L_size),
       },
       false => PolyCommitmentBlinds {
         blinds: vec![Scalar::zero(); L_size],
@@ -380,7 +379,7 @@ Zr: &Scalar,                   // evaluation of \widetilde{Z}(r)
     blind_Zr_opt: Option<&Scalar>, // specifies a blind for Zr
     gens: &PolyCommitmentGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> (PolyEvalProof, CompressedGroup) {
     transcript.append_protocol_name(PolyEvalProof::protocol_name());
 
@@ -714,12 +713,7 @@
     let gens = PolyCommitmentGens::new(poly.get_num_vars(), b"test-two");
     let (poly_commitment, blinds) = poly.commit(false, &gens, None);
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, C_Zr) = PolyEvalProof::prove(
       &poly,

@@ -21,6 +21,7 @@ pub mod nizk;
 mod product_tree;
 pub mod r1csinstance;
 pub mod r1csproof;
+pub mod random;
 pub mod scalar;
 mod scalar_25519;
 pub mod sparse_mlpoly;

@@ -3,6 +3,7 @@ use super::commitments::{Commitments, MultiCommitGens};
 use super::errors::ProofVerifyError;
 use super::group::CompressedGroup;
 use super::math::Math;
+use super::random::RandomTape;
 use super::scalar::Scalar;
 use super::transcript::{AppendToTranscript, ProofTranscript};
 use merlin::Transcript;
@@ -23,15 +24,15 @@
   pub fn prove(
     gens_n: &MultiCommitGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
     x: &Scalar,
     r: &Scalar,
   ) -> (KnowledgeProof, CompressedGroup) {
     transcript.append_protocol_name(KnowledgeProof::protocol_name());
 
     // produce two random Scalars
-    let t1 = random_tape.challenge_scalar(b"t1");
-    let t2 = random_tape.challenge_scalar(b"t2");
+    let t1 = random_tape.random_scalar(b"t1");
+    let t2 = random_tape.random_scalar(b"t2");
 
     let C = x.commit(&r, gens_n).compress();
     C.append_to_transcript(b"C", transcript);
@@ -89,7 +90,7 @@
   pub fn prove(
     gens_n: &MultiCommitGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
     v1: &Scalar,
     s1: &Scalar,
     v2: &Scalar,
@@ -98,7 +99,7 @@ ) -> (EqualityProof, CompressedGroup, CompressedGroup) {
     transcript.append_protocol_name(EqualityProof::protocol_name());
 
     // produce a random Scalar
-    let r = random_tape.challenge_scalar(b"r");
+    let r = random_tape.random_scalar(b"r");
 
     let C1 = v1.commit(&s1, gens_n).compress();
     C1.append_to_transcript(b"C1", transcript);
@@ -160,7 +161,7 @@
   pub fn prove(
     gens_n: &MultiCommitGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
     x: &Scalar,
     rX: &Scalar,
     y: &Scalar,
@@ -176,11 +177,11 @@ ) {
     transcript.append_protocol_name(ProductProof::protocol_name());
 
     // produce five random Scalar
-    let b1 = random_tape.challenge_scalar(b"b1");
-    let b2 = random_tape.challenge_scalar(b"b2");
-    let b3 = random_tape.challenge_scalar(b"b3");
-    let b4 = random_tape.challenge_scalar(b"b4");
-    let b5 = random_tape.challenge_scalar(b"b5");
+    let b1 = random_tape.random_scalar(b"b1");
+    let b2 = random_tape.random_scalar(b"b2");
+    let b3 = random_tape.random_scalar(b"b3");
+    let b4 = random_tape.random_scalar(b"b4");
+    let b5 = random_tape.random_scalar(b"b5");
 
     let X = x.commit(&rX, gens_n).compress();
     X.append_to_transcript(b"X", transcript);
@@ -317,7 +318,7 @@ pub fn prove(
     gens_1: &MultiCommitGens,
     gens_n: &MultiCommitGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
     x: &Vec<Scalar>,
     r_x: &Scalar,
     a: &Vec<Scalar>,
@@ -332,9 +333,9 @@ assert_eq!(gens_n.n, a.len());
     assert_eq!(gens_1.n, 1);
 
     // produce randomness for the proofs
-    let d = random_tape.challenge_vector(b"d", n);
-    let r_delta = random_tape.challenge_scalar(b"r_delta");
-    let r_beta = random_tape.challenge_scalar(b"r_beta");
+    let d = random_tape.random_vector(b"d", n);
+    let r_delta = random_tape.random_scalar(b"r_delta");
+    let r_beta = random_tape.random_scalar(b"r_beta");
 
     let Cx = x.commit(&r_x, gens_n).compress();
     Cx.append_to_transcript(b"Cx", transcript);
@@ -442,7 +443,7 @@
   pub fn prove(
     gens: &DotProductProofGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
     x: &Vec<Scalar>,
     r_x: &Scalar,
     a: &Vec<Scalar>,
@@ -456,12 +457,12 @@ assert_eq!(x.len(), a.len());
     assert_eq!(gens.n, n);
 
     // produce randomness for generating a proof
-    let d = random_tape.challenge_scalar(b"d");
-    let r_delta = random_tape.challenge_scalar(b"r_delta");
-    let r_beta = random_tape.challenge_scalar(b"r_delta");
+    let d = random_tape.random_scalar(b"d");
+    let r_delta = random_tape.random_scalar(b"r_delta");
+    let r_beta = random_tape.random_scalar(b"r_delta");
     let blinds_vec = {
-      let v1 = random_tape.challenge_vector(b"blinds_vec_1", 2 * n.log2());
-      let v2 = random_tape.challenge_vector(b"blinds_vec_2", 2 * n.log2());
+      let v1 = random_tape.random_vector(b"blinds_vec_1", 2 * n.log2());
+      let v2 = random_tape.random_vector(b"blinds_vec_2", 2 * n.log2());
       (0..v1.len())
         .map(|i| (v1[i], v2[i]))
         .collect::<Vec<(Scalar, Scalar)>>()
@@ -579,12 +580,7 @@
     let x = Scalar::random(&mut csprng);
     let r = Scalar::random(&mut csprng);
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, committed_value) =
       KnowledgeProof::prove(&gens_1, &mut prover_transcript, &mut random_tape, &x, &r);
@@ -605,12 +601,7 @@ let v2 = v1;
     let s1 = Scalar::random(&mut csprng);
     let s2 = Scalar::random(&mut csprng);
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, C1, C2) = EqualityProof::prove(
       &gens_1,
@@ -640,12 +631,7 @@ let rY = Scalar::random(&mut csprng);
     let z = x * y;
     let rZ = Scalar::random(&mut csprng);
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, X, Y, Z) = ProductProof::prove(
       &gens_1,
@@ -684,12 +670,7 @@ let y = DotProductProofLog::compute_dotproduct(&x, &a);
     let r_x = Scalar::random(&mut csprng);
     let r_y = Scalar::random(&mut csprng);
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, Cx, Cy) = DotProductProof::prove(
       &gens_1,
@@ -724,12 +705,7 @@
     let r_x = Scalar::random(&mut csprng);
     let r_y = Scalar::random(&mut csprng);
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, Cx, Cy) = DotProductProofLog::prove(
       &gens,

@@ -1,6 +1,7 @@
 use super::dense_mlpoly::DensePolynomial;
 use super::errors::ProofVerifyError;
 use super::math::Math;
+use super::random::RandomTape;
 use super::scalar::Scalar;
 use super::sparse_mlpoly::{
   MultiSparseMatPolynomialAsDense, SparseMatEntry, SparseMatPolyCommitment,
@@ -307,7 +308,7 @@ ry: &Vec<Scalar>,
     evals: &R1CSInstanceEvals,
     gens: &R1CSCommitmentGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> R1CSEvalProof {
     let timer = Timer::new("R1CSEvalProof::prove");
     let proof = SparseMatPolyEvalProof::prove(

@@ -7,6 +7,7 @@ use super::group::{CompressedGroup, GroupElement, VartimeMultiscalarMul};
 use super::math::Math;
 use super::nizk::{EqualityProof, KnowledgeProof, ProductProof};
 use super::r1csinstance::{R1CSInstance, R1CSInstanceEvals};
+use super::random::RandomTape;
 use super::scalar::Scalar;
 use super::sparse_mlpoly::{SparsePolyEntry, SparsePolynomial};
 use super::sumcheck::ZKSumcheckInstanceProof;
@@ -81,7 +82,7 @@ evals_Bz: &mut DensePolynomial,
     evals_Cz: &mut DensePolynomial,
     gens: &R1CSSumcheckGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> (ZKSumcheckInstanceProof, Vec<Scalar>, Vec<Scalar>, Scalar) {
     let comb_func = |poly_A_comp: &Scalar,
                      poly_B_comp: &Scalar,
@@ -116,7 +117,7 @@ evals_z: &mut DensePolynomial,
     evals_ABC: &mut DensePolynomial,
     gens: &R1CSSumcheckGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> (ZKSumcheckInstanceProof, Vec<Scalar>, Vec<Scalar>, Scalar) {
     let comb_func =
       |poly_A_comp: &Scalar, poly_B_comp: &Scalar| -> Scalar { poly_A_comp * poly_B_comp };
@@ -146,7 +147,7 @@ vars: Vec<Scalar>,
     input: &Vec<Scalar>,
     gens: &R1CSGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> (R1CSProof, Vec<Scalar>, Vec<Scalar>) {
     let timer_prove = Timer::new("R1CSProof::prove");
     transcript.append_protocol_name(R1CSProof::protocol_name());
@@ -208,10 +209,10 @@
     let (tau_claim, Az_claim, Bz_claim, Cz_claim) =
       (&poly_tau[0], &poly_Az[0], &poly_Bz[0], &poly_Cz[0]);
     let (Az_blind, Bz_blind, Cz_blind, prod_Az_Bz_blind) = (
-      random_tape.challenge_scalar(b"Az_blind"),
-      random_tape.challenge_scalar(b"Bz_blind"),
-      random_tape.challenge_scalar(b"Cz_blind"),
-      random_tape.challenge_scalar(b"prod_Az_Bz_blind"),
+      random_tape.random_scalar(b"Az_blind"),
+      random_tape.random_scalar(b"Bz_blind"),
+      random_tape.random_scalar(b"Cz_blind"),
+      random_tape.random_scalar(b"prod_Az_Bz_blind"),
     );
 
     let (pok_Cz_claim, comm_Cz_claim) = {
@@ -294,7 +295,7 @@ timer_sc_proof_phase2.stop();
 
     let timer_polyeval = Timer::new("polyeval");
     let eval_vars_at_ry = poly_vars.evaluate(&ry[1..].to_vec());
-    let blind_eval = random_tape.challenge_scalar(b"blind_eval");
+    let blind_eval = random_tape.random_scalar(b"blind_eval");
     let (proof_eval_vars_at_ry, comm_vars_at_ry) = PolyEvalProof::prove(
       &poly_vars,
       Some(&blinds_vars),
@@ -597,12 +598,7 @@ let (inst, vars, input) = R1CSInstance::produce_synthetic_r1cs(num_cons, num_vars, num_inputs);
 
     let gens = R1CSGens::new(num_cons, num_vars, b"test-m");
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let (proof, rx, ry) = R1CSProof::prove(
       &inst,

@@ -0,0 +1,28 @@
+use super::scalar::Scalar;
+use super::transcript::ProofTranscript;
+use merlin::Transcript;
+use rand::rngs::OsRng;
+
+pub struct RandomTape {
+  tape: Transcript,
+}
+
+impl RandomTape {
+  pub fn new(name: &'static [u8]) -> Self {
+    let tape = {
+      let mut csprng: OsRng = OsRng;
+      let mut tape = Transcript::new(name);
+      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
+      tape
+    };
+    Self { tape }
+  }
+
+  pub fn random_scalar(&mut self, label: &'static [u8]) -> Scalar {
+    self.tape.challenge_scalar(label)
+  }
+
+  pub fn random_vector(&mut self, label: &'static [u8], len: usize) -> Vec<Scalar> {
+    self.tape.challenge_vector(label, len)
+  }
+}

@@ -5,6 +5,7 @@ };
 use super::errors::ProofVerifyError;
 use super::math::Math;
 use super::product_tree::{DotProductCircuit, ProductCircuit, ProductCircuitEvalProofBatched};
+use super::random::RandomTape;
 use super::scalar::Scalar;
 use super::timer::Timer;
 use super::transcript::{AppendToTranscript, ProofTranscript};
@@ -78,7 +79,7 @@ r: &Vec<Scalar>,
     evals: Vec<Scalar>,
     gens: &PolyCommitmentGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> PolyEvalProof {
     assert_eq!(joint_poly.get_num_vars(), r.len() + evals.len().log2());
 
@@ -122,7 +123,7 @@ eval_col_ops_val_vec: &Vec<Scalar>,
     r: &Vec<Scalar>,
     gens: &PolyCommitmentGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> Self {
     transcript.append_protocol_name(DerefsEvalProof::protocol_name());
 
@@ -752,7 +753,7 @@ dense: &MultiSparseMatPolynomialAsDense,
     derefs: &Derefs,
     gens: &SparseMatPolyCommitmentGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> Self {
     transcript.append_protocol_name(HashLayerProof::protocol_name());
 
@@ -1361,7 +1362,7 @@ derefs: &Derefs,
     evals: &Vec<Scalar>,
     gens: &SparseMatPolyCommitmentGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> Self {
     transcript.append_protocol_name(PolyEvalNetworkProof::protocol_name());
 
@@ -1493,7 +1494,7 @@ ry: &Vec<Scalar>,
     evals: &Vec<Scalar>, // a vector evaluation of \widetilde{M}(r = (rx,ry)) for each M
     gens: &SparseMatPolyCommitmentGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> SparseMatPolyEvalProof {
     transcript.append_protocol_name(SparseMatPolyEvalProof::protocol_name());
 
@@ -1689,12 +1690,7 @@ .collect::<Vec<Scalar>>();
     let eval = poly_M.evaluate(&rx, &ry);
     let evals = vec![eval, eval, eval];
 
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"proof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
+    let mut random_tape = RandomTape::new(b"proof");
     let mut prover_transcript = Transcript::new(b"example");
     let proof = SparseMatPolyEvalProof::prove(
       &dense,

@@ -5,11 +5,11 @@ R1CSCommitment, R1CSCommitmentGens, R1CSDecommitment, R1CSEvalProof, R1CSInstance,
   R1CSInstanceEvals,
 };
 use super::r1csproof::{R1CSGens, R1CSProof};
+use super::random::RandomTape;
 use super::scalar::Scalar;
 use super::timer::Timer;
 use super::transcript::{AppendToTranscript, ProofTranscript};
 use merlin::Transcript;
-use rand::rngs::OsRng;
 use serde::{Deserialize, Serialize};
 
 pub struct SNARKGens {
@@ -57,13 +57,7 @@ transcript: &mut Transcript,
   ) -> Self {
     // we create a Transcript object seeded with a random Scalar
     // to aid the prover produce its randomness
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"SpartanSNARKProof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
-
+    let mut random_tape = RandomTape::new(b"proof");
     transcript.append_protocol_name(SNARK::protocol_name());
     let (r1cs_sat_proof, rx, ry) = {
       let (proof, rx, ry) = R1CSProof::prove(
@@ -190,13 +184,7 @@ transcript: &mut Transcript,
   ) -> Self {
     // we create a Transcript object seeded with a random Scalar
     // to aid the prover produce its randomness
-    let mut random_tape = {
-      let mut csprng: OsRng = OsRng;
-      let mut tape = Transcript::new(b"SpartanNIZKProof");
-      tape.append_scalar(b"init_randomness", &Scalar::random(&mut csprng));
-      tape
-    };
-
+    let mut random_tape = RandomTape::new(b"proof");
     transcript.append_protocol_name(NIZK::protocol_name());
     let (r1cs_sat_proof, rx, ry) = {
       let (proof, rx, ry) = R1CSProof::prove(

@@ -3,6 +3,7 @@ use super::dense_mlpoly::DensePolynomial;
 use super::errors::ProofVerifyError;
 use super::group::{CompressedGroup, GroupElement, VartimeMultiscalarMul};
 use super::nizk::DotProductProof;
+use super::random::RandomTape;
 use super::scalar::Scalar;
 use super::transcript::{AppendToTranscript, ProofTranscript};
 use super::unipoly::{CompressedUniPoly, UniPoly};
@@ -567,14 +568,14 @@ comb_func: F,
     gens_1: &MultiCommitGens,
     gens_n: &MultiCommitGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> (Self, Vec<Scalar>, Vec<Scalar>, Scalar)
   where
     F: Fn(&Scalar, &Scalar) -> Scalar,
   {
     let (blinds_poly, blinds_evals) = (
-      random_tape.challenge_vector(b"blinds_poly", num_rounds),
-      random_tape.challenge_vector(b"blinds_evals", num_rounds),
+      random_tape.random_vector(b"blinds_poly", num_rounds),
+      random_tape.random_vector(b"blinds_evals", num_rounds),
     );
     let mut claim_per_round = *claim;
     let mut comm_claim_per_round = claim_per_round.commit(&blind_claim, &gens_1).compress();
@@ -729,14 +730,14 @@ comb_func: F,
     gens_1: &MultiCommitGens,
     gens_n: &MultiCommitGens,
     transcript: &mut Transcript,
-    random_tape: &mut Transcript,
+    random_tape: &mut RandomTape,
   ) -> (Self, Vec<Scalar>, Vec<Scalar>, Scalar)
   where
     F: Fn(&Scalar, &Scalar, &Scalar, &Scalar) -> Scalar,
   {
     let (blinds_poly, blinds_evals) = (
-      random_tape.challenge_vector(b"blinds_poly", num_rounds),
-      random_tape.challenge_vector(b"blinds_evals", num_rounds),
+      random_tape.random_vector(b"blinds_poly", num_rounds),
+      random_tape.random_vector(b"blinds_evals", num_rounds),
     );
 
     let mut claim_per_round = *claim;