Refactor random generation to CryptoRngCore

bin/datatool/Cargo.toml

@@ -17,7 +17,7 @@ argh.workspace = true
 bech32 = "0.11.0"
 bitcoin = { workspace = true, features = ["std"] }
 hex.workspace = true
-rand.workspace = true
+rand_core.workspace = true
 secp256k1 = { workspace = true, features = ["global-context", "std"] }
 serde_json.workspace = true
 terrors = "0.3.0"

bin/datatool/src/args.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 
 use argh::FromArgs;
 use bitcoin::Network;
-use rand::rngs::OsRng;
+use rand_core::OsRng;
 
 /// Args.
 #[derive(FromArgs)]

bin/datatool/src/main.rs

@@ -10,7 +10,7 @@ mod util;
 use std::path::PathBuf;
 
 use args::CmdContext;
-use rand::rngs::OsRng;
+use rand_core::OsRng;
 use util::{exec_subc, resolve_network};
 
 fn main() {

bin/datatool/src/util.rs

@@ -14,7 +14,7 @@ use bitcoin::{
     bip32::{Xpriv, Xpub},
     Network,
 };
-use rand::{CryptoRng, RngCore};
+use rand_core::CryptoRngCore;
 use strata_key_derivation::{
     operator::{convert_base_xpub_to_message_xpub, convert_base_xpub_to_wallet_xpub, OperatorKeys},
     sequencer::SequencerKeys,
@@ -237,9 +237,9 @@ fn exec_genparams(cmd: SubcParams, ctx: &mut CmdContext) -> anyhow::Result<()> {
 /// # Notes
 ///
 /// Takes a mutable reference to an RNG to allow flexibility in testing.
-/// The actual generation requires a high-entropy source like [`OsRng`](rand::rngs::OsRng)
+/// The actual generation requires a high-entropy source like [`OsRng`](rand_core::OsRng)
 /// to securely generate extended private keys.
-fn gen_priv<R: CryptoRng + RngCore>(rng: &mut R, net: Network) -> ZeroizableXpriv {
+fn gen_priv<R: CryptoRngCore>(rng: &mut R, net: Network) -> ZeroizableXpriv {
     let mut seed = [0u8; 32];
     rng.fill_bytes(&mut seed);
     let mut xpriv = Xpriv::new_master(net, &seed).expect("valid seed");

bin/strata-cli/Cargo.toml

@@ -36,7 +36,7 @@ console = "0.15.8"
 dialoguer = "0.11.0"
 directories = "5.0.1"
 indicatif = { version = "0.17.8", features = ["improved_unicode", "tokio"] }
-rand.workspace = true
+rand_core.workspace = true
 reqwest.workspace = true
 serde.workspace = true
 sha2 = { version = "0.10.8", features = ["loongarch64_asm"] }

bin/strata-cli/src/cmd/change_pwd.rs

@@ -1,6 +1,6 @@
 use argh::FromArgs;
 use console::Term;
-use rand::rngs::OsRng;
+use rand_core::OsRng;
 
 use crate::seed::{password::Password, EncryptedSeedPersister, Seed};
 

bin/strata-cli/src/cmd/faucet.rs

@@ -6,7 +6,6 @@ use argh::FromArgs;
 use bdk_wallet::{bitcoin::Address, KeychainKind};
 use console::Term;
 use indicatif::ProgressBar;
-use rand::{distributions::uniform::SampleRange, rngs::OsRng};
 use reqwest::{StatusCode, Url};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
@@ -71,15 +70,17 @@ pub async fn faucet(args: FaucetArgs, seed: Seed, settings: Settings) {
         hasher
     };
     let pb = ProgressBar::new_spinner();
+    let mut counter = 0u64;
     while !pow_valid(
         prehash.clone(),
         challenge.difficulty,
         solution.to_le_bytes(),
     ) {
         solution += 1;
-        if (0..100).sample_single(&mut OsRng) == 0 {
+        if counter % 100 == 0 {
             pb.set_message(format!("Trying {solution}"));
         }
+        counter += 1;
     }
     pb.finish_with_message(format!(
         "✔ Solved challenge after {solution} attempts. Claiming now."

bin/strata-cli/src/recovery.rs

@@ -13,7 +13,7 @@ use bdk_wallet::{
     miniscript::{descriptor::DescriptorKeyParseError, Descriptor},
     template::DescriptorTemplateOut,
 };
-use rand::{rngs::OsRng, RngCore};
+use rand_core::{OsRng, RngCore};
 use sha2::{Digest, Sha256};
 use sled::IVec;
 use terrors::OneOf;

bin/strata-cli/src/seed.rs

@@ -12,7 +12,7 @@ use bip39::{Language, Mnemonic};
 use console::Term;
 use dialoguer::{Confirm, Input};
 use password::{HashVersion, IncorrectPassword, Password};
-use rand::{rngs::OsRng, CryptoRng, RngCore};
+use rand_core::{CryptoRngCore, OsRng};
 use sha2::{Digest, Sha256};
 use terrors::OneOf;
 use zeroize::Zeroizing;
@@ -31,7 +31,7 @@ impl BaseWallet {
 pub struct Seed(Zeroizing<[u8; SEED_LEN]>);
 
 impl Seed {
-    fn gen<R: CryptoRng + RngCore>(rng: &mut R) -> Self {
+    fn gen<R: CryptoRngCore>(rng: &mut R) -> Self {
         let mut bytes = Zeroizing::new([0u8; SEED_LEN]);
         rng.fill_bytes(bytes.as_mut());
         Self(bytes)
@@ -50,7 +50,7 @@ impl Seed {
         hasher.finalize().into()
     }
 
-    pub fn encrypt<R: CryptoRng + RngCore>(
+    pub fn encrypt<R: CryptoRngCore>(
         &self,
         password: &mut Password,
         rng: &mut R,
@@ -264,7 +264,7 @@ pub mod password;
 
 #[cfg(test)]
 mod test {
-    use rand::rngs::OsRng;
+    use rand_core::OsRng;
     use sha2::digest::generic_array::GenericArray;
 
     use super::*;

crates/test-utils/Cargo.toml

@@ -21,6 +21,7 @@ bitcoin = { workspace = true, features = ["rand-std"] }
 hex.workspace = true
 musig2.workspace = true
 rand.workspace = true
+rand_core.workspace = true
 revm.workspace = true
 rockbound.workspace = true
 serde_json.workspace = true

crates/test-utils/src/lib.rs

@@ -1,5 +1,5 @@
 use arbitrary::{Arbitrary, Unstructured};
-use rand::{rngs::OsRng, CryptoRng, RngCore};
+use rand_core::{CryptoRngCore, OsRng};
 
 pub mod bitcoin;
 pub mod bridge;
@@ -57,15 +57,15 @@ impl ArbitraryGenerator {
     /// # Arguments
     ///
     /// * `rng` - An RNG to be used for generating the arbitrary instance. Provided RNG must
-    ///   implement the [`RngCore`] and [`CryptoRng`] traits.
+    ///   implement the [`CryptoRngCore`] trait.
     ///
     /// # Returns
     ///
     /// An arbitrary instance of type `T`.
     pub fn generate_with_rng<'a, T, R>(&'a mut self, rng: &mut R) -> T
     where
         T: Arbitrary<'a> + Clone,
-        R: RngCore + CryptoRng,
+        R: CryptoRngCore,
     {
         rng.fill_bytes(&mut self.buf);
         let mut u = Unstructured::new(&self.buf);