Update dalek (v1.1 bp) (#9765)

* Disable Move/Libra components

* Update dalek version

Co-authored-by: Trent Nelson <trent@solana.com>

accounts-bench/Cargo.toml

@@ -14,7 +14,7 @@ solana-logger = { path = "../logger", version = "1.1.8" }
 solana-runtime = { path = "../runtime", version = "1.1.8" }
 solana-measure = { path = "../measure", version = "1.1.8" }
 solana-sdk = { path = "../sdk", version = "1.1.8" }
-rand = "0.6.5"
+rand = "0.7.0"
 clap = "2.33.0"
 crossbeam-channel = "0.4"
 

archiver-lib/Cargo.toml

@@ -11,10 +11,10 @@ edition = "2018"
 [dependencies]
 bincode = "1.2.1"
 crossbeam-channel = "0.4"
-ed25519-dalek = "=1.0.0-pre.1"
+ed25519-dalek = "=1.0.0-pre.3"
 log = "0.4.8"
-rand = "0.6.5"
+rand = "0.7.0"
-rand_chacha = "0.1.1"
+rand_chacha = "0.2.2"
 solana-client = { path = "../client", version = "1.1.8" }
 solana-storage-program = { path = "../programs/storage", version = "1.1.8" }
 thiserror = "1.0"

archiver-lib/src/archiver.rs

@@ -1,7 +1,7 @@
 use crate::result::ArchiverError;
 use crossbeam_channel::unbounded;
-use rand::{thread_rng, Rng, SeedableRng};
+use rand::{thread_rng, Rng};
-use rand_chacha::ChaChaRng;
+use rand_chacha::{rand_core::SeedableRng, ChaChaRng};
 use solana_archiver_utils::sample_file;
 use solana_chacha::chacha::{chacha_cbc_encrypt_ledger, CHACHA_BLOCK_SIZE};
 use solana_client::{

archiver-utils/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.8"
-rand = "0.6.5"
+rand = "0.7.0"
 solana-chacha = { path = "../chacha", version = "1.1.8" }
 solana-chacha-sys = { path = "../chacha-sys", version = "1.1.8" }
 solana-ledger = { path = "../ledger", version = "1.1.8" }

banking-bench/Cargo.toml

@@ -18,7 +18,7 @@ solana-logger = { path = "../logger", version = "1.1.8" }
 solana-runtime = { path = "../runtime", version = "1.1.8" }
 solana-measure = { path = "../measure", version = "1.1.8" }
 solana-sdk = { path = "../sdk", version = "1.1.8" }
-rand = "0.6.5"
+rand = "0.7.0"
 crossbeam-channel = "0.4"
 
 [package.metadata.docs.rs]

bench-exchange/Cargo.toml

@@ -14,7 +14,7 @@ itertools = "0.9.0"
 log = "0.4.8"
 num-derive = "0.3"
 num-traits = "0.2"
-rand = "0.6.5"
+rand = "0.7.0"
 rayon = "1.3.0"
 serde_json = "1.0.48"
 serde_yaml = "0.8.11"

bench-tps/Cargo.toml

@@ -19,22 +19,22 @@ solana-core = { path = "../core", version = "1.1.8" }
 solana-genesis = { path = "../genesis", version = "1.1.8" }
 solana-client = { path = "../client", version = "1.1.8" }
 solana-faucet = { path = "../faucet", version = "1.1.8" }
-solana-librapay = { path = "../programs/librapay", version = "1.1.8", optional = true }
+#solana-librapay = { path = "../programs/librapay", version = "1.1.8", optional = true }
 solana-logger = { path = "../logger", version = "1.1.8" }
 solana-metrics = { path = "../metrics", version = "1.1.8" }
 solana-measure = { path = "../measure", version = "1.1.8" }
 solana-net-utils = { path = "../net-utils", version = "1.1.8" }
 solana-runtime = { path = "../runtime", version = "1.1.8" }
 solana-sdk = { path = "../sdk", version = "1.1.8" }
-solana-move-loader-program = { path = "../programs/move_loader", version = "1.1.8", optional = true }
+#solana-move-loader-program = { path = "../programs/move_loader", version = "1.1.8", optional = true }
 
 [dev-dependencies]
 serial_test = "0.4.0"
 serial_test_derive = "0.4.0"
 solana-local-cluster = { path = "../local-cluster", version = "1.1.8" }
 
-[features]
+#[features]
-move = ["solana-librapay", "solana-move-loader-program"]
+#move = ["solana-librapay", "solana-move-loader-program"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

chacha/Cargo.toml

@@ -10,8 +10,8 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.8"
-rand = "0.6.5"
+rand = "0.7.0"
-rand_chacha = "0.1.1"
+rand_chacha = "0.2.2"
 solana-chacha-sys = { path = "../chacha-sys", version = "1.1.8" }
 solana-ledger = { path = "../ledger", version = "1.1.8" }
 solana-logger = { path = "../logger", version = "1.1.8" }

ci/test-stable.sh

@@ -47,7 +47,7 @@ echo "Executing $testName"
 case $testName in
 test-stable)
   _ cargo +"$rust_stable" test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
-  _ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
+  #_ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
   ;;
 test-stable-perf)
   ci/affects-files.sh \

client/src/client_error.rs

@@ -52,7 +52,6 @@ impl Into<TransportError> for ClientErrorKind {
 pub struct ClientError {
     command: Option<&'static str>,
     #[source]
-    #[error(transparent)]
     kind: ClientErrorKind,
 }
 

core/Cargo.toml

@@ -34,8 +34,8 @@ jsonrpc-ws-server = "14.0.6"
 log = "0.4.8"
 num_cpus = "1.0.0"
 num-traits = "0.2"
-rand = "0.6.5"
+rand = "0.7.0"
-rand_chacha = "0.1.1"
+rand_chacha = "0.2.2"
 rayon = "1.3.0"
 regex = "1.3.6"
 serde = "1.0.105"
@@ -46,7 +46,7 @@ solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
 solana-client = { path = "../client", version = "1.1.8" }
 solana-transaction-status = { path = "../transaction-status", version = "1.1.8" }
 solana-faucet = { path = "../faucet", version = "1.1.8" }
-ed25519-dalek = "=1.0.0-pre.1"
+ed25519-dalek = "=1.0.0-pre.3"
 solana-ledger = { path = "../ledger", version = "1.1.8" }
 solana-logger = { path = "../logger", version = "1.1.8" }
 solana-merkle-tree = { path = "../merkle-tree", version = "1.1.8" }

crate-features/Cargo.toml

@@ -12,16 +12,16 @@ edition = "2018"
 backtrace = { version = "0.3.33", features = ["serialize-serde"] }
 bytes = { version = "0.4.12", features = ["either"] }
 cc = { version = "1.0.45", features = ["jobserver", "num_cpus", "parallel"]}
-curve25519-dalek = { version = "1.1.3" }
+curve25519-dalek = { version = "2" }
 either= { version = "1.5.2" }
 failure = { version = "0.1.5" }
 lazy_static = { version = "1.4.0", features = ["spin", "spin_no_std"] }
 libc = { version = "0.2.62", features = ["extra_traits"] }
-rand_chacha = { version = "0.1.1" }
+rand_chacha = { version = "0.2.2" }
 regex-syntax = { version = "0.6.12" }
 reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde = { version = "1.0.100", features = ["rc"] }
-ed25519-dalek = { version = "=1.0.0-pre.1", features = ["serde"] }
+ed25519-dalek = { version = "=1.0.0-pre.3", features = ["serde"] }
 syn_0_15 = { package = "syn", version = "0.15.42", features = ["extra-traits", "fold", "full"] }
 syn_1_0 = { package = "syn", version = "1.0.3", features = ["extra-traits", "fold", "full"] }
 tokio = { version = "0.1.22",features=["bytes", "codec", "default", "fs", "io", "mio", "num_cpus", "reactor", "rt-full", "sync", "tcp", "timer", "tokio-codec", "tokio-current-thread", "tokio-executor", "tokio-io", "tokio-io", "tokio-reactor", "tokio-tcp", "tokio-tcp", "tokio-threadpool", "tokio-timer", "tokio-udp", "tokio-uds", "udp", "uds"] }

dos/Cargo.toml

@@ -11,7 +11,7 @@ homepage = "https://solana.com/"
 bincode = "1.2.1"
 clap = "2.33.0"
 log = "0.4.8"
-rand = "0.6.5"
+rand = "0.7.0"
 rayon = "1.3.0"
 solana-core = { path = "../core", version = "1.1.8" }
 solana-logger = { path = "../logger", version = "1.1.8" }

ledger/Cargo.toml

@@ -21,8 +21,8 @@ itertools = "0.9.0"
 libc = "0.2.68"
 log = { version = "0.4.8" }
 num_cpus = "1.0.0"
-rand = "0.6.5"
+rand = "0.7.0"
-rand_chacha = "0.1.1"
+rand_chacha = "0.2.2"
 rayon = "1.3.0"
 reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] }
 regex = "1.3.6"
@@ -35,7 +35,7 @@ solana-measure = { path = "../measure", version = "1.1.8" }
 solana-merkle-tree = { path = "../merkle-tree", version = "1.1.8" }
 solana-metrics = { path = "../metrics", version = "1.1.8" }
 solana-perf = { path = "../perf", version = "1.1.8" }
-ed25519-dalek = "1.0.0-pre.1"
+ed25519-dalek = "1.0.0-pre.3"
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.1.8" }
 solana-runtime = { path = "../runtime", version = "1.1.8" }
 solana-sdk = { path = "../sdk", version = "1.1.8" }

ledger/src/leader_schedule.rs

@@ -1,6 +1,5 @@
 use rand::distributions::{Distribution, WeightedIndex};
-use rand::SeedableRng;
+use rand_chacha::{rand_core::SeedableRng, ChaChaRng};
-use rand_chacha::ChaChaRng;
 use solana_sdk::pubkey::Pubkey;
 use std::ops::Index;
 use std::sync::Arc;

local-cluster/Cargo.toml

@@ -11,7 +11,7 @@ homepage = "https://solana.com/"
 [dependencies]
 itertools = "0.9.0"
 log = "0.4.8"
-rand = "0.6.5"
+rand = "0.7.0"
 solana-archiver-lib = { path = "../archiver-lib", version = "1.1.8" }
 solana-config-program = { path = "../programs/config", version = "1.1.8" }
 solana-core = { path = "../core", version = "1.1.8" }

metrics/Cargo.toml

@@ -17,7 +17,7 @@ reqwest = { version = "0.10.4", default-features = false, features = ["blocking"
 solana-sdk = { path = "../sdk", version = "1.1.8" }
 
 [dev-dependencies]
-rand = "0.6.5"
+rand = "0.7.0"
 serial_test = "0.4.0"
 serial_test_derive = "0.4.0"
 

net-shaper/Cargo.toml

@@ -15,7 +15,7 @@ serde = "1.0.105"
 serde_json = "1.0.48"
 solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
 solana-logger = { path = "../logger", version = "1.1.8" }
-rand = "0.6.5"
+rand = "0.7.0"
 
 [[bin]]
 name = "solana-net-shaper"

net-utils/Cargo.toml

@@ -14,7 +14,7 @@ bytes = "0.4"
 clap = "2.33.0"
 log = "0.4.8"
 nix = "0.17.0"
-rand = "0.6.1"
+rand = "0.7.0"
 serde = "1.0.105"
 serde_derive = "1.0.103"
 socket2 = "0.3.11"

perf/Cargo.toml

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-rand = "0.6.5"
+rand = "0.7.0"
 dlopen = "0.1.8"
 bincode = "1.2.1"
 rayon = "1.3.0"

perf/src/sigverify.rs

@@ -312,7 +312,7 @@ pub fn ed25519_verify(
     // power-of-two number around that accounting for the fact that the CPU
     // may be busy doing other things while being a real validator
     // TODO: dynamically adjust this crossover
-    if count < 64 {
+    if count < std::usize::MAX {
         return ed25519_verify_cpu(batches);
     }
 

programs/storage/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2018"
 [dependencies]
 bincode = "1.2.1"
 log = "0.4.8"
-rand = "0.6.5"
+rand = "0.7.0"
 num-derive = "0.3"
 num-traits = "0.2"
 serde = "1.0.105"

runtime/Cargo.toml

@@ -23,7 +23,7 @@ memmap = "0.7.0"
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 num_cpus = "1.0.0"
-rand = "0.6.5"
+rand = "0.7.0"
 rayon = "1.3.0"
 serde = { version = "1.0.105", features = ["rc"] }
 serde_derive = "1.0.103"

sdk-c/Cargo.toml

@@ -16,10 +16,10 @@ crate-type = ["staticlib"]
 bincode = "1.2.1"
 bs58 = "0.3.0"
 libc = "0.2.68"
-rand_chacha = "0.1.1"
+rand_chacha = "0.2.2"
-rand_core = { version = ">=0.2, <0.4", default-features = false }
+rand_core = { version = "0.5", default-features = false }
 solana-sdk = { path = "../sdk", version = "1.1.8" }
-ed25519-dalek = "1.0.0-pre.1"
+ed25519-dalek = "1.0.0-pre.3"
 
 [build-dependencies]
 cbindgen = "0.13.2"

sdk/Cargo.toml

@@ -41,15 +41,15 @@ memmap = { version = "0.7.0", optional = true }
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 pbkdf2 = { version = "0.3.0", default-features = false }
-rand = { version = "0.6.5", optional = true }
+rand = { version = "0.7.0", optional = true }
-rand_chacha = { version = "0.1.1", optional = true }
+rand_chacha = { version = "0.2.2", optional = true }
 serde = "1.0.105"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
 serde_json = { version = "1.0.48", optional = true }
 sha2 = "0.8.1"
 thiserror = "1.0"
-ed25519-dalek = { version = "=1.0.0-pre.1", optional = true }
+ed25519-dalek = { version = "=1.0.0-pre.3", optional = true }
 solana-crate-features = { path = "../crate-features", version = "1.1.8", optional = true }
 solana-logger = { path = "../logger", version = "1.1.8", optional = true }
 solana-sdk-macro = { path = "macro", version = "1.1.8" }

sdk/src/signature.rs

@@ -28,7 +28,7 @@ impl Keypair {
 
     /// Return a new ED25519 keypair
     pub fn new() -> Self {
-        let mut rng = OsRng::new().unwrap();
+        let mut rng = OsRng::default();
         Self::generate(&mut rng)
     }
 
@@ -64,7 +64,7 @@ impl Signature {
         }
         pubkey
             .unwrap()
-            .verify(message_bytes, &signature.unwrap())
+            .verify_strict(message_bytes, &signature.unwrap())
             .is_ok()
     }
 }

validator/Cargo.toml

@@ -13,7 +13,7 @@ clap = "2.33.0"
 chrono = { version = "0.4.11", features = ["serde"] }
 console = "0.10.0"
 log = "0.4.8"
-rand = "0.6.5"
+rand = "0.7.0"
 serde_json = "1.0.48"
 solana-clap-utils = { path = "../clap-utils", version = "1.1.8" }
 solana-client = { path = "../client", version = "1.1.8" }