diff --git a/Cargo.lock b/Cargo.lock index 1c0a9362a8..49a112e337 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -290,7 +290,7 @@ dependencies = [ [[package]] name = "btc_spv_bin" -version = "0.22.1" +version = "0.22.3" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3105,37 +3105,37 @@ dependencies = [ [[package]] name = "solana-archiver" -version = "0.22.1" +version = "0.22.3" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-core 0.22.1", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-net-utils 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-core 0.22.3", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-net-utils 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-banking-bench" -version = "0.22.1" +version = "0.22.3" dependencies = [ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-core 0.22.1", - "solana-ledger 0.22.1", - "solana-logger 0.22.1", - "solana-measure 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-core 0.22.3", + "solana-ledger 0.22.3", + "solana-logger 0.22.3", + "solana-measure 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-bench-exchange" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3151,36 +3151,36 @@ dependencies = [ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-client 0.22.1", - "solana-core 0.22.1", - "solana-exchange-program 0.22.1", - "solana-faucet 0.22.1", - "solana-genesis 0.22.1", - "solana-local-cluster 0.22.1", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-net-utils 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-client 0.22.3", + "solana-core 0.22.3", + "solana-exchange-program 0.22.3", + "solana-faucet 0.22.3", + "solana-genesis 0.22.3", + "solana-local-cluster 0.22.3", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-net-utils 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ws 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-bench-streamer" -version = "0.22.1" +version = "0.22.3" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-core 0.22.1", - "solana-logger 0.22.1", - "solana-net-utils 0.22.1", + "solana-clap-utils 0.22.3", + "solana-core 0.22.3", + "solana-logger 0.22.3", + "solana-net-utils 0.22.3", ] [[package]] name = "solana-bench-tps" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3192,39 +3192,39 @@ dependencies = [ "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-client 0.22.1", - "solana-core 0.22.1", - "solana-faucet 0.22.1", - "solana-genesis 0.22.1", - "solana-librapay 0.22.1", - "solana-local-cluster 0.22.1", - "solana-logger 0.22.1", - "solana-measure 0.22.1", - "solana-metrics 0.22.1", - "solana-move-loader-program 0.22.1", - "solana-net-utils 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-client 0.22.3", + "solana-core 0.22.3", + "solana-faucet 0.22.3", + "solana-genesis 0.22.3", + "solana-librapay 0.22.3", + "solana-local-cluster 0.22.3", + "solana-logger 0.22.3", + "solana-measure 0.22.3", + "solana-metrics 0.22.3", + "solana-move-loader-program 0.22.3", + "solana-net-utils 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-bpf-loader-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-sdk 0.22.3", "solana_rbpf 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-btc-spv-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3234,12 +3234,12 @@ dependencies = [ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 0.22.1", + "solana-sdk 0.22.3", ] [[package]] name = "solana-budget-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3248,34 +3248,34 @@ dependencies = [ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-chacha-sys" -version = "0.22.1" +version = "0.22.3" dependencies = [ "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-clap-utils" -version = "0.22.1" +version = "0.22.3" dependencies = [ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 0.22.1", + "solana-sdk 0.22.3", "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-cli" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3296,27 +3296,27 @@ dependencies = [ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-budget-program 0.22.1", - "solana-clap-utils 0.22.1", - "solana-client 0.22.1", - "solana-config-program 0.22.1", - "solana-core 0.22.1", - "solana-faucet 0.22.1", - "solana-logger 0.22.1", - "solana-net-utils 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", - "solana-stake-program 0.22.1", - "solana-storage-program 0.22.1", - "solana-vote-program 0.22.1", - "solana-vote-signer 0.22.1", + "solana-budget-program 0.22.3", + "solana-clap-utils 0.22.3", + "solana-client 0.22.3", + "solana-config-program 0.22.3", + "solana-core 0.22.3", + "solana-faucet 0.22.3", + "solana-logger 0.22.3", + "solana-net-utils 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", + "solana-stake-program 0.22.3", + "solana-storage-program 0.22.3", + "solana-vote-program 0.22.3", + "solana-vote-signer 0.22.3", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-client" -version = "0.22.1" +version = "0.22.3" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3330,27 +3330,27 @@ dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-net-utils 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-net-utils 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-config-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-core" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3385,27 +3385,27 @@ dependencies = [ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-budget-program 0.22.1", - "solana-chacha-sys 0.22.1", - "solana-clap-utils 0.22.1", - "solana-client 0.22.1", - "solana-faucet 0.22.1", - "solana-ledger 0.22.1", - "solana-logger 0.22.1", - "solana-measure 0.22.1", - "solana-merkle-tree 0.22.1", - "solana-metrics 0.22.1", - "solana-net-utils 0.22.1", - "solana-perf 0.22.1", - "solana-rayon-threadlimit 0.22.1", + "solana-budget-program 0.22.3", + "solana-chacha-sys 0.22.3", + "solana-clap-utils 0.22.3", + "solana-client 0.22.3", + "solana-faucet 0.22.3", + "solana-ledger 0.22.3", + "solana-logger 0.22.3", + "solana-measure 0.22.3", + "solana-merkle-tree 0.22.3", + "solana-metrics 0.22.3", + "solana-net-utils 0.22.3", + "solana-perf 0.22.3", + "solana-rayon-threadlimit 0.22.3", "solana-reed-solomon-erasure 4.0.1-3 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", - "solana-stake-program 0.22.1", - "solana-storage-program 0.22.1", - "solana-sys-tuner 0.22.1", - "solana-vote-program 0.22.1", - "solana-vote-signer 0.22.1", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", + "solana-stake-program 0.22.3", + "solana-storage-program 0.22.3", + "solana-sys-tuner 0.22.3", + "solana-vote-program 0.22.3", + "solana-vote-signer 0.22.3", "symlink 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "systemstat 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3419,7 +3419,7 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "0.22.1" +version = "0.22.3" dependencies = [ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3442,30 +3442,30 @@ dependencies = [ [[package]] name = "solana-exchange-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-failure-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-faucet" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3474,17 +3474,17 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-sdk 0.22.3", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-fixed-buf" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3493,7 +3493,7 @@ dependencies = [ [[package]] name = "solana-genesis" -version = "0.22.1" +version = "0.22.3" dependencies = [ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3503,49 +3503,49 @@ dependencies = [ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-genesis-programs 0.22.1", - "solana-ledger 0.22.1", - "solana-sdk 0.22.1", - "solana-stake-program 0.22.1", - "solana-storage-program 0.22.1", - "solana-vote-program 0.22.1", + "solana-clap-utils 0.22.3", + "solana-genesis-programs 0.22.3", + "solana-ledger 0.22.3", + "solana-sdk 0.22.3", + "solana-stake-program 0.22.3", + "solana-storage-program 0.22.3", + "solana-vote-program 0.22.3", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-genesis-programs" -version = "0.22.1" +version = "0.22.3" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-bpf-loader-program 0.22.1", - "solana-budget-program 0.22.1", - "solana-config-program 0.22.1", - "solana-exchange-program 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", - "solana-stake-program 0.22.1", - "solana-storage-program 0.22.1", - "solana-vest-program 0.22.1", - "solana-vote-program 0.22.1", + "solana-bpf-loader-program 0.22.3", + "solana-budget-program 0.22.3", + "solana-config-program 0.22.3", + "solana-exchange-program 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", + "solana-stake-program 0.22.3", + "solana-storage-program 0.22.3", + "solana-vest-program 0.22.3", + "solana-vote-program 0.22.3", ] [[package]] name = "solana-gossip" -version = "0.22.1" +version = "0.22.3" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-client 0.22.1", - "solana-core 0.22.1", - "solana-logger 0.22.1", - "solana-net-utils 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-client 0.22.3", + "solana-core 0.22.3", + "solana-logger 0.22.3", + "solana-net-utils 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-install" -version = "0.22.1" +version = "0.22.3" dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3564,11 +3564,11 @@ dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-client 0.22.1", - "solana-config-program 0.22.1", - "solana-logger 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-client 0.22.3", + "solana-config-program 0.22.3", + "solana-logger 0.22.3", + "solana-sdk 0.22.3", "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3578,21 +3578,21 @@ dependencies = [ [[package]] name = "solana-keygen" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-sdk 0.22.3", "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-ledger" -version = "0.22.1" +version = "0.22.3" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3617,20 +3617,20 @@ dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-budget-program 0.22.1", - "solana-client 0.22.1", - "solana-genesis-programs 0.22.1", - "solana-logger 0.22.1", - "solana-measure 0.22.1", - "solana-merkle-tree 0.22.1", - "solana-metrics 0.22.1", - "solana-perf 0.22.1", - "solana-rayon-threadlimit 0.22.1", + "solana-budget-program 0.22.3", + "solana-client 0.22.3", + "solana-genesis-programs 0.22.3", + "solana-logger 0.22.3", + "solana-measure 0.22.3", + "solana-merkle-tree 0.22.3", + "solana-metrics 0.22.3", + "solana-perf 0.22.3", + "solana-rayon-threadlimit 0.22.3", "solana-reed-solomon-erasure 4.0.1-3 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", - "solana-stake-program 0.22.1", - "solana-vote-program 0.22.1", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", + "solana-stake-program 0.22.3", + "solana-vote-program 0.22.3", "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3639,7 +3639,7 @@ dependencies = [ [[package]] name = "solana-ledger-tool" -version = "0.22.1" +version = "0.22.3" dependencies = [ "assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3649,31 +3649,31 @@ dependencies = [ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-ledger 0.22.1", - "solana-logger 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", - "solana-vote-program 0.22.1", + "solana-clap-utils 0.22.3", + "solana-ledger 0.22.3", + "solana-logger 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", + "solana-vote-program 0.22.3", ] [[package]] name = "solana-librapay" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-move-loader-program 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-move-loader-program 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", "solana_libra_language_e2e_tests 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)", "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-local-cluster" -version = "0.22.1" +version = "0.22.3" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3681,28 +3681,28 @@ dependencies = [ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-client 0.22.1", - "solana-config-program 0.22.1", - "solana-core 0.22.1", - "solana-exchange-program 0.22.1", - "solana-faucet 0.22.1", - "solana-genesis-programs 0.22.1", - "solana-ledger 0.22.1", - "solana-logger 0.22.1", - "solana-rayon-threadlimit 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", - "solana-stake-program 0.22.1", - "solana-storage-program 0.22.1", - "solana-vest-program 0.22.1", - "solana-vote-program 0.22.1", + "solana-client 0.22.3", + "solana-config-program 0.22.3", + "solana-core 0.22.3", + "solana-exchange-program 0.22.3", + "solana-faucet 0.22.3", + "solana-genesis-programs 0.22.3", + "solana-ledger 0.22.3", + "solana-logger 0.22.3", + "solana-rayon-threadlimit 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", + "solana-stake-program 0.22.3", + "solana-storage-program 0.22.3", + "solana-vest-program 0.22.3", + "solana-vote-program 0.22.3", "symlink 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-log-analyzer" -version = "0.22.1" +version = "0.22.3" dependencies = [ "byte-unit 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3711,13 +3711,13 @@ dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-logger 0.22.1", + "solana-clap-utils 0.22.3", + "solana-logger 0.22.3", ] [[package]] name = "solana-logger" -version = "0.22.1" +version = "0.22.3" dependencies = [ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3726,26 +3726,26 @@ dependencies = [ [[package]] name = "solana-measure" -version = "0.22.1" +version = "0.22.3" dependencies = [ "jemalloc-ctl 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 0.22.1", - "solana-sdk 0.22.1", + "solana-metrics 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-merkle-tree" -version = "0.22.1" +version = "0.22.3" dependencies = [ "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 0.22.1", + "solana-sdk 0.22.3", ] [[package]] name = "solana-metrics" -version = "0.22.1" +version = "0.22.3" dependencies = [ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3754,13 +3754,13 @@ dependencies = [ "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 0.22.1", + "solana-sdk 0.22.3", "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-move-loader-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3771,8 +3771,8 @@ dependencies = [ "serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-sdk 0.22.3", "solana_libra_bytecode_verifier 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)", "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)", "solana_libra_compiler 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3789,7 +3789,7 @@ dependencies = [ [[package]] name = "solana-net-shaper" -version = "0.22.1" +version = "0.22.3" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3798,13 +3798,13 @@ dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-logger 0.22.1", + "solana-clap-utils 0.22.3", + "solana-logger 0.22.3", ] [[package]] name = "solana-net-utils" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3815,38 +3815,38 @@ dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-logger 0.22.1", + "solana-clap-utils 0.22.3", + "solana-logger 0.22.3", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-noop-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-ownable" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (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.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-perf" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "dlopen 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3858,16 +3858,16 @@ dependencies = [ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-budget-program 0.22.1", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-rayon-threadlimit 0.22.1", - "solana-sdk 0.22.1", + "solana-budget-program 0.22.3", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-rayon-threadlimit 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-rayon-threadlimit" -version = "0.22.1" +version = "0.22.3" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3885,7 +3885,7 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "0.22.1" +version = "0.22.3" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3904,23 +3904,23 @@ dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-bpf-loader-program 0.22.1", - "solana-logger 0.22.1", - "solana-measure 0.22.1", - "solana-metrics 0.22.1", - "solana-noop-program 0.22.1", - "solana-rayon-threadlimit 0.22.1", - "solana-sdk 0.22.1", - "solana-stake-program 0.22.1", - "solana-storage-program 0.22.1", - "solana-vote-program 0.22.1", + "solana-bpf-loader-program 0.22.3", + "solana-logger 0.22.3", + "solana-measure 0.22.3", + "solana-metrics 0.22.3", + "solana-noop-program 0.22.3", + "solana-rayon-threadlimit 0.22.3", + "solana-sdk 0.22.3", + "solana-stake-program 0.22.3", + "solana-storage-program 0.22.3", + "solana-vote-program 0.22.3", "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-scripts" -version = "0.22.1" +version = "0.22.3" dependencies = [ "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3928,7 +3928,7 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "0.22.1" +version = "0.22.3" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3951,16 +3951,16 @@ dependencies = [ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-crate-features 0.22.1", - "solana-logger 0.22.1", - "solana-sdk-macro 0.22.1", + "solana-crate-features 0.22.3", + "solana-logger 0.22.3", + "solana-sdk-macro 0.22.3", "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-sdk-c" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3970,12 +3970,12 @@ dependencies = [ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 0.22.1", + "solana-sdk 0.22.3", ] [[package]] name = "solana-sdk-macro" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3985,7 +3985,7 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3994,17 +3994,17 @@ dependencies = [ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-config-program 0.22.1", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-sdk 0.22.1", - "solana-vote-program 0.22.1", + "solana-config-program 0.22.3", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-sdk 0.22.3", + "solana-vote-program 0.22.3", "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-storage-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4014,21 +4014,21 @@ dependencies = [ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-sys-tuner" -version = "0.22.1" +version = "0.22.3" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-logger 0.22.1", + "solana-clap-utils 0.22.3", + "solana-logger 0.22.3", "sysctl 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "unix_socket2 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4036,16 +4036,16 @@ dependencies = [ [[package]] name = "solana-upload-perf" -version = "0.22.1" +version = "0.22.3" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 0.22.1", + "solana-metrics 0.22.3", ] [[package]] name = "solana-validator" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4056,26 +4056,26 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-client 0.22.1", - "solana-core 0.22.1", - "solana-faucet 0.22.1", - "solana-ledger 0.22.1", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-net-utils 0.22.1", - "solana-perf 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", - "solana-vote-program 0.22.1", - "solana-vote-signer 0.22.1", + "solana-clap-utils 0.22.3", + "solana-client 0.22.3", + "solana-core 0.22.3", + "solana-faucet 0.22.3", + "solana-ledger 0.22.3", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-net-utils 0.22.3", + "solana-perf 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", + "solana-vote-program 0.22.3", + "solana-vote-signer 0.22.3", "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-vest-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4084,15 +4084,15 @@ dependencies = [ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-config-program 0.22.1", - "solana-runtime 0.22.1", - "solana-sdk 0.22.1", + "solana-config-program 0.22.3", + "solana-runtime 0.22.3", + "solana-sdk 0.22.3", "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-vote-program" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4100,15 +4100,15 @@ dependencies = [ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-sdk 0.22.1", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-sdk 0.22.3", "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-vote-signer" -version = "0.22.1" +version = "0.22.3" dependencies = [ "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4118,24 +4118,24 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-metrics 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-metrics 0.22.3", + "solana-sdk 0.22.3", ] [[package]] name = "solana-watchtower" -version = "0.22.1" +version = "0.22.3" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-clap-utils 0.22.1", - "solana-client 0.22.1", - "solana-logger 0.22.1", - "solana-metrics 0.22.1", - "solana-sdk 0.22.1", + "solana-clap-utils 0.22.3", + "solana-client 0.22.3", + "solana-logger 0.22.3", + "solana-metrics 0.22.3", + "solana-sdk 0.22.3", ] [[package]] diff --git a/genesis/src/genesis_accounts.rs b/genesis/src/genesis_accounts.rs index 6793874ca8..036b024454 100644 --- a/genesis/src/genesis_accounts.rs +++ b/genesis/src/genesis_accounts.rs @@ -202,72 +202,52 @@ pub const VALIDATOR_INFOS: &[ValidatorInfo] = &[ ValidatorInfo { name: "01Node", node: "5n8KCdzqtvTnhkvCrFR7errH6ZUp11kL97r2awXkfzFe", - vote: "4uYMbY5Ae5ZSRNxQ3RWVyXS9rzW7E3AMZYHuUEotxu6K", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "Bison Trails", node: "7suRNpX7bJsXphHJtBv4ZsLjJZ1dTGeX256pLqJZdEAm", - vote: "DfirEZ9Up1xbE7sQji9UwtcRGe5uCcRqQtnaGpha5KNY", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "ChainFlow", node: "2te46rxywMdCNdkvjumiBBPQoVczJFxhxEaxFavQNqe3", - vote: "8bRCnytB7bySmqxodNGbZuUAtncKkB8T733DD1Dm9WMb", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "ChorusOne", node: "ChorusXqjLC2NbiStKR6k9WoD7wu6TVTtFG8qCL5XBVa", - vote: "ChorusvBuPwukqgDvYfWtEg8j4T1NcMgSTQ4b1UbAwgQ", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "Dokia Capital", node: "GeZ5PrJi9muVCJiJAaFBNGoCEdxGEqTp7L2BmT2WTTy1", - vote: "7ZdRx2EBYoRuPfyeoNbuHodMUXcAQRcC37MUw3kP6akn", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "Forbole", node: "Fe5sLQAAT7RBT8mcH1AAGCbExJQcYxcwXvp1GjrGbvxs", - vote: "Dr8MkZZuvZVQJFKtjShZYEfg6n93sc1GxevqLnGss7FW", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "P2P.ORG - Secure Non-custodial Staking", node: "44e8VyWoyZSE2oYHxMHMedAiHkGJqJgPd3tdt6iKoAFL", - vote: "BwwpzEpo1wzgV9N1987ntgNG6jLt3C9532C68pswT7Gp", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "RockX", node: "Ez4iUU87ViJLCnmSy1t1Ti3DLoysFXiBseNfnRfoehyY", - vote: "GUdGALCHQBeqkNc2ZAht3tBXab1N5u9qJC3PAzpL54r7", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "Stake Capital", node: "HavuVVDXXsJqMzPwQ4KcF5kFm2xqjbChhyi1bgGeCQif", - vote: "HswPkKj1xoLLmpM8t1vy5Pbi8zYYUs9ZawswvofKsFo1", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ValidatorInfo { name: "Staking Facilities", node: "pbAxyqHHPMwgEjv8kmjGxysk9rhNtN7q22eAjReq6Hj", - vote: "4VZ3pJX19PpuGjoSB1qeN9sVQfrqgLVNg16is37adiFp", node_lamports: 500 * SOL_LAMPORTS, - commission: 0, }, ]; diff --git a/genesis/src/validators.rs b/genesis/src/validators.rs index bfefae37cf..6f43f69620 100644 --- a/genesis/src/validators.rs +++ b/genesis/src/validators.rs @@ -3,15 +3,12 @@ use solana_sdk::{ account::Account, genesis_config::GenesisConfig, pubkey::Pubkey, system_program, timing::years_as_slots, }; -use solana_vote_program::vote_state::{self, VoteState}; #[derive(Debug)] pub struct ValidatorInfo { pub name: &'static str, pub node: &'static str, pub node_lamports: u64, - pub vote: &'static str, - pub commission: u8, } // the node's account needs carry enough @@ -26,22 +23,19 @@ fn calculate_voting_fees(genesis_config: &GenesisConfig, years: f64) -> u64 { ) as u64 } -/// create and add vote and node id accounts for a validator +/// create accounts for a validator pub fn create_and_add_validator( genesis_config: &mut GenesisConfig, // information about this validator validator_info: &ValidatorInfo, ) -> u64 { let node: Pubkey = validator_info.node.parse().expect("invalid node"); - let vote: Pubkey = validator_info.vote.parse().expect("invalid vote"); // node is the system account from which votes will be issued let node_rent_reserve = genesis_config.rent.minimum_balance(0).max(1); let node_voting_fees = calculate_voting_fees(genesis_config, 1.0); - let vote_rent_reserve = VoteState::get_rent_exempt_reserve(&genesis_config.rent).max(1); - - let mut total_lamports = node_voting_fees + vote_rent_reserve + validator_info.node_lamports; + let mut total_lamports = node_voting_fees + validator_info.node_lamports; genesis_config .accounts @@ -52,24 +46,13 @@ pub fn create_and_add_validator( }) .lamports += node_voting_fees + validator_info.node_lamports; - assert!( - genesis_config.accounts.get(&vote).is_none(), - "{} is already in genesis", - vote - ); - - genesis_config.add_account( - vote, - vote_state::create_account(&vote, &node, validator_info.commission, vote_rent_reserve), - ); - total_lamports } #[cfg(test)] mod tests { use super::*; - use solana_sdk::{native_token::SOL_LAMPORTS, rent::Rent}; + use solana_sdk::rent::Rent; fn create_and_check_validators( genesis_config: &mut GenesisConfig, @@ -112,97 +95,17 @@ mod tests { ..GenesisConfig::default() }; - let total_lamports = VoteState::get_rent_exempt_reserve(&rent) - + calculate_voting_fees(&genesis_config, 1.0) - + rent.minimum_balance(0); + let total_lamports = calculate_voting_fees(&genesis_config, 1.0) + rent.minimum_balance(0); create_and_check_validators( &mut genesis_config, &[ValidatorInfo { name: "fun", - node: "AiTDdNHW2vNtHt7PqWMHx3B8cMPRDNgc7kMiLPJM25QC", // random pubkeys + node: "AiTDdNHW2vNtHt7PqWMHx3B8cMPRDNgc7kMiLPJM25QC", // random pubkey node_lamports: 0, - vote: "77TQYZTHodhnxJcSuVjUvx8GYRCkykPyHtmFTFLjj1Rc", - commission: 50, }], total_lamports, - 2, - ); - } - - #[test] - fn test_create_one_validator_two_votes() { - let rent = Rent { - lamports_per_byte_year: 1, - exemption_threshold: 1.0, - ..Rent::default() - }; - let mut genesis_config = GenesisConfig { - rent, - ..GenesisConfig::default() - }; - let total_lamports = VoteState::get_rent_exempt_reserve(&rent) * 2 - + calculate_voting_fees(&genesis_config, 1.0) * 2 // two vote accounts - + rent.minimum_balance(0) // one node account - + 1 * SOL_LAMPORTS; // 2nd vote account ask has SOL - - // weird case, just wanted to verify that the duplicated node account gets double fees - create_and_check_validators( - &mut genesis_config, - &[ - ValidatorInfo { - name: "fun", - node: "3VTm54dw8w6jTTsPH4BfoV5vo6mF985JAMtNDRYcaGFc", // random pubkeys - node_lamports: 0, - vote: "GTKWbUoLw3Bv7Ld92crhyXcEk9zUu3VEKfzeuWJZdnfW", - commission: 50, - }, - ValidatorInfo { - name: "unfun", - node: "3VTm54dw8w6jTTsPH4BfoV5vo6mF985JAMtNDRYcaGFc", // random pubkeys, same node - node_lamports: 1 * SOL_LAMPORTS, - vote: "8XrFPRULg98kSm535kFaLV4GMnK5JQSuAymyrCHXsUcy", - commission: 50, - }, - ], - total_lamports, - 3, - ); - } - - #[test] - #[should_panic] - fn test_vote_collision() { - let rent = Rent { - lamports_per_byte_year: 1, - exemption_threshold: 1.0, - ..Rent::default() - }; - let mut genesis_config = GenesisConfig { - rent, - ..GenesisConfig::default() - }; - - create_and_check_validators( - &mut genesis_config, - &[ - ValidatorInfo { - name: "fun", - node: "3VTm54dw8w6jTTsPH4BfoV5vo6mF985JAMtNDRYcaGFc", // random pubkeys - node_lamports: 0, - vote: "GTKWbUoLw3Bv7Ld92crhyXcEk9zUu3VEKfzeuWJZdnfW", - commission: 50, - }, - ValidatorInfo { - name: "unfun", - node: "3VTm54dw8w6jTTsPH4BfoV5vo6mF985JAMtNDRYcaGFc", // random pubkeys, same node - node_lamports: 0, - vote: "GTKWbUoLw3Bv7Ld92crhyXcEk9zUu3VEKfzeuWJZdnfW", // duplicate vote, bad juju - commission: 50, - }, - ], - 0, - 0, + 1, ); } }