chore: update snarkVM rev and rand

Many tests needed to be updated to confirm to the new `rand` API.

Author: kaimast

Cargo.lock

@@ -47,9 +47,10 @@ default-features = false
 
 [workspace.dependencies.snarkvm]
 #path = "../snarkVM"
-#git = "https://github.com/ProvableHQ/snarkVM.git"
-#rev = "2a5e6e2"
-version = "=4.6.0"
+git = "https://github.com/ProvableHQ/snarkVM.git"
+branch = "fix/prop-tests"
+#rev = "f7abfceee0"
+#version = "=4.6.0"
 default-features = false
 
 [workspace.dependencies.anyhow]
@@ -107,7 +108,7 @@ version = "1"
 version = "1"
 
 [workspace.dependencies.proptest]
-version = "=1.6.0" # Remove this once we upgrade to rand 0.9
+version = "1.11"
 
 [workspace.dependencies.rayon]
 version = "1"
@@ -145,15 +146,15 @@ version = "1"
 version = "0.12"
 
 [workspace.dependencies.rand]
-version = "0.8"
+version = "0.10"
 default-features = false
 
 [workspace.dependencies.rand_chacha]
-version = "0.3"
+version = "0.10"
 default-features = false
 
 [workspace.dependencies.rand_distr]
-version = "0.4"
+version = "0.6"
 
 [workspace.dependencies.smol_str]
 version = "=0.3.2" # Update after Rust >1.88

Cargo.toml

@@ -187,7 +187,7 @@ mod tests {
         let account = Account::<CurrentNetwork>::new(&mut rng).unwrap();
 
         // TODO(kaimast): remove once we upgrade the rand crate
-        let message = (0..10).map(|_| rng.r#gen::<u8>()).collect::<Vec<u8>>();
+        let message = (0..10).map(|_| rng.random::<u8>()).collect::<Vec<u8>>();
         // Sign and verify.
         let signature = account.sign_bytes(&message, &mut rng).unwrap();
         assert!(account.verify_bytes(&message, &signature));
@@ -199,7 +199,7 @@ mod tests {
         let mut rng = TestRng::default();
         // Prepare the account and message.
         let account = Account::<CurrentNetwork>::new(&mut rng).unwrap();
-        let message = (0..10).map(|_| rng.r#gen::<bool>()).collect::<Vec<bool>>();
+        let message = (0..10).map(|_| rng.random::<bool>()).collect::<Vec<bool>>();
         // Sign and verify.
         let signature = account.sign_bits(&message, &mut rng).unwrap();
         assert!(account.verify_bits(&message, &signature));

account/src/lib.rs

@@ -156,7 +156,7 @@ impl Account {
     /// Generates a new Aleo account with the given vanity string.
     fn new_vanity<N: Network>(vanity: &str, discreet: bool) -> Result<String> {
         // A closure to generate a new Aleo account.
-        let sample_account = || snarkos_account::Account::<N>::new(&mut rand::thread_rng());
+        let sample_account = || snarkos_account::Account::<N>::new(&mut rand::rng());
 
         const ITERATIONS: u128 = u16::MAX as u128;
         const ITERATIONS_STR: &str = "65,535";
@@ -235,7 +235,7 @@ impl Account {
                 Field::new(<N as Environment>::Field::from_str(&seed).map_err(|e| anyhow!("Invalid seed - {e}"))?)
             }
             // Sample a random field element.
-            None => Field::rand(&mut ChaChaRng::from_entropy()),
+            None => Field::rand(&mut ChaChaRng::from_rng(&mut rand::rng())),
         };
         // Recover the private key from the seed as a field element.
         let private_key =

cli/src/commands/account.rs

@@ -62,7 +62,7 @@ impl Sign {
     // Sign a message with an Aleo private key
     fn sign<N: Network>(self) -> Result<String> {
         // Sample a random field element.
-        let mut rng = ChaChaRng::from_entropy();
+        let mut rng = ChaChaRng::from_rng(&mut rand::rng());
 
         // Parse the private key
         let private_key = parse_private_key(self.private_key.clone(), self.private_key_file.clone(), self.dev_key)?;

cli/src/commands/account/sign.rs

@@ -78,7 +78,7 @@ mod tests {
     };
 
     use indexmap::IndexMap;
-    use rand::Rng;
+    use rand::RngExt;
 
     type CurrentNetwork = MainnetV0;
 
@@ -91,7 +91,7 @@ mod tests {
     ) -> Result<Record<N, Ciphertext<N>>> {
         // Prepare the record.
         let randomizer = Scalar::rand(rng);
-        let version = match rng.r#gen() {
+        let version = match rng.random() {
             true => U8::<N>::one(),
             false => U8::<N>::zero(),
         };

cli/src/commands/developer/decrypt.rs

@@ -175,7 +175,7 @@ impl Deploy {
         // Generate the deployment transaction.
         let transaction = {
             // Initialize an RNG.
-            let rng = &mut rand::thread_rng();
+            let rng = &mut rand::rng();
 
             // Initialize the storage.
             let store = ConsensusStore::<N, ConsensusMemory<N>>::open(StorageMode::Production)

cli/src/commands/developer/deploy.rs

@@ -148,7 +148,7 @@ impl Execute {
         // Generate the execution transaction.
         let transaction = {
             // Initialize an RNG.
-            let rng = &mut rand::thread_rng();
+            let rng = &mut rand::rng();
 
             // Initialize the storage.
             let store = ConsensusStore::<N, ConsensusMemory<N>>::open(StorageMode::Production)?;

cli/src/commands/developer/execute.rs

@@ -117,7 +117,7 @@ impl TransferPrivate {
         // Generate the transfer_private transaction.
         let transaction = {
             // Initialize an RNG.
-            let rng = &mut rand::thread_rng();
+            let rng = &mut rand::rng();
 
             // Initialize the storage.
             let store = ConsensusStore::<N, ConsensusMemory<N>>::open(StorageMode::Production)?;

cli/src/commands/developer/transfer_private.rs

@@ -52,7 +52,7 @@ use clap::Parser;
 use colored::Colorize;
 use core::str::FromStr;
 use indexmap::IndexMap;
-use rand::{Rng, SeedableRng};
+use rand::{RngExt, SeedableRng};
 use rand_chacha::ChaChaRng;
 use serde::{Deserialize, Serialize};
 
@@ -401,7 +401,7 @@ impl Start {
                 }
                 // Ensure the private key is provided to the CLI, except for clients or nodes in development mode.
                 (None, None) => match self.client {
-                    true => Account::new(&mut rand::thread_rng()),
+                    true => Account::new(&mut rand::rng()),
                     false => bail!("Missing the '--private-key' or '--private-key-file' argument"),
                 },
                 // Ensure only one private key flag is provided to the CLI.
@@ -575,7 +575,7 @@ impl Start {
                         members.entry(*validator_address).and_modify(|(stake, _, _)| *stake += amount).or_insert((
                             *amount,
                             true,
-                            rng.gen_range(0..100),
+                            rng.random_range(0..100),
                         ));
                     }
                     // Construct the committee.
@@ -591,7 +591,7 @@ impl Start {
                     // Construct the committee members and distribute stakes evenly among committee members.
                     let members = development_addresses
                         .iter()
-                        .map(|address| (*address, (stake_per_member, true, rng.gen_range(0..100))))
+                        .map(|address| (*address, (stake_per_member, true, rng.random_range(0..100))))
                         .collect::<IndexMap<_, _>>();
 
                     // Construct the bonded balances.