Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e81a40ba55 | |||
| a52359a6be | |||
| 2fe0853fba | |||
| de3630f76c | |||
| ff9e388843 | |||
| 67a7995f04 | |||
| f9d793023c | |||
| 99b2504b38 | |||
| 3f3aec29d1 | |||
| 7be8124b9e | |||
| 81259daa3f | |||
| 136fa5b561 | |||
| 63ca6118fa | |||
| 850d729739 | |||
| 62f9183d17 | |||
| cfe3481ba4 | |||
| 788e9f321c |
584
Cargo.lock
generated
584
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-archiver"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -10,10 +10,10 @@ homepage = "https://solana.com/"
|
||||
[dependencies]
|
||||
clap = "2.33.0"
|
||||
console = "0.9.1"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-banking-bench"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -10,11 +10,11 @@ homepage = "https://solana.com/"
|
||||
[dependencies]
|
||||
log = "0.4.6"
|
||||
rayon = "1.2.0"
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-measure = { path = "../measure", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-measure = { path = "../measure", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
rand = "0.6.5"
|
||||
crossbeam-channel = "0.3"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-bench-exchange"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -23,19 +23,19 @@ serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
serde_yaml = "0.8.11"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-genesis = { path = "../genesis", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.5" }
|
||||
solana-exchange-program = { path = "../programs/exchange", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-genesis = { path = "../genesis", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.7" }
|
||||
solana-exchange-program = { path = "../programs/exchange", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
untrusted = "0.7.0"
|
||||
ws = "0.9.1"
|
||||
|
||||
[dev-dependencies]
|
||||
solana-local-cluster = { path = "../local-cluster", version = "0.22.5" }
|
||||
solana-local-cluster = { path = "../local-cluster", version = "0.22.7" }
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-bench-streamer"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
|
||||
[dependencies]
|
||||
clap = "2.33.0"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-bench-tps"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -16,24 +16,24 @@ serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
serde_yaml = "0.8.11"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-genesis = { path = "../genesis", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.5" }
|
||||
solana-librapay = { path = "../programs/librapay", version = "0.22.5", optional = true }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-measure = { path = "../measure", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-move-loader-program = { path = "../programs/move_loader", version = "0.22.5", optional = true }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-genesis = { path = "../genesis", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.7" }
|
||||
solana-librapay = { path = "../programs/librapay", version = "0.22.7", optional = true }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-measure = { path = "../measure", version = "0.22.7" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-move-loader-program = { path = "../programs/move_loader", version = "0.22.7", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
serial_test = "0.3.2"
|
||||
serial_test_derive = "0.3.1"
|
||||
solana-local-cluster = { path = "../local-cluster", version = "0.22.5" }
|
||||
solana-local-cluster = { path = "../local-cluster", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
move = ["solana-librapay", "solana-move-loader-program"]
|
||||
|
||||
@ -177,7 +177,7 @@ $ solana send-timestamp <PUBKEY> <PROCESS_ID> --date 2018-12-24T23:59:00
|
||||
## Usage
|
||||
### solana-cli
|
||||
```text
|
||||
solana-cli 0.22.5 [channel=unknown commit=unknown]
|
||||
solana-cli 0.22.7 [channel=unknown commit=unknown]
|
||||
Blockchain, Rebuilt for Scale
|
||||
|
||||
USAGE:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-chacha-sys"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana chacha-sys"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-clap-utils"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana utilities for the clap"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,7 +12,7 @@ edition = "2018"
|
||||
clap = "2.33.0"
|
||||
rpassword = "4.0"
|
||||
semver = "0.9.0"
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
tiny-bip39 = "0.6.2"
|
||||
url = "2.1.0"
|
||||
chrono = "0.4"
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-cli"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -28,24 +28,24 @@ serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
serde_yaml = "0.8.11"
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-config-program = { path = "../programs/config", version = "0.22.5" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.5" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-vote-signer = { path = "../vote-signer", version = "0.22.5" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.7" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-config-program = { path = "../programs/config", version = "0.22.7" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.7" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
solana-vote-signer = { path = "../vote-signer", version = "0.22.7" }
|
||||
url = "2.1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.7" }
|
||||
tempfile = "3.1.0"
|
||||
|
||||
[[bin]]
|
||||
|
||||
@ -192,6 +192,7 @@ pub enum CliCommand {
|
||||
GetTransactionCount {
|
||||
commitment_config: CommitmentConfig,
|
||||
},
|
||||
LeaderSchedule,
|
||||
Ping {
|
||||
lamports: u64,
|
||||
interval: Duration,
|
||||
@ -449,6 +450,10 @@ pub fn parse_command(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, Box<dyn
|
||||
}),
|
||||
("get-slot", Some(matches)) => parse_get_slot(matches),
|
||||
("get-transaction-count", Some(matches)) => parse_get_transaction_count(matches),
|
||||
("leader-schedule", Some(_matches)) => Ok(CliCommandInfo {
|
||||
command: CliCommand::LeaderSchedule,
|
||||
require_keypair: false,
|
||||
}),
|
||||
("ping", Some(matches)) => parse_cluster_ping(matches),
|
||||
("show-block-production", Some(matches)) => parse_show_block_production(matches),
|
||||
("show-gossip", Some(_matches)) => Ok(CliCommandInfo {
|
||||
@ -1260,6 +1265,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
|
||||
CliCommand::GetTransactionCount { commitment_config } => {
|
||||
process_get_transaction_count(&rpc_client, commitment_config)
|
||||
}
|
||||
CliCommand::LeaderSchedule => process_leader_schedule(&rpc_client),
|
||||
CliCommand::Ping {
|
||||
lamports,
|
||||
interval,
|
||||
|
||||
@ -54,6 +54,7 @@ impl ClusterQuerySubCommands for App<'_, '_> {
|
||||
.about("Get the version of the cluster entrypoint"),
|
||||
)
|
||||
.subcommand(SubCommand::with_name("fees").about("Display current cluster fees"))
|
||||
.subcommand(SubCommand::with_name("leader-schedule").about("Display leader schedule"))
|
||||
.subcommand(SubCommand::with_name("get-block-time")
|
||||
.about("Get estimated production time of a block")
|
||||
.arg(
|
||||
@ -364,6 +365,41 @@ pub fn process_fees(rpc_client: &RpcClient) -> ProcessResult {
|
||||
))
|
||||
}
|
||||
|
||||
pub fn process_leader_schedule(rpc_client: &RpcClient) -> ProcessResult {
|
||||
let epoch_info = rpc_client.get_epoch_info()?;
|
||||
let first_slot_in_epoch = epoch_info.absolute_slot - epoch_info.slot_index;
|
||||
|
||||
let leader_schedule = rpc_client.get_leader_schedule(Some(first_slot_in_epoch))?;
|
||||
if leader_schedule.is_none() {
|
||||
return Err(format!(
|
||||
"Unable to fetch leader schedule for slot {}",
|
||||
first_slot_in_epoch
|
||||
)
|
||||
.into());
|
||||
}
|
||||
let leader_schedule = leader_schedule.unwrap();
|
||||
|
||||
let mut leader_per_slot_index = Vec::new();
|
||||
for (pubkey, leader_slots) in leader_schedule.iter() {
|
||||
for slot_index in leader_slots.iter() {
|
||||
if *slot_index >= leader_per_slot_index.len() {
|
||||
leader_per_slot_index.resize(*slot_index + 1, "?");
|
||||
}
|
||||
leader_per_slot_index[*slot_index] = pubkey;
|
||||
}
|
||||
}
|
||||
|
||||
for (slot_index, leader) in leader_per_slot_index.iter().enumerate() {
|
||||
println!(
|
||||
" {:<15} {:<44}",
|
||||
first_slot_in_epoch + slot_index as u64,
|
||||
leader
|
||||
);
|
||||
}
|
||||
|
||||
Ok("".to_string())
|
||||
}
|
||||
|
||||
pub fn process_get_block_time(rpc_client: &RpcClient, slot: Slot) -> ProcessResult {
|
||||
let timestamp = rpc_client.get_block_time(slot)?;
|
||||
Ok(timestamp.to_string())
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-client"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Client"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -19,11 +19,11 @@ reqwest = { version = "0.9.24", default-features = false, features = ["rustls-tl
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.3.0"
|
||||
jsonrpc-core = "14.0.5"
|
||||
jsonrpc-http-server = "14.0.5"
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "solana-core"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
documentation = "https://docs.rs/solana"
|
||||
homepage = "https://solana.com/"
|
||||
readme = "../README.md"
|
||||
@ -41,26 +41,26 @@ rayon = "1.2.0"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-chacha-sys = { path = "../chacha-sys", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.5" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.7" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-chacha-sys = { path = "../chacha-sys", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.7" }
|
||||
ed25519-dalek = "=1.0.0-pre.1"
|
||||
solana-ledger = { path = "../ledger", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-merkle-tree = { path = "../merkle-tree", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-measure = { path = "../measure", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-perf = { path = "../perf", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.5" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-vote-signer = { path = "../vote-signer", version = "0.22.5" }
|
||||
solana-sys-tuner = { path = "../sys-tuner", version = "0.22.5" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-merkle-tree = { path = "../merkle-tree", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-measure = { path = "../measure", version = "0.22.7" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
solana-perf = { path = "../perf", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.7" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
solana-vote-signer = { path = "../vote-signer", version = "0.22.7" }
|
||||
solana-sys-tuner = { path = "../sys-tuner", version = "0.22.7" }
|
||||
symlink = "0.1.0"
|
||||
sys-info = "0.5.8"
|
||||
tempfile = "3.1.0"
|
||||
@ -69,7 +69,7 @@ tokio-codec = "0.1"
|
||||
tokio-fs = "0.1"
|
||||
tokio-io = "0.1"
|
||||
untrusted = "0.7.0"
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.5" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.7" }
|
||||
reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] }
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
@ -556,6 +556,8 @@ impl Archiver {
|
||||
let mut contact_info = node_info.clone();
|
||||
contact_info.tvu = "0.0.0.0:0".parse().unwrap();
|
||||
contact_info.wallclock = timestamp();
|
||||
// copy over the adopted shred_version from the entrypoint
|
||||
contact_info.shred_version = cluster_info.read().unwrap().my_data().shred_version;
|
||||
{
|
||||
let mut cluster_info_w = cluster_info.write().unwrap();
|
||||
cluster_info_w.insert_self(contact_info);
|
||||
@ -740,7 +742,7 @@ impl Archiver {
|
||||
) -> result::Result<u64, Error> {
|
||||
let rpc_peers = {
|
||||
let cluster_info = cluster_info.read().unwrap();
|
||||
cluster_info.rpc_peers()
|
||||
cluster_info.all_rpc_peers()
|
||||
};
|
||||
debug!("rpc peers: {:?}", rpc_peers);
|
||||
if !rpc_peers.is_empty() {
|
||||
@ -796,7 +798,7 @@ impl Archiver {
|
||||
loop {
|
||||
let rpc_peers = {
|
||||
let cluster_info = cluster_info.read().unwrap();
|
||||
cluster_info.rpc_peers()
|
||||
cluster_info.all_rpc_peers()
|
||||
};
|
||||
debug!("rpc peers: {:?}", rpc_peers);
|
||||
if !rpc_peers.is_empty() {
|
||||
|
||||
@ -272,7 +272,7 @@ impl ClusterInfo {
|
||||
|
||||
let ip_addr = node.gossip.ip();
|
||||
format!(
|
||||
"{:15} {:2}| {:5} | {:44} | {:5}| {:5}| {:5} | {:5}| {:5} | {:5}| {:5} | {:5}| {:5}| v{}\n",
|
||||
"{:15} {:2}| {:5} | {:44} | {:5}| {:5}| {:5} | {:5}| {:5} | {:5}| {:5} | {:5}| {:5}| {}\n",
|
||||
if ContactInfo::is_valid_address(&node.gossip) {
|
||||
ip_addr.to_string()
|
||||
} else {
|
||||
@ -405,7 +405,8 @@ impl ClusterInfo {
|
||||
.map(|x| x.value.contact_info().unwrap())
|
||||
}
|
||||
|
||||
pub fn rpc_peers(&self) -> Vec<ContactInfo> {
|
||||
/// all validators that have a valid rpc port regardless of `shred_version`.
|
||||
pub fn all_rpc_peers(&self) -> Vec<ContactInfo> {
|
||||
let me = self.my_data();
|
||||
self.gossip
|
||||
.crds
|
||||
@ -440,13 +441,15 @@ impl ClusterInfo {
|
||||
.values()
|
||||
.filter_map(|x| x.value.contact_info())
|
||||
.filter(|x| x.id != me)
|
||||
/* shred_version not considered for gossip peers (ie, spy nodes do not set
|
||||
shred_version) */
|
||||
.filter(|x| ContactInfo::is_valid_address(&x.gossip))
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// all validators that have a valid tvu port.
|
||||
pub fn tvu_peers(&self) -> Vec<ContactInfo> {
|
||||
/// all validators that have a valid tvu port regardless of `shred_version`.
|
||||
pub fn all_tvu_peers(&self) -> Vec<ContactInfo> {
|
||||
let me = self.my_data();
|
||||
self.gossip
|
||||
.crds
|
||||
@ -460,7 +463,37 @@ impl ClusterInfo {
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// all peers that have a valid storage addr
|
||||
/// all validators that have a valid tvu port and are on the same `shred_version`.
|
||||
pub fn tvu_peers(&self) -> Vec<ContactInfo> {
|
||||
let me = self.my_data();
|
||||
self.gossip
|
||||
.crds
|
||||
.table
|
||||
.values()
|
||||
.filter_map(|x| x.value.contact_info())
|
||||
.filter(|x| ContactInfo::is_valid_address(&x.tvu))
|
||||
.filter(|x| !ClusterInfo::is_archiver(x))
|
||||
.filter(|x| x.id != me.id)
|
||||
.filter(|x| x.shred_version == me.shred_version)
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// all peers that have a valid storage addr regardless of `shred_version`.
|
||||
pub fn all_storage_peers(&self) -> Vec<ContactInfo> {
|
||||
let me = self.my_data();
|
||||
self.gossip
|
||||
.crds
|
||||
.table
|
||||
.values()
|
||||
.filter_map(|x| x.value.contact_info())
|
||||
.filter(|x| ContactInfo::is_valid_address(&x.storage_addr))
|
||||
.filter(|x| x.id != me.id)
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// all peers that have a valid storage addr and are on the same `shred_version`.
|
||||
pub fn storage_peers(&self) -> Vec<ContactInfo> {
|
||||
let me = self.my_data();
|
||||
self.gossip
|
||||
@ -470,6 +503,7 @@ impl ClusterInfo {
|
||||
.filter_map(|x| x.value.contact_info())
|
||||
.filter(|x| ContactInfo::is_valid_address(&x.storage_addr))
|
||||
.filter(|x| x.id != me.id)
|
||||
.filter(|x| x.shred_version == me.shred_version)
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
@ -483,6 +517,7 @@ impl ClusterInfo {
|
||||
.values()
|
||||
.filter_map(|x| x.value.contact_info())
|
||||
.filter(|x| x.id != me.id)
|
||||
.filter(|x| x.shred_version == me.shred_version)
|
||||
.filter(|x| ContactInfo::is_valid_address(&x.tvu))
|
||||
.filter(|x| ContactInfo::is_valid_address(&x.tvu_forwards))
|
||||
.cloned()
|
||||
@ -495,6 +530,7 @@ impl ClusterInfo {
|
||||
ClusterInfo::tvu_peers(self)
|
||||
.into_iter()
|
||||
.filter(|x| x.id != me.id)
|
||||
.filter(|x| x.shred_version == me.shred_version)
|
||||
.filter(|x| ContactInfo::is_valid_address(&x.gossip))
|
||||
.filter(|x| {
|
||||
self.get_epoch_state_for_node(&x.id, None)
|
||||
@ -1057,6 +1093,7 @@ impl ClusterInfo {
|
||||
.spawn(move || {
|
||||
let mut last_push = timestamp();
|
||||
let mut last_contact_info_trace = timestamp();
|
||||
let mut adopt_shred_version = obj.read().unwrap().my_data().shred_version == 0;
|
||||
let recycler = PacketsRecycler::default();
|
||||
loop {
|
||||
let start = timestamp();
|
||||
@ -1094,9 +1131,32 @@ impl ClusterInfo {
|
||||
let table_size = obj.read().unwrap().gossip.crds.table.len();
|
||||
datapoint_debug!(
|
||||
"cluster_info-purge",
|
||||
("tabel_size", table_size as i64, i64),
|
||||
("table_size", table_size as i64, i64),
|
||||
("purge_stake_timeout", timeout as i64, i64)
|
||||
);
|
||||
// Adopt the entrypoint's `shred_version` if ours is unset
|
||||
if adopt_shred_version {
|
||||
// If gossip was given an entrypoint, lookup its id
|
||||
let entrypoint_id = obj.read().unwrap().entrypoint.as_ref().map(|e| e.id);
|
||||
if let Some(entrypoint_id) = entrypoint_id {
|
||||
// If a pull from the entrypoint was successful, it should exist in the crds table
|
||||
let entrypoint = obj.read().unwrap().lookup(&entrypoint_id).cloned();
|
||||
if let Some(entrypoint) = entrypoint {
|
||||
let mut self_info = obj.read().unwrap().my_data();
|
||||
if entrypoint.shred_version == 0 {
|
||||
info!("Unable to adopt entrypoint's shred version");
|
||||
} else {
|
||||
info!(
|
||||
"Setting shred version to {:?} from entrypoint {:?}",
|
||||
entrypoint.shred_version, entrypoint.id
|
||||
);
|
||||
self_info.shred_version = entrypoint.shred_version;
|
||||
obj.write().unwrap().insert_self(self_info);
|
||||
adopt_shred_version = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//TODO: possibly tune this parameter
|
||||
//we saw a deadlock passing an obj.read().unwrap().timeout into sleep
|
||||
if start - last_push > CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS / 2 {
|
||||
@ -2663,6 +2723,14 @@ mod tests {
|
||||
cluster_info.insert_info(contact_info);
|
||||
stakes.insert(id3, 10);
|
||||
|
||||
// normal but with different shred version
|
||||
let id4 = Pubkey::new(&[4u8; 32]);
|
||||
let mut contact_info = ContactInfo::new_localhost(&id4, timestamp());
|
||||
contact_info.shred_version = 1;
|
||||
assert_ne!(contact_info.shred_version, d.shred_version);
|
||||
cluster_info.insert_info(contact_info.clone());
|
||||
stakes.insert(id4, 10);
|
||||
|
||||
let stakes = Arc::new(stakes);
|
||||
let (peers, peers_and_stakes) = cluster_info.sorted_tvu_peers_and_stakes(Some(stakes));
|
||||
assert_eq!(peers.len(), 2);
|
||||
|
||||
@ -135,7 +135,7 @@ impl ClusterInfoRepairListener {
|
||||
}
|
||||
|
||||
let lowest_slot = blockstore.lowest_slot();
|
||||
let peers = cluster_info.read().unwrap().gossip_peers();
|
||||
let peers = cluster_info.read().unwrap().tvu_peers();
|
||||
let mut peers_needing_repairs: HashMap<Pubkey, EpochSlots> = HashMap::new();
|
||||
|
||||
// Iterate through all the known nodes in the network, looking for ones that
|
||||
|
||||
@ -327,21 +327,16 @@ impl Tower {
|
||||
fork_stake.stake,
|
||||
total_staked
|
||||
);
|
||||
for (new_lockout, original_lockout) in
|
||||
lockouts.votes.iter().zip(self.lockouts.votes.iter())
|
||||
{
|
||||
if new_lockout.slot == original_lockout.slot {
|
||||
if new_lockout.confirmation_count <= self.threshold_depth as u32 {
|
||||
break;
|
||||
if vote.confirmation_count as usize > self.threshold_depth {
|
||||
for old_vote in &self.lockouts.votes {
|
||||
if old_vote.slot == vote.slot
|
||||
&& old_vote.confirmation_count == vote.confirmation_count
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if new_lockout.confirmation_count != original_lockout.confirmation_count {
|
||||
return lockout > self.threshold_size;
|
||||
}
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
true
|
||||
lockout > self.threshold_size
|
||||
} else {
|
||||
false
|
||||
}
|
||||
@ -556,6 +551,24 @@ mod test {
|
||||
assert!(tower.check_vote_stake_threshold(0, &stakes, 2));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_check_vote_threshold_no_skip_lockout_with_new_root() {
|
||||
solana_logger::setup();
|
||||
let mut tower = Tower::new_for_tests(4, 0.67);
|
||||
let mut stakes = HashMap::new();
|
||||
for i in 0..(MAX_LOCKOUT_HISTORY as u64 + 1) {
|
||||
stakes.insert(
|
||||
i,
|
||||
StakeLockout {
|
||||
stake: 1,
|
||||
lockout: 8,
|
||||
},
|
||||
);
|
||||
tower.record_vote(i, Hash::default());
|
||||
}
|
||||
assert!(!tower.check_vote_stake_threshold(MAX_LOCKOUT_HISTORY as u64 + 1, &stakes, 2));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_is_slot_confirmed_not_enough_stake_failure() {
|
||||
let tower = Tower::new_for_tests(1, 0.67);
|
||||
|
||||
@ -197,10 +197,10 @@ fn spy(
|
||||
tvu_peers = spy_ref
|
||||
.read()
|
||||
.unwrap()
|
||||
.tvu_peers()
|
||||
.all_tvu_peers()
|
||||
.into_iter()
|
||||
.collect::<Vec<_>>();
|
||||
archivers = spy_ref.read().unwrap().storage_peers();
|
||||
archivers = spy_ref.read().unwrap().all_storage_peers();
|
||||
if let Some(num) = num_nodes {
|
||||
if tvu_peers.len() + archivers.len() >= num {
|
||||
if let Some(gossip_addr) = find_node_by_gossip_addr {
|
||||
|
||||
@ -726,11 +726,14 @@ impl RpcSol for RpcSolImpl {
|
||||
None
|
||||
}
|
||||
}
|
||||
let shred_version = cluster_info.my_data().shred_version;
|
||||
Ok(cluster_info
|
||||
.all_peers()
|
||||
.iter()
|
||||
.filter_map(|(contact_info, _)| {
|
||||
if ContactInfo::is_valid_address(&contact_info.gossip) {
|
||||
if shred_version == contact_info.shred_version
|
||||
&& ContactInfo::is_valid_address(&contact_info.gossip)
|
||||
{
|
||||
Some(RpcContactInfo {
|
||||
pubkey: contact_info.id.to_string(),
|
||||
gossip: Some(contact_info.gossip),
|
||||
|
||||
@ -57,6 +57,7 @@ pub struct ValidatorConfig {
|
||||
pub dev_sigverify_disabled: bool,
|
||||
pub dev_halt_at_slot: Option<Slot>,
|
||||
pub expected_genesis_hash: Option<Hash>,
|
||||
pub expected_shred_version: Option<u16>,
|
||||
pub voting_disabled: bool,
|
||||
pub transaction_status_service_disabled: bool,
|
||||
pub blockstream_unix_socket: Option<PathBuf>,
|
||||
@ -78,6 +79,7 @@ impl Default for ValidatorConfig {
|
||||
dev_sigverify_disabled: false,
|
||||
dev_halt_at_slot: None,
|
||||
expected_genesis_hash: None,
|
||||
expected_shred_version: None,
|
||||
voting_disabled: false,
|
||||
transaction_status_service_disabled: false,
|
||||
blockstream_unix_socket: None,
|
||||
@ -195,6 +197,16 @@ impl Validator {
|
||||
compute_shred_version(&genesis_hash, &bank.hard_forks().read().unwrap());
|
||||
Self::print_node_info(&node);
|
||||
|
||||
if let Some(expected_shred_version) = config.expected_shred_version {
|
||||
if expected_shred_version != node.info.shred_version {
|
||||
error!(
|
||||
"shred version mismatch: expected {}",
|
||||
expected_shred_version
|
||||
);
|
||||
process::exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
let cluster_info = Arc::new(RwLock::new(ClusterInfo::new(
|
||||
node.info.clone(),
|
||||
keypair.clone(),
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-crate-features"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Crate Features"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-faucet"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Faucet"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -19,10 +19,10 @@ clap = "2.33"
|
||||
log = "0.4.8"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
tokio = "0.1"
|
||||
tokio-codec = "0.1"
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-fixed-buf"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "A fixed-size byte array that supports bincode serde"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-genesis-programs"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana genesis programs"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -10,16 +10,16 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
log = { version = "0.4.8" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "0.22.5" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.5" }
|
||||
solana-config-program = { path = "../programs/config", version = "0.22.5" }
|
||||
solana-exchange-program = { path = "../programs/exchange", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.5" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.5" }
|
||||
solana-vest-program = { path = "../programs/vest", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "0.22.7" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.7" }
|
||||
solana-config-program = { path = "../programs/config", version = "0.22.7" }
|
||||
solana-exchange-program = { path = "../programs/exchange", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.7" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.7" }
|
||||
solana-vest-program = { path = "../programs/vest", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-genesis"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -17,13 +17,13 @@ serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
serde_yaml = "0.8.11"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-genesis-programs = { path = "../genesis-programs", version = "0.22.5" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.5" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-genesis-programs = { path = "../genesis-programs", version = "0.22.7" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.7" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
tempfile = "3.1.0"
|
||||
|
||||
[[bin]]
|
||||
|
||||
@ -3,19 +3,19 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-gossip"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
|
||||
[dependencies]
|
||||
clap = "2.33.0"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
|
||||
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-install"
|
||||
description = "The solana cluster software installer"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -26,11 +26,11 @@ reqwest = { version = "0.9.24", default-features = false, features = ["rustls-tl
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_yaml = "0.8.11"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-config-program = { path = "../programs/config", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-config-program = { path = "../programs/config", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
tar = "0.4.26"
|
||||
tempdir = "0.3.7"
|
||||
url = "2.1.0"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-keygen"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana key generation utility"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -14,8 +14,8 @@ clap = "2.33"
|
||||
dirs = "2.0.2"
|
||||
num_cpus = "1.11.1"
|
||||
rpassword = "4.0"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
tiny-bip39 = "0.6.2"
|
||||
|
||||
[[bin]]
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-ledger-tool"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -16,12 +16,12 @@ serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
serde_yaml = "0.8.11"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
tempfile = "3.1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-ledger"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana ledger"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -29,19 +29,19 @@ rayon = "1.2.0"
|
||||
reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] }
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-genesis-programs = { path = "../genesis-programs", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-measure = { path = "../measure", version = "0.22.5" }
|
||||
solana-merkle-tree = { path = "../merkle-tree", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-perf = { path = "../perf", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-genesis-programs = { path = "../genesis-programs", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-measure = { path = "../measure", version = "0.22.7" }
|
||||
solana-merkle-tree = { path = "../merkle-tree", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-perf = { path = "../perf", version = "0.22.7" }
|
||||
ed25519-dalek = "1.0.0-pre.1"
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
sys-info = "0.5.8"
|
||||
symlink = "0.1.0"
|
||||
tar = "0.4.26"
|
||||
@ -58,7 +58,7 @@ features = ["lz4"]
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.3.0"
|
||||
matches = "0.1.6"
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.5" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@ -25,6 +25,8 @@ pub const TAR_SNAPSHOTS_DIR: &str = "snapshots";
|
||||
pub const TAR_ACCOUNTS_DIR: &str = "accounts";
|
||||
pub const TAR_VERSION_FILE: &str = "version";
|
||||
|
||||
pub const SNAPSHOT_VERSION: &str = "0.22.6"; // format!("{}\n", env!("CARGO_PKG_VERSION"));
|
||||
|
||||
#[derive(PartialEq, Ord, Eq, Debug)]
|
||||
pub struct SlotSnapshotPaths {
|
||||
pub slot: Slot,
|
||||
@ -192,10 +194,8 @@ pub fn archive_snapshot_package(snapshot_package: &SnapshotPackage) -> Result<()
|
||||
|
||||
// Write version file
|
||||
{
|
||||
let snapshot_version = format!("{}\n", env!("CARGO_PKG_VERSION"));
|
||||
let mut f = std::fs::File::create(staging_version_file)?;
|
||||
//f.write_all(&snapshot_version.to_string().into_bytes())?;
|
||||
f.write_all(&snapshot_version.into_bytes())?;
|
||||
f.write_all(&SNAPSHOT_VERSION.to_string().into_bytes())?;
|
||||
}
|
||||
|
||||
// Tar the staging directory into the archive at `archive_path`
|
||||
@ -430,7 +430,7 @@ where
|
||||
let file = File::open(&root_paths.snapshot_file_path)?;
|
||||
let mut stream = BufReader::new(file);
|
||||
let mut bank: Bank = match snapshot_version {
|
||||
env!("CARGO_PKG_VERSION") => deserialize_from(&mut stream)?,
|
||||
SNAPSHOT_VERSION => deserialize_from(&mut stream)?,
|
||||
"0.22.3" => {
|
||||
let bank0223: solana_runtime::bank::LegacyBank0223 = deserialize_from(&mut stream)?;
|
||||
bank0223.into()
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-local-cluster"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -12,23 +12,23 @@ homepage = "https://solana.com/"
|
||||
itertools = "0.8.1"
|
||||
log = "0.4.8"
|
||||
rand = "0.6.5"
|
||||
solana-config-program = { path = "../programs/config", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.5" }
|
||||
solana-exchange-program = { path = "../programs/exchange", version = "0.22.5" }
|
||||
solana-genesis-programs = { path = "../genesis-programs", version = "0.22.5" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.5" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.5" }
|
||||
solana-vest-program = { path = "../programs/vest", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-config-program = { path = "../programs/config", version = "0.22.7" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.7" }
|
||||
solana-exchange-program = { path = "../programs/exchange", version = "0.22.7" }
|
||||
solana-genesis-programs = { path = "../genesis-programs", version = "0.22.7" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.7" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.7" }
|
||||
solana-vest-program = { path = "../programs/vest", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
symlink = "0.1.0"
|
||||
tempfile = "3.1.0"
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.5" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.7" }
|
||||
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.3.0"
|
||||
|
||||
@ -38,6 +38,7 @@ impl ClusterValidatorInfo {
|
||||
pub trait Cluster {
|
||||
fn get_node_pubkeys(&self) -> Vec<Pubkey>;
|
||||
fn get_validator_client(&self, pubkey: &Pubkey) -> Option<ThinClient>;
|
||||
fn get_contact_info(&self, pubkey: &Pubkey) -> Option<&ContactInfo>;
|
||||
fn exit_node(&mut self, pubkey: &Pubkey) -> ClusterValidatorInfo;
|
||||
fn restart_node(&mut self, pubkey: &Pubkey, cluster_validator_info: ClusterValidatorInfo);
|
||||
fn exit_restart_node(&mut self, pubkey: &Pubkey, config: ValidatorConfig);
|
||||
|
||||
@ -695,6 +695,10 @@ impl Cluster for LocalCluster {
|
||||
cluster_validator_info.config = validator_config;
|
||||
self.restart_node(pubkey, cluster_validator_info);
|
||||
}
|
||||
|
||||
fn get_contact_info(&self, pubkey: &Pubkey) -> Option<&ContactInfo> {
|
||||
self.validators.get(pubkey).map(|v| &v.info.contact_info)
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for LocalCluster {
|
||||
|
||||
@ -73,12 +73,14 @@ fn run_archiver_startup_basic(num_nodes: usize, num_archivers: usize) {
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[ignore]
|
||||
#[serial]
|
||||
fn test_archiver_startup_1_node() {
|
||||
run_archiver_startup_basic(1, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[ignore]
|
||||
#[serial]
|
||||
fn test_archiver_startup_2_nodes() {
|
||||
run_archiver_startup_basic(2, 1);
|
||||
|
||||
@ -665,8 +665,11 @@ fn test_snapshot_restart_tower() {
|
||||
cluster.restart_node(&validator_id, validator_info);
|
||||
|
||||
// Test cluster can still make progress and get confirmations in tower
|
||||
// Use the restarted node as the discovery point so that we get updated
|
||||
// validator's ContactInfo
|
||||
let restarted_node_info = cluster.get_contact_info(&validator_id).unwrap();
|
||||
cluster_tests::spend_and_verify_all_nodes(
|
||||
&cluster.entry_point_info,
|
||||
&restarted_node_info,
|
||||
&cluster.funding_keypair,
|
||||
1,
|
||||
HashSet::new(),
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-log-analyzer"
|
||||
description = "The solana cluster network analysis tool"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -17,8 +17,8 @@ semver = "0.9.0"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
|
||||
[[bin]]
|
||||
name = "solana-log-analyzer"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-logger"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Logger"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "solana-measure"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
documentation = "https://docs.rs/solana"
|
||||
homepage = "https://solana.com/"
|
||||
readme = "../README.md"
|
||||
@ -12,8 +12,8 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.8"
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
|
||||
[target."cfg(unix)".dependencies]
|
||||
jemallocator = "0.3.2"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-merkle-tree"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Merkle Tree"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -9,7 +9,7 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
|
||||
[dev-dependencies]
|
||||
hex = "0.4.0"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-metrics"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Metrics"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -13,7 +13,7 @@ env_logger = "0.7.1"
|
||||
lazy_static = "1.4.0"
|
||||
log = "0.4.8"
|
||||
reqwest = { version = "0.9.24", default-features = false, features = ["rustls-tls"] }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
sys-info = "0.5.8"
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-net-shaper"
|
||||
description = "The solana cluster network shaping tool"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -16,8 +16,8 @@ semver = "0.9.0"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
rand = "0.6.5"
|
||||
|
||||
[[bin]]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-net-utils"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Network Utilities"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -18,8 +18,8 @@ rand = "0.6.1"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
socket2 = "0.3.11"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
tokio = "0.1"
|
||||
tokio-codec = "0.1"
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-perf"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Performance APIs"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -18,11 +18,11 @@ serde_derive = "1.0.103"
|
||||
dlopen_derive = "0.1.4"
|
||||
lazy_static = "1.4.0"
|
||||
log = "0.4.8"
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.5" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.7" }
|
||||
solana-budget-program = { path = "../programs/budget", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
name = "solana_perf"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "solana-bpf-programs"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
documentation = "https://docs.rs/solana"
|
||||
homepage = "https://solana.com/"
|
||||
readme = "README.md"
|
||||
@ -22,10 +22,10 @@ walkdir = "2"
|
||||
bincode = "1.1.4"
|
||||
byteorder = "1.3.2"
|
||||
elf = "0.0.10"
|
||||
solana-bpf-loader-program = { path = "../bpf_loader", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-bpf-loader-program = { path = "../bpf_loader", version = "0.22.7" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
solana_rbpf = "=0.1.19"
|
||||
|
||||
[[bench]]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-128bit"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,11 +12,11 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "0.22.7" }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-128bit-dep"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-alloc"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-dep-crate"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -13,10 +13,10 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
byteorder = { version = "1", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-external-spend"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-iter"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-many-args"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,11 +12,11 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "0.22.7" }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-many-args-dep"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-noop"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-panic"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-param-passing"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,11 +12,11 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "0.22.7" }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-param-passing-dep"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-bpf-rust-sysval"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,10 +12,10 @@ homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.5", default-features = false }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.22.7", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.5" }
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "0.22.7" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-loader-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF loader"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -14,8 +14,8 @@ byteorder = "1.3.2"
|
||||
libc = "0.2.66"
|
||||
log = "0.4.8"
|
||||
serde = "1.0.104"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
solana_rbpf = "=0.1.19"
|
||||
|
||||
[lib]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-btc-spv-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Bitcoin spv parsing program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -16,7 +16,7 @@ num-derive = "0.3"
|
||||
num-traits = "0.2"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5"}
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7"}
|
||||
hex = "0.3.2"
|
||||
|
||||
[lib]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "btc_spv_bin"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Bitcoin spv parsing program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-budget-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Budget program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -16,11 +16,11 @@ num-derive = "0.3"
|
||||
num-traits = "0.2"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.5" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib", "cdylib"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-config-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Config program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -14,8 +14,8 @@ chrono = { version = "0.4.10", features = ["serde"] }
|
||||
log = "0.4.8"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib", "cdylib"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-exchange-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Exchange program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -13,12 +13,12 @@ bincode = "1.2.1"
|
||||
log = "0.4.8"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../../metrics", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../../metrics", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
|
||||
[dev-dependencies]
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.5" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib", "cdylib"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-failure-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana failure program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -10,10 +10,10 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.8"
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
|
||||
[dev-dependencies]
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.5" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib", "cdylib"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-librapay"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Libra Payment"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -11,10 +11,10 @@ edition = "2018"
|
||||
[dependencies]
|
||||
bincode = "1.2.0"
|
||||
log = "0.4.8"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-move-loader-program = { path = "../move_loader", version = "0.22.5" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-move-loader-program = { path = "../move_loader", version = "0.22.7" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
language_e2e_tests = { version = "0.0.1-sol4", package = "solana_libra_language_e2e_tests" }
|
||||
types = { version = "0.0.1-sol4", package = "solana_libra_types" }
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-move-loader-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Move loader"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -18,8 +18,8 @@ serde = "1.0.102"
|
||||
serde_bytes = "0.11"
|
||||
serde_derive = "1.0.102"
|
||||
serde_json = "1.0.41"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
|
||||
bytecode_verifier = { version = "0.0.1-sol4", package = "solana_libra_bytecode_verifier" }
|
||||
canonical_serialization = { version = "0.0.1-sol4", package = "solana_libra_canonical_serialization" }
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-noop-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Noop program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -10,8 +10,8 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.8"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib", "cdylib"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-ownable"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "ownable program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,13 +12,13 @@ edition = "2018"
|
||||
bincode = "1.2.1"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
num-derive = "0.3"
|
||||
num-traits = "0.2"
|
||||
thiserror = "1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.5" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib", "cdylib"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-stake-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Stake program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -16,11 +16,11 @@ num-traits = "0.2"
|
||||
rand = "0.6.5"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../../metrics", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../vote", version = "0.22.5" }
|
||||
solana-config-program = { path = "../config", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../../metrics", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../vote", version = "0.22.7" }
|
||||
solana-config-program = { path = "../config", version = "0.22.7" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[lib]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-storage-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Storage program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -16,8 +16,8 @@ num-derive = "0.3"
|
||||
num-traits = "0.2"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.3.0"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-vest-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Vest program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -16,12 +16,12 @@ num-derive = "0.2"
|
||||
num-traits = "0.2"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-config-program = { path = "../config", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
solana-config-program = { path = "../config", version = "0.22.7" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.5" }
|
||||
solana-runtime = { path = "../../runtime", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-vote-program"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana Vote program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -15,9 +15,9 @@ num-derive = "0.3"
|
||||
num-traits = "0.2"
|
||||
serde = "1.0.104"
|
||||
serde_derive = "1.0.103"
|
||||
solana-logger = { path = "../../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../../metrics", version = "0.22.5" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.5" }
|
||||
solana-logger = { path = "../../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../../metrics", version = "0.22.7" }
|
||||
solana-sdk = { path = "../../sdk", version = "0.22.7" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[lib]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-rayon-threadlimit"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "solana-rayon-threadlimit"
|
||||
homepage = "https://solana.com/"
|
||||
readme = "../README.md"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-runtime"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana runtime"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -24,17 +24,17 @@ rayon = "1.2.0"
|
||||
serde = { version = "1.0.104", features = ["rc"] }
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.44"
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-measure = { path = "../measure", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.5" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-measure = { path = "../measure", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "0.22.7" }
|
||||
solana-storage-program = { path = "../programs/storage", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
sys-info = "0.5.8"
|
||||
tempfile = "3.1.0"
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.5" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.7" }
|
||||
itertools = "0.8.2"
|
||||
|
||||
[lib]
|
||||
@ -43,4 +43,4 @@ name = "solana_runtime"
|
||||
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.3.0"
|
||||
solana-noop-program = { path = "../programs/noop", version = "0.22.5" }
|
||||
solana-noop-program = { path = "../programs/noop", version = "0.22.7" }
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-scripts"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-sdk-c"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana SDK C"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -18,7 +18,7 @@ bs58 = "0.3.0"
|
||||
libc = "0.2.66"
|
||||
rand_chacha = "0.1.1"
|
||||
rand_core = { version = ">=0.2, <0.4", default-features = false }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
ed25519-dalek = "1.0.0-pre.1"
|
||||
sha2 = "0.8.0"
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-sdk"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana SDK"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -47,9 +47,9 @@ serde_json = { version = "1.0.44", optional = true }
|
||||
sha2 = "0.8.0"
|
||||
thiserror = "1.0"
|
||||
ed25519-dalek = { version = "=1.0.0-pre.1", optional = true }
|
||||
solana-crate-features = { path = "../crate-features", version = "0.22.5", optional = true }
|
||||
solana-logger = { path = "../logger", version = "0.22.5", optional = true }
|
||||
solana-sdk-macro = { path = "macro", version = "0.22.5" }
|
||||
solana-crate-features = { path = "../crate-features", version = "0.22.7", optional = true }
|
||||
solana-logger = { path = "../logger", version = "0.22.7", optional = true }
|
||||
solana-sdk-macro = { path = "macro", version = "0.22.7" }
|
||||
|
||||
[dev-dependencies]
|
||||
tiny-bip39 = "0.6.2"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-sdk-bpf-test"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana BPF SDK test utilities"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-sdk-macro"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Solana SDK Macro"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-sys-tuner"
|
||||
description = "The solana cluster system tuner daemon"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -14,8 +14,8 @@ clap = "2.33.0"
|
||||
log = "0.4.8"
|
||||
libc = "0.2.66"
|
||||
semver = "0.9.0"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
|
||||
[target."cfg(unix)".dependencies]
|
||||
unix_socket2 = "0.5.4"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-upload-perf"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
description = "Metrics Upload Utility"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@ -12,7 +12,7 @@ publish = false
|
||||
[dependencies]
|
||||
log = "0.4.8"
|
||||
serde_json = "1.0.44"
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
|
||||
[[bin]]
|
||||
name = "solana-upload-perf"
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-validator"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -18,19 +18,19 @@ indicatif = "0.13.0"
|
||||
rand = "0.6.5"
|
||||
reqwest = { version = "0.9.24", default-features = false }
|
||||
serde_json = "1.0.44"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-core = { path = "../core", version = "0.22.5" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.5" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-perf = { path = "../perf", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.5" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.5" }
|
||||
solana-vote-signer = { path = "../vote-signer", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-core = { path = "../core", version = "0.22.7" }
|
||||
solana-faucet = { path = "../faucet", version = "0.22.7" }
|
||||
solana-ledger = { path = "../ledger", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-perf = { path = "../perf", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-net-utils = { path = "../net-utils", version = "0.22.7" }
|
||||
solana-runtime = { path = "../runtime", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "0.22.7" }
|
||||
solana-vote-signer = { path = "../vote-signer", version = "0.22.7" }
|
||||
tar = "0.4.26"
|
||||
tempfile = "3.1.0"
|
||||
|
||||
|
||||
@ -200,6 +200,7 @@ fn get_rpc_addr(
|
||||
node: &Node,
|
||||
identity_keypair: &Arc<Keypair>,
|
||||
entrypoint_gossip: &SocketAddr,
|
||||
expected_shred_version: Option<u16>,
|
||||
) -> (RpcClient, SocketAddr) {
|
||||
let mut cluster_info = ClusterInfo::new(
|
||||
ClusterInfo::spy_contact_info(&identity_keypair.pubkey()),
|
||||
@ -208,61 +209,74 @@ fn get_rpc_addr(
|
||||
cluster_info.set_entrypoint(ContactInfo::new_gossip_entry_point(entrypoint_gossip));
|
||||
let cluster_info = Arc::new(RwLock::new(cluster_info));
|
||||
|
||||
let exit = Arc::new(AtomicBool::new(false));
|
||||
let gossip_exit_flag = Arc::new(AtomicBool::new(false));
|
||||
let gossip_service = GossipService::new(
|
||||
&cluster_info.clone(),
|
||||
None,
|
||||
None,
|
||||
node.sockets.gossip.try_clone().unwrap(),
|
||||
&exit,
|
||||
&gossip_exit_flag,
|
||||
);
|
||||
|
||||
let (rpc_client, rpc_addr) = loop {
|
||||
info!(
|
||||
"Searching for RPC service...\n{}",
|
||||
"Searching for RPC service, shred version={:?}...\n{}",
|
||||
expected_shred_version,
|
||||
cluster_info.read().unwrap().contact_info_trace()
|
||||
);
|
||||
|
||||
let (gossip_peers, rpc_peers) = {
|
||||
let cluster_info = cluster_info.read().unwrap();
|
||||
(cluster_info.gossip_peers(), cluster_info.rpc_peers())
|
||||
};
|
||||
let mut rpc_peers = cluster_info.read().unwrap().all_rpc_peers();
|
||||
|
||||
let found_entrypoint = gossip_peers
|
||||
let shred_version_required = !rpc_peers
|
||||
.iter()
|
||||
.any(|contact_info| contact_info.gossip == *entrypoint_gossip);
|
||||
.all(|contact_info| contact_info.shred_version == rpc_peers[0].shred_version);
|
||||
|
||||
if found_entrypoint & !rpc_peers.is_empty() {
|
||||
let (id, rpc_addr) = {
|
||||
// Prefer the entrypoint's RPC service if present, otherwise pick a node at random
|
||||
if let Some(contact_info) = rpc_peers
|
||||
.iter()
|
||||
.find(|contact_info| contact_info.gossip == *entrypoint_gossip)
|
||||
{
|
||||
(contact_info.id, contact_info.rpc)
|
||||
} else {
|
||||
let i = thread_rng().gen_range(0, rpc_peers.len());
|
||||
(rpc_peers[i].id, rpc_peers[i].rpc)
|
||||
}
|
||||
if let Some(expected_shred_version) = expected_shred_version {
|
||||
// Filter out rpc peers that don't match the expected shred version
|
||||
rpc_peers = rpc_peers
|
||||
.into_iter()
|
||||
.filter(|contact_info| contact_info.shred_version == expected_shred_version)
|
||||
.collect::<Vec<_>>();
|
||||
}
|
||||
|
||||
if !rpc_peers.is_empty() {
|
||||
// Prefer the entrypoint's RPC service if present, otherwise pick a node at random
|
||||
let contact_info = if let Some(contact_info) = rpc_peers
|
||||
.iter()
|
||||
.find(|contact_info| contact_info.gossip == *entrypoint_gossip)
|
||||
{
|
||||
Some(contact_info.clone())
|
||||
} else if shred_version_required && expected_shred_version.is_none() {
|
||||
// Require the user supply a shred version if there are conflicting shred version in
|
||||
// gossip to reduce the chance of human error
|
||||
warn!("Multiple shred versions in gossip. Restart with --expected-shred-version");
|
||||
None
|
||||
} else {
|
||||
// Pick a node at random
|
||||
Some(rpc_peers[thread_rng().gen_range(0, rpc_peers.len())].clone())
|
||||
};
|
||||
|
||||
info!("Contacting RPC port of node {}: {:?}", id, rpc_addr);
|
||||
let rpc_client = RpcClient::new_socket(rpc_addr);
|
||||
match rpc_client.get_version() {
|
||||
Ok(rpc_version) => {
|
||||
info!("RPC node version: {}", rpc_version.solana_core);
|
||||
break (rpc_client, rpc_addr);
|
||||
}
|
||||
Err(err) => {
|
||||
warn!("Failed to get RPC version: {}", err);
|
||||
if let Some(ContactInfo { id, rpc, .. }) = contact_info {
|
||||
info!("Contacting RPC port of node {}: {:?}", id, rpc);
|
||||
let rpc_client = RpcClient::new_socket(rpc);
|
||||
match rpc_client.get_version() {
|
||||
Ok(rpc_version) => {
|
||||
info!("RPC node version: {}", rpc_version.solana_core);
|
||||
break (rpc_client, rpc);
|
||||
}
|
||||
Err(err) => {
|
||||
warn!("Failed to get RPC version: {}", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
info!("No RPC service found");
|
||||
}
|
||||
|
||||
sleep(Duration::from_secs(1));
|
||||
};
|
||||
|
||||
exit.store(true, Ordering::Relaxed);
|
||||
gossip_exit_flag.store(true, Ordering::Relaxed);
|
||||
gossip_service.join().unwrap();
|
||||
|
||||
(rpc_client, rpc_addr)
|
||||
@ -575,6 +589,13 @@ pub fn main() {
|
||||
.validator(hash_validator)
|
||||
.help("Require the genesis have this hash"),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("expected_shred_version")
|
||||
.long("expected-shred-version")
|
||||
.value_name("VERSION")
|
||||
.takes_value(true)
|
||||
.help("Require the shred version be this value"),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("logfile")
|
||||
.short("o")
|
||||
@ -584,10 +605,17 @@ pub fn main() {
|
||||
.help("Redirect logging to the specified file, '-' for standard error"),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("no_wait_for_supermajority")
|
||||
.long("no-wait-for-supermajority")
|
||||
.takes_value(false)
|
||||
.help("After processing the ledger, do not wait until a supermajority of stake is visible on gossip before starting PoH"),
|
||||
)
|
||||
.arg(
|
||||
// Legacy flag that is now enabled by default. Remove this flag a couple months after the 0.23.0
|
||||
// release
|
||||
Arg::with_name("wait_for_supermajority")
|
||||
.long("wait-for-supermajority")
|
||||
.takes_value(false)
|
||||
.help("After processing the ledger, wait until a supermajority of stake is visible on gossip before starting PoH"),
|
||||
.hidden(true)
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("hard_forks")
|
||||
@ -647,6 +675,7 @@ pub fn main() {
|
||||
expected_genesis_hash: matches
|
||||
.value_of("expected_genesis_hash")
|
||||
.map(|s| Hash::from_str(&s).unwrap()),
|
||||
expected_shred_version: value_t!(matches, "expected_shred_version", u16).ok(),
|
||||
new_hard_forks: hardforks_of(&matches, "hard_forks"),
|
||||
rpc_config: JsonRpcConfig {
|
||||
enable_validator_exit: matches.is_present("enable_rpc_exit"),
|
||||
@ -655,7 +684,7 @@ pub fn main() {
|
||||
}),
|
||||
},
|
||||
voting_disabled: matches.is_present("no_voting"),
|
||||
wait_for_supermajority: matches.is_present("wait_for_supermajority"),
|
||||
wait_for_supermajority: !matches.is_present("no_wait_for_supermajority"),
|
||||
..ValidatorConfig::default()
|
||||
};
|
||||
|
||||
@ -765,6 +794,8 @@ pub fn main() {
|
||||
.join(","),
|
||||
);
|
||||
|
||||
info!("Starting validator with: {:#?}", std::env::args_os());
|
||||
|
||||
let vote_account = pubkey_of(&matches, "vote_account").unwrap_or_else(|| {
|
||||
// Disable voting because normal (=not bootstrapping) validator rejects
|
||||
// non-voting accounts (= ephemeral keypairs).
|
||||
@ -857,8 +888,12 @@ pub fn main() {
|
||||
);
|
||||
|
||||
if !no_genesis_fetch {
|
||||
let (rpc_client, rpc_addr) =
|
||||
get_rpc_addr(&node, &identity_keypair, &cluster_entrypoint.gossip);
|
||||
let (rpc_client, rpc_addr) = get_rpc_addr(
|
||||
&node,
|
||||
&identity_keypair,
|
||||
&cluster_entrypoint.gossip,
|
||||
validator_config.expected_shred_version,
|
||||
);
|
||||
|
||||
download_ledger(&rpc_addr, &ledger_path, no_snapshot_fetch).unwrap_or_else(|err| {
|
||||
error!("Failed to initialize ledger: {}", err);
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-vote-signer"
|
||||
description = "Solana Vote Signing Service"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -17,9 +17,9 @@ jsonrpc-http-server = "14.0.5"
|
||||
log = "0.4.8"
|
||||
serde = "1.0.104"
|
||||
serde_json = "1.0.44"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2018"
|
||||
name = "solana-watchtower"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "0.22.5"
|
||||
version = "0.22.7"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@ -13,11 +13,11 @@ clap = "2.33.0"
|
||||
log = "0.4.8"
|
||||
reqwest = { version = "0.9.24", default-features = false, features = ["rustls-tls"] }
|
||||
serde_json = "1.0"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.5" }
|
||||
solana-client = { path = "../client", version = "0.22.5" }
|
||||
solana-logger = { path = "../logger", version = "0.22.5" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.5" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.5" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "0.22.7" }
|
||||
solana-client = { path = "../client", version = "0.22.7" }
|
||||
solana-logger = { path = "../logger", version = "0.22.7" }
|
||||
solana-metrics = { path = "../metrics", version = "0.22.7" }
|
||||
solana-sdk = { path = "../sdk", version = "0.22.7" }
|
||||
|
||||
[[bin]]
|
||||
name = "solana-watchtower"
|
||||
|
||||
Reference in New Issue
Block a user