From eb24f3df8447a8f68141c538547ed601ccc0aa0c Mon Sep 17 00:00:00 2001 From: Stephen Akridge Date: Mon, 27 Apr 2020 09:33:33 -0700 Subject: [PATCH] Update dalek version --- Cargo.lock | 73 ++++++++------- accounts-bench/Cargo.toml | 2 +- archiver-lib/Cargo.toml | 6 +- archiver-utils/Cargo.toml | 2 +- banking-bench/Cargo.toml | 2 +- bench-exchange/Cargo.toml | 2 +- chacha/Cargo.toml | 4 +- core/Cargo.toml | 6 +- crate-features/Cargo.toml | 6 +- dos/Cargo.toml | 2 +- ledger/Cargo.toml | 6 +- ledger/src/leader_schedule.rs | 3 +- local-cluster/Cargo.toml | 2 +- metrics/Cargo.toml | 2 +- net-shaper/Cargo.toml | 2 +- net-utils/Cargo.toml | 2 +- perf/Cargo.toml | 2 +- perf/src/sigverify.rs | 2 +- programs/bpf/Cargo.lock | 166 +++++----------------------------- programs/storage/Cargo.toml | 2 +- runtime/Cargo.toml | 2 +- sdk-c/Cargo.toml | 6 +- sdk/Cargo.toml | 6 +- sdk/src/signature.rs | 4 +- validator/Cargo.toml | 2 +- 25 files changed, 98 insertions(+), 216 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 429ed726e7..90b78bebba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -724,15 +724,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "1.2.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d" +checksum = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839" dependencies = [ "byteorder", - "clear_on_drop", "digest 0.8.1", - "rand_core 0.3.1", + "rand_core 0.5.1", "subtle 2.2.2", + "zeroize", ] [[package]] @@ -838,14 +838,13 @@ checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" [[package]] name = "ed25519-dalek" -version = "1.0.0-pre.1" +version = "1.0.0-pre.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81956bcf7ef761fb4e1d88de3fa181358a0d26cbcb9755b587a08f9119824b86" +checksum = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2" dependencies = [ "clear_on_drop", "curve25519-dalek", - "failure", - "rand 0.6.5", + "rand 0.7.3", "serde", "sha2 0.8.1", ] @@ -3055,7 +3054,7 @@ dependencies = [ "clap", "crossbeam-channel", "log 0.4.8", - "rand 0.6.5", + "rand 0.7.3", "rayon", "solana-logger", "solana-measure", @@ -3087,8 +3086,8 @@ dependencies = [ "ed25519-dalek", "hex", "log 0.4.8", - "rand 0.6.5", - "rand_chacha 0.1.1", + "rand 0.7.3", + "rand_chacha 0.2.2", "serde", "serde_derive", "serde_json", @@ -3114,7 +3113,7 @@ version = "1.2.0" dependencies = [ "hex", "log 0.4.8", - "rand 0.6.5", + "rand 0.7.3", "solana-chacha", "solana-chacha-sys", "solana-ledger", @@ -3129,7 +3128,7 @@ version = "1.2.0" dependencies = [ "crossbeam-channel", "log 0.4.8", - "rand 0.6.5", + "rand 0.7.3", "rayon", "solana-core", "solana-ledger", @@ -3150,7 +3149,7 @@ dependencies = [ "log 0.4.8", "num-derive 0.3.0", "num-traits 0.2.11", - "rand 0.6.5", + "rand 0.7.3", "rayon", "serde_json", "serde_yaml", @@ -3258,8 +3257,8 @@ version = "1.2.0" dependencies = [ "hex-literal", "log 0.4.8", - "rand 0.6.5", - "rand_chacha 0.1.1", + "rand 0.7.3", + "rand_chacha 0.2.2", "solana-chacha-sys", "solana-ledger", "solana-logger", @@ -3423,8 +3422,8 @@ dependencies = [ "matches", "num-traits 0.2.11", "num_cpus", - "rand 0.6.5", - "rand_chacha 0.1.1", + "rand 0.7.3", + "rand_chacha 0.2.2", "rayon", "regex", "reqwest", @@ -3479,7 +3478,7 @@ dependencies = [ "failure", "lazy_static", "libc", - "rand_chacha 0.1.1", + "rand_chacha 0.2.2", "regex-syntax", "reqwest", "serde", @@ -3496,7 +3495,7 @@ dependencies = [ "bincode", "clap", "log 0.4.8", - "rand 0.6.5", + "rand 0.7.3", "rayon", "solana-clap-utils", "solana-core", @@ -3678,8 +3677,8 @@ dependencies = [ "log 0.4.8", "matches", "num_cpus", - "rand 0.6.5", - "rand_chacha 0.1.1", + "rand 0.7.3", + "rand_chacha 0.2.2", "rayon", "reed-solomon-erasure", "regex", @@ -3736,7 +3735,7 @@ dependencies = [ "assert_matches", "itertools 0.9.0", "log 0.4.8", - "rand 0.6.5", + "rand 0.7.3", "serial_test", "serial_test_derive", "solana-archiver-lib", @@ -3808,7 +3807,7 @@ dependencies = [ "gethostname", "lazy_static", "log 0.4.8", - "rand 0.6.5", + "rand 0.7.3", "reqwest", "serial_test", "serial_test_derive", @@ -3820,7 +3819,7 @@ name = "solana-net-shaper" version = "1.2.0" dependencies = [ "clap", - "rand 0.6.5", + "rand 0.7.3", "serde", "serde_json", "solana-clap-utils", @@ -3836,7 +3835,7 @@ dependencies = [ "clap", "log 0.4.8", "nix", - "rand 0.6.5", + "rand 0.7.3", "serde", "serde_derive", "socket2", @@ -3877,7 +3876,7 @@ dependencies = [ "lazy_static", "log 0.4.8", "matches", - "rand 0.6.5", + "rand 0.7.3", "rayon", "serde", "solana-budget-program", @@ -3951,7 +3950,7 @@ dependencies = [ "num-derive 0.3.0", "num-traits 0.2.11", "num_cpus", - "rand 0.6.5", + "rand 0.7.3", "rayon", "serde", "serde_derive", @@ -3997,8 +3996,8 @@ dependencies = [ "num-derive 0.3.0", "num-traits 0.2.11", "pbkdf2", - "rand 0.6.5", - "rand_chacha 0.1.1", + "rand 0.7.3", + "rand_chacha 0.2.2", "serde", "serde_bytes", "serde_derive", @@ -4020,8 +4019,8 @@ dependencies = [ "cbindgen", "ed25519-dalek", "libc", - "rand_chacha 0.1.1", - "rand_core 0.3.1", + "rand_chacha 0.2.2", + "rand_core 0.5.1", "solana-sdk", ] @@ -4100,7 +4099,7 @@ dependencies = [ "log 0.4.8", "num-derive 0.3.0", "num-traits 0.2.11", - "rand 0.6.5", + "rand 0.7.3", "serde", "serde_derive", "solana-logger", @@ -4165,7 +4164,7 @@ dependencies = [ "console 0.10.3", "libc", "log 0.4.8", - "rand 0.6.5", + "rand 0.7.3", "serde_json", "signal-hook", "solana-clap-utils", @@ -5285,6 +5284,12 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "zeroize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" + [[package]] name = "zstd" version = "0.5.1+zstd.1.4.4" diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml index d0b0d2b58d..eb5edef61b 100644 --- a/accounts-bench/Cargo.toml +++ b/accounts-bench/Cargo.toml @@ -14,7 +14,7 @@ solana-logger = { path = "../logger", version = "1.2.0" } solana-runtime = { path = "../runtime", version = "1.2.0" } solana-measure = { path = "../measure", version = "1.2.0" } solana-sdk = { path = "../sdk", version = "1.2.0" } -rand = "0.6.5" +rand = "0.7.0" clap = "2.33.0" crossbeam-channel = "0.4" diff --git a/archiver-lib/Cargo.toml b/archiver-lib/Cargo.toml index d1cdd581cb..04e1a0fc0e 100644 --- a/archiver-lib/Cargo.toml +++ b/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_chacha = "0.1.1" +rand = "0.7.0" +rand_chacha = "0.2.2" solana-client = { path = "../client", version = "1.2.0" } solana-storage-program = { path = "../programs/storage", version = "1.2.0" } thiserror = "1.0" diff --git a/archiver-utils/Cargo.toml b/archiver-utils/Cargo.toml index 3224964d12..5980602e76 100644 --- a/archiver-utils/Cargo.toml +++ b/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.2.0" } solana-chacha-sys = { path = "../chacha-sys", version = "1.2.0" } solana-ledger = { path = "../ledger", version = "1.2.0" } diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml index e5f6fcb89a..db1d4dd919 100644 --- a/banking-bench/Cargo.toml +++ b/banking-bench/Cargo.toml @@ -18,7 +18,7 @@ solana-logger = { path = "../logger", version = "1.2.0" } solana-runtime = { path = "../runtime", version = "1.2.0" } solana-measure = { path = "../measure", version = "1.2.0" } solana-sdk = { path = "../sdk", version = "1.2.0" } -rand = "0.6.5" +rand = "0.7.0" crossbeam-channel = "0.4" [package.metadata.docs.rs] diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index 9d7b214e4a..59ff765787 100644 --- a/bench-exchange/Cargo.toml +++ b/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.51" serde_yaml = "0.8.11" diff --git a/chacha/Cargo.toml b/chacha/Cargo.toml index ec48369999..799001f92a 100644 --- a/chacha/Cargo.toml +++ b/chacha/Cargo.toml @@ -10,8 +10,8 @@ edition = "2018" [dependencies] log = "0.4.8" -rand = "0.6.5" -rand_chacha = "0.1.1" +rand = "0.7.0" +rand_chacha = "0.2.2" solana-chacha-sys = { path = "../chacha-sys", version = "1.2.0" } solana-ledger = { path = "../ledger", version = "1.2.0" } solana-logger = { path = "../logger", version = "1.2.0" } diff --git a/core/Cargo.toml b/core/Cargo.toml index 344fed684f..0d1909b780 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -34,8 +34,8 @@ jsonrpc-ws-server = "14.1.0" log = "0.4.8" num_cpus = "1.13.0" num-traits = "0.2" -rand = "0.6.5" -rand_chacha = "0.1.1" +rand = "0.7.0" +rand_chacha = "0.2.2" rayon = "1.3.0" regex = "1.3.7" serde = "1.0.106" @@ -47,7 +47,7 @@ solana-clap-utils = { path = "../clap-utils", version = "1.2.0" } solana-client = { path = "../client", version = "1.2.0" } solana-transaction-status = { path = "../transaction-status", version = "1.2.0" } solana-faucet = { path = "../faucet", version = "1.2.0" } -ed25519-dalek = "=1.0.0-pre.1" +ed25519-dalek = "=1.0.0-pre.3" solana-ledger = { path = "../ledger", version = "1.2.0" } solana-logger = { path = "../logger", version = "1.2.0" } solana-merkle-tree = { path = "../merkle-tree", version = "1.2.0" } diff --git a/crate-features/Cargo.toml b/crate-features/Cargo.toml index 63a8fe23d3..f8c57d2ea3 100644 --- a/crate-features/Cargo.toml +++ b/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"] } diff --git a/dos/Cargo.toml b/dos/Cargo.toml index dea09ef90e..69fa2d6cef 100644 --- a/dos/Cargo.toml +++ b/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-clap-utils = { path = "../clap-utils", version = "1.2.0" } solana-core = { path = "../core", version = "1.2.0" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index bd1933e0bc..598edc1e58 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -23,8 +23,8 @@ itertools = "0.9.0" libc = "0.2.69" log = { version = "0.4.8" } num_cpus = "1.13.0" -rand = "0.6.5" -rand_chacha = "0.1.1" +rand = "0.7.0" +rand_chacha = "0.2.2" rayon = "1.3.0" reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] } regex = "1.3.7" @@ -37,7 +37,7 @@ solana-measure = { path = "../measure", version = "1.2.0" } solana-merkle-tree = { path = "../merkle-tree", version = "1.2.0" } solana-metrics = { path = "../metrics", version = "1.2.0" } solana-perf = { path = "../perf", version = "1.2.0" } -ed25519-dalek = "1.0.0-pre.1" +ed25519-dalek = "1.0.0-pre.3" solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.2.0" } solana-runtime = { path = "../runtime", version = "1.2.0" } solana-sdk = { path = "../sdk", version = "1.2.0" } diff --git a/ledger/src/leader_schedule.rs b/ledger/src/leader_schedule.rs index 312aac531b..fc63c52b0e 100644 --- a/ledger/src/leader_schedule.rs +++ b/ledger/src/leader_schedule.rs @@ -1,6 +1,5 @@ use rand::distributions::{Distribution, WeightedIndex}; -use rand::SeedableRng; -use rand_chacha::ChaChaRng; +use rand_chacha::{rand_core::SeedableRng, ChaChaRng}; use solana_sdk::pubkey::Pubkey; use std::ops::Index; use std::sync::Arc; diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml index bb99565efb..62d2af85c5 100644 --- a/local-cluster/Cargo.toml +++ b/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.2.0" } solana-config-program = { path = "../programs/config", version = "1.2.0" } solana-core = { path = "../core", version = "1.2.0" } diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index bffba2507a..d2f2e2a668 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -17,7 +17,7 @@ reqwest = { version = "0.10.4", default-features = false, features = ["blocking" solana-sdk = { path = "../sdk", version = "1.2.0" } [dev-dependencies] -rand = "0.6.5" +rand = "0.7.0" serial_test = "0.4.0" serial_test_derive = "0.4.0" diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml index 7312b00811..86c9e50490 100644 --- a/net-shaper/Cargo.toml +++ b/net-shaper/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0.106" serde_json = "1.0.51" solana-clap-utils = { path = "../clap-utils", version = "1.2.0" } solana-logger = { path = "../logger", version = "1.2.0" } -rand = "0.6.5" +rand = "0.7.0" [[bin]] name = "solana-net-shaper" diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml index 978a6658da..4a32229521 100644 --- a/net-utils/Cargo.toml +++ b/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.106" serde_derive = "1.0.103" socket2 = "0.3.12" diff --git a/perf/Cargo.toml b/perf/Cargo.toml index 25fd65730e..a66b7f18f7 100644 --- a/perf/Cargo.toml +++ b/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" diff --git a/perf/src/sigverify.rs b/perf/src/sigverify.rs index 9b8f0541b5..82f6fb4743 100644 --- a/perf/src/sigverify.rs +++ b/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); } diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index f390849399..d1836f22f4 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -49,11 +49,6 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "autocfg" version = "1.0.0" @@ -349,14 +344,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "1.2.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -382,13 +377,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ed25519-dalek" -version = "1.0.0-pre.1" +version = "1.0.0-pre.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -514,11 +508,6 @@ name = "fs_extra" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -1213,24 +1202,6 @@ dependencies = [ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rand" version = "0.7.3" @@ -1243,15 +1214,6 @@ dependencies = [ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rand_chacha" version = "0.2.2" @@ -1261,19 +1223,6 @@ dependencies = [ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "rand_core" version = "0.5.1" @@ -1282,14 +1231,6 @@ dependencies = [ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -1298,54 +1239,6 @@ dependencies = [ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rayon" version = "1.3.0" @@ -1368,14 +1261,6 @@ dependencies = [ "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "redox_syscall" version = "0.1.56" @@ -1843,13 +1728,13 @@ dependencies = [ "backtrace 0.3.46 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", - "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)", + "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1917,7 +1802,7 @@ dependencies = [ "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1944,7 +1829,7 @@ dependencies = [ "bv 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1954,8 +1839,8 @@ dependencies = [ "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2006,7 +1891,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "solana-logger 1.2.0", @@ -2637,6 +2522,11 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "zeroize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [metadata] "checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" @@ -2645,7 +2535,6 @@ dependencies = [ "checksum ascii 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae7d751998c189c1d4468cf0a39bb2eae052a9c58d50ebb3b9591ee3813ad50" "checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" "checksum backtrace 0.3.46 (registry+https://github.com/rust-lang/crates.io-index)" = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e" "checksum backtrace-sys 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "78848718ee1255a2485d1309ad9cdecfc2e7d0362dd11c6829364c6b35ae1bc7" @@ -2683,11 +2572,11 @@ dependencies = [ "checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" "checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" "checksum ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113" -"checksum curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d" +"checksum curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839" "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" "checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" -"checksum ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81956bcf7ef761fb4e1d88de3fa181358a0d26cbcb9755b587a08f9119824b86" +"checksum ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)" = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2" "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" "checksum elf 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4841de15dbe0e49b9b62a417589299e3be0d557e0900d36acb87e6dae47197f5" "checksum elfkit 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "02f182eda16a7360c80a2f8638d0726e9d5478173058f1505c42536ca666ecd2" @@ -2701,7 +2590,6 @@ dependencies = [ "checksum feature-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" -"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" @@ -2785,23 +2673,12 @@ dependencies = [ "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" "checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" -"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" "checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" "checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" "checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" "checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" -"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" "checksum regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" "checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" @@ -2898,3 +2775,4 @@ dependencies = [ "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" "checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +"checksum zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" diff --git a/programs/storage/Cargo.toml b/programs/storage/Cargo.toml index d0593a73c0..a712780167 100644 --- a/programs/storage/Cargo.toml +++ b/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.106" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 90ddcdc5c3..7692fdde5c 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -23,7 +23,7 @@ memmap = "0.7.0" num-derive = { version = "0.3" } num-traits = { version = "0.2" } num_cpus = "1.13.0" -rand = "0.6.5" +rand = "0.7.0" rayon = "1.3.0" serde = { version = "1.0.106", features = ["rc"] } serde_derive = "1.0.103" diff --git a/sdk-c/Cargo.toml b/sdk-c/Cargo.toml index 928d928da4..902a2b0b18 100644 --- a/sdk-c/Cargo.toml +++ b/sdk-c/Cargo.toml @@ -16,10 +16,10 @@ crate-type = ["staticlib"] bincode = "1.2.1" bs58 = "0.3.1" libc = "0.2.69" -rand_chacha = "0.1.1" -rand_core = { version = ">=0.2, <0.4", default-features = false } +rand_chacha = "0.2.2" +rand_core = { version = "0.5", default-features = false } solana-sdk = { path = "../sdk", version = "1.2.0" } -ed25519-dalek = "1.0.0-pre.1" +ed25519-dalek = "1.0.0-pre.3" [build-dependencies] cbindgen = "0.14.1" diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 35c066e20d..a640ae34ef 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -42,15 +42,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_chacha = { version = "0.1.1", optional = true } +rand = { version = "0.7.0", optional = true } +rand_chacha = { version = "0.2.2", optional = true } serde = "1.0.106" serde_bytes = "0.11" serde_derive = "1.0.103" serde_json = { version = "1.0.51", 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.2.0", optional = true } solana-logger = { path = "../logger", version = "1.2.0", optional = true } solana-sdk-macro = { path = "macro", version = "1.2.0" } diff --git a/sdk/src/signature.rs b/sdk/src/signature.rs index 7967c30d4e..9a4ad449d2 100644 --- a/sdk/src/signature.rs +++ b/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() } } diff --git a/validator/Cargo.toml b/validator/Cargo.toml index d745b79882..4d5c229fd5 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -13,7 +13,7 @@ clap = "2.33.0" chrono = { version = "0.4.11", features = ["serde"] } console = "0.10.1" log = "0.4.8" -rand = "0.6.5" +rand = "0.7.0" serde_json = "1.0.51" solana-clap-utils = { path = "../clap-utils", version = "1.2.0" } solana-client = { path = "../client", version = "1.2.0" }