Compare commits
30 Commits
revert-237
...
v1.10.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
8d5c7b7d89 | ||
|
|
ca1a282a60 | ||
|
|
3f661f25fb | ||
|
|
b157a9111f | ||
|
|
f2f20af768 | ||
|
|
a8855386c1 | ||
|
|
6048b71640 | ||
|
|
4a4a1db836 | ||
|
|
c7889f8def | ||
|
832f524687 | ||
|
a639282c0f | ||
|
|
5eb085fcaf | ||
|
|
c66d086db1 | ||
|
|
0c740ebba6 | ||
|
|
fd49ed1959 | ||
|
|
df9f4193af | ||
|
be99d1d55d | ||
|
|
22af384700 | ||
|
|
30059510cc | ||
|
|
c0d3cd145e | ||
|
|
af79a86a72 | ||
|
|
86acc8c59b | ||
|
|
8222f3a675 | ||
|
|
d135e3b839 | ||
|
821261a2d1 | ||
|
|
f0c5962817 | ||
|
|
1b930a1485 | ||
|
|
2ed9655958 | ||
|
|
c63782f833 | ||
|
|
258f752e5d |
@@ -93,6 +93,7 @@ pull_request_rules:
|
||||
- author=mergify[bot]
|
||||
- head~=^mergify/bp/
|
||||
- "#status-failure=0"
|
||||
- "-merged"
|
||||
actions:
|
||||
label:
|
||||
add:
|
||||
|
||||
335
Cargo.lock
generated
335
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-account-decoder"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana account decoder"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -19,9 +19,9 @@ lazy_static = "1.4.0"
|
||||
serde = "1.0.136"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.79"
|
||||
solana-config-program = { path = "../programs/config", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-config-program = { path = "../programs/config", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
|
||||
thiserror = "1.0"
|
||||
zstd = "0.11.1"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-accounts-bench"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -12,11 +12,11 @@ publish = false
|
||||
clap = "2.33.1"
|
||||
log = "0.4.14"
|
||||
rayon = "1.5.1"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-accounts-cluster-bench"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -13,25 +13,25 @@ clap = "2.33.1"
|
||||
log = "0.4.14"
|
||||
rand = "0.7.0"
|
||||
rayon = "1.5.1"
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-faucet = { path = "../faucet", version = "=1.10.4" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-faucet = { path = "../faucet", version = "=1.10.6" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
|
||||
|
||||
[dev-dependencies]
|
||||
solana-core = { path = "../core", version = "=1.10.4" }
|
||||
solana-local-cluster = { path = "../local-cluster", version = "=1.10.4" }
|
||||
solana-test-validator = { path = "../test-validator", version = "=1.10.4" }
|
||||
solana-core = { path = "../core", version = "=1.10.6" }
|
||||
solana-local-cluster = { path = "../local-cluster", version = "=1.10.6" }
|
||||
solana-test-validator = { path = "../test-validator", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-banking-bench"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -14,17 +14,17 @@ crossbeam-channel = "0.5"
|
||||
log = "0.4.14"
|
||||
rand = "0.7.0"
|
||||
rayon = "1.5.1"
|
||||
solana-core = { path = "../core", version = "=1.10.4" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.4" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-poh = { path = "../poh", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-core = { path = "../core", version = "=1.10.6" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.6" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-poh = { path = "../poh", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-banks-client"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana banks client"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -12,17 +12,17 @@ edition = "2021"
|
||||
[dependencies]
|
||||
borsh = "0.9.3"
|
||||
futures = "0.3"
|
||||
solana-banks-interface = { path = "../banks-interface", version = "=1.10.4" }
|
||||
solana-program = { path = "../sdk/program", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-banks-interface = { path = "../banks-interface", version = "=1.10.6" }
|
||||
solana-program = { path = "../sdk/program", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
tarpc = { version = "0.27.2", features = ["full"] }
|
||||
thiserror = "1.0"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
tokio-serde = { version = "0.8", features = ["bincode"] }
|
||||
|
||||
[dev-dependencies]
|
||||
solana-banks-server = { path = "../banks-server", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-banks-server = { path = "../banks-server", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-banks-interface"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana banks RPC interface"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -11,7 +11,7 @@ edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
tarpc = { version = "0.27.2", features = ["full"] }
|
||||
|
||||
[lib]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-banks-server"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana banks server"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -13,10 +13,10 @@ edition = "2021"
|
||||
bincode = "1.3.3"
|
||||
crossbeam-channel = "0.5"
|
||||
futures = "0.3"
|
||||
solana-banks-interface = { path = "../banks-interface", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.4" }
|
||||
solana-banks-interface = { path = "../banks-interface", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.6" }
|
||||
tarpc = { version = "0.27.2", features = ["full"] }
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
tokio-serde = { version = "0.8", features = ["bincode"] }
|
||||
|
||||
@@ -24,7 +24,7 @@ use {
|
||||
transaction::{self, SanitizedTransaction, Transaction},
|
||||
},
|
||||
solana_send_transaction_service::{
|
||||
send_transaction_service::{SendTransactionService, TransactionInfo},
|
||||
send_transaction_service::{SendTransactionService, TransactionInfo, DEFAULT_TPU_USE_QUIC},
|
||||
tpu_info::NullTpuInfo,
|
||||
},
|
||||
std::{
|
||||
@@ -399,6 +399,7 @@ pub async fn start_tcp_server(
|
||||
receiver,
|
||||
5_000,
|
||||
0,
|
||||
DEFAULT_TPU_USE_QUIC,
|
||||
);
|
||||
|
||||
let server = BanksServer::new(
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-bench-streamer"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -11,9 +11,9 @@ publish = false
|
||||
[dependencies]
|
||||
clap = "2.33.1"
|
||||
crossbeam-channel = "0.5"
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-bench-tps"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -15,23 +15,23 @@ log = "0.4.14"
|
||||
rayon = "1.5.1"
|
||||
serde_json = "1.0.79"
|
||||
serde_yaml = "0.8.23"
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-core = { path = "../core", version = "=1.10.4" }
|
||||
solana-faucet = { path = "../faucet", version = "=1.10.4" }
|
||||
solana-genesis = { path = "../genesis", version = "=1.10.4" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-core = { path = "../core", version = "=1.10.6" }
|
||||
solana-faucet = { path = "../faucet", version = "=1.10.6" }
|
||||
solana-genesis = { path = "../genesis", version = "=1.10.6" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
|
||||
[dev-dependencies]
|
||||
serial_test = "0.6.0"
|
||||
solana-local-cluster = { path = "../local-cluster", version = "=1.10.4" }
|
||||
solana-local-cluster = { path = "../local-cluster", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bloom"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana bloom filter"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -17,9 +17,9 @@ rand = "0.7.0"
|
||||
rayon = "1.5.1"
|
||||
serde = { version = "1.0.136", features = ["rc"] }
|
||||
serde_derive = "1.0.103"
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bucket-map"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "solana-bucket-map"
|
||||
homepage = "https://solana.com/"
|
||||
documentation = "https://docs.rs/solana-bucket-map"
|
||||
@@ -15,14 +15,14 @@ log = { version = "0.4.11" }
|
||||
memmap2 = "0.5.3"
|
||||
modular-bitfield = "0.11.2"
|
||||
rand = "0.7.0"
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
tempfile = "3.3.0"
|
||||
|
||||
[dev-dependencies]
|
||||
fs_extra = "1.2.0"
|
||||
rayon = "1.5.0"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-clap-utils"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana utilities for the clap"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -13,9 +13,9 @@ edition = "2021"
|
||||
chrono = "0.4"
|
||||
clap = "2.33.0"
|
||||
rpassword = "6.0"
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.4", default-features = false }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.6", default-features = false }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
thiserror = "1.0.30"
|
||||
tiny-bip39 = "0.8.2"
|
||||
uriparse = "0.6.3"
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-cli-config"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-cli-output"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -19,12 +19,12 @@ humantime = "2.0.1"
|
||||
indicatif = "0.16.2"
|
||||
serde = "1.0.136"
|
||||
serde_json = "1.0.79"
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-cli"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -27,29 +27,29 @@ semver = "1.0.6"
|
||||
serde = "1.0.136"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.79"
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
|
||||
solana-cli-output = { path = "../cli-output", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-config-program = { path = "../programs/config", version = "=1.10.4" }
|
||||
solana-faucet = { path = "../faucet", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
|
||||
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.6" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-cli-config = { path = "../cli-config", version = "=1.10.6" }
|
||||
solana-cli-output = { path = "../cli-output", version = "=1.10.6" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-config-program = { path = "../programs/config", version = "=1.10.6" }
|
||||
solana-faucet = { path = "../faucet", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
|
||||
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
solana_rbpf = "=0.2.24"
|
||||
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
|
||||
thiserror = "1.0.30"
|
||||
tiny-bip39 = "0.8.2"
|
||||
|
||||
[dev-dependencies]
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-test-validator = { path = "../test-validator", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-test-validator = { path = "../test-validator", version = "=1.10.6" }
|
||||
tempfile = "3.3.0"
|
||||
|
||||
[[bin]]
|
||||
|
||||
@@ -162,6 +162,7 @@ pub enum CliCommand {
|
||||
address: Option<SignerIndex>,
|
||||
use_deprecated_loader: bool,
|
||||
allow_excessive_balance: bool,
|
||||
skip_fee_check: bool,
|
||||
},
|
||||
Program(ProgramCliCommand),
|
||||
// Stake Commands
|
||||
@@ -744,6 +745,7 @@ pub fn parse_command(
|
||||
signers.push(signer);
|
||||
1
|
||||
});
|
||||
let skip_fee_check = matches.is_present("skip_fee_check");
|
||||
|
||||
Ok(CliCommandInfo {
|
||||
command: CliCommand::Deploy {
|
||||
@@ -751,6 +753,7 @@ pub fn parse_command(
|
||||
address,
|
||||
use_deprecated_loader: matches.is_present("use_deprecated_loader"),
|
||||
allow_excessive_balance: matches.is_present("allow_excessive_balance"),
|
||||
skip_fee_check,
|
||||
},
|
||||
signers,
|
||||
})
|
||||
@@ -1129,6 +1132,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
|
||||
address,
|
||||
use_deprecated_loader,
|
||||
allow_excessive_balance,
|
||||
skip_fee_check,
|
||||
} => process_deploy(
|
||||
rpc_client,
|
||||
config,
|
||||
@@ -1136,6 +1140,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
|
||||
*address,
|
||||
*use_deprecated_loader,
|
||||
*allow_excessive_balance,
|
||||
*skip_fee_check,
|
||||
),
|
||||
CliCommand::Program(program_subcommand) => {
|
||||
process_program_subcommand(rpc_client, config, program_subcommand)
|
||||
@@ -1967,6 +1972,7 @@ mod tests {
|
||||
address: None,
|
||||
use_deprecated_loader: false,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
},
|
||||
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
||||
}
|
||||
@@ -1989,6 +1995,7 @@ mod tests {
|
||||
address: Some(1),
|
||||
use_deprecated_loader: false,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
},
|
||||
signers: vec![
|
||||
read_keypair_file(&keypair_file).unwrap().into(),
|
||||
@@ -2382,6 +2389,7 @@ mod tests {
|
||||
address: None,
|
||||
use_deprecated_loader: false,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
};
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
let result = process_command(&config);
|
||||
@@ -2402,6 +2410,7 @@ mod tests {
|
||||
address: None,
|
||||
use_deprecated_loader: false,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
};
|
||||
assert!(process_command(&config).is_err());
|
||||
}
|
||||
|
||||
@@ -66,6 +66,7 @@ pub enum ProgramCliCommand {
|
||||
is_final: bool,
|
||||
max_len: Option<usize>,
|
||||
allow_excessive_balance: bool,
|
||||
skip_fee_check: bool,
|
||||
},
|
||||
WriteBuffer {
|
||||
program_location: String,
|
||||
@@ -73,6 +74,7 @@ pub enum ProgramCliCommand {
|
||||
buffer_pubkey: Option<Pubkey>,
|
||||
buffer_authority_signer_index: Option<SignerIndex>,
|
||||
max_len: Option<usize>,
|
||||
skip_fee_check: bool,
|
||||
},
|
||||
SetBufferAuthority {
|
||||
buffer_pubkey: Pubkey,
|
||||
@@ -114,6 +116,13 @@ impl ProgramSubCommands for App<'_, '_> {
|
||||
SubCommand::with_name("program")
|
||||
.about("Program management")
|
||||
.setting(AppSettings::SubcommandRequiredElseHelp)
|
||||
.arg(
|
||||
Arg::with_name("skip_fee_check")
|
||||
.long("skip-fee-check")
|
||||
.hidden(true)
|
||||
.takes_value(false)
|
||||
.global(true)
|
||||
)
|
||||
.subcommand(
|
||||
SubCommand::with_name("deploy")
|
||||
.about("Deploy a program")
|
||||
@@ -406,6 +415,12 @@ impl ProgramSubCommands for App<'_, '_> {
|
||||
.long("allow-excessive-deploy-account-balance")
|
||||
.takes_value(false)
|
||||
.help("Use the designated program id, even if the account already holds a large balance of SOL")
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("skip_fee_check")
|
||||
.long("skip-fee-check")
|
||||
.hidden(true)
|
||||
.takes_value(false)
|
||||
),
|
||||
)
|
||||
}
|
||||
@@ -416,7 +431,14 @@ pub fn parse_program_subcommand(
|
||||
default_signer: &DefaultSigner,
|
||||
wallet_manager: &mut Option<Arc<RemoteWalletManager>>,
|
||||
) -> Result<CliCommandInfo, CliError> {
|
||||
let response = match matches.subcommand() {
|
||||
let (subcommand, sub_matches) = matches.subcommand();
|
||||
let matches_skip_fee_check = matches.is_present("skip_fee_check");
|
||||
let sub_matches_skip_fee_check = sub_matches
|
||||
.map(|m| m.is_present("skip_fee_check"))
|
||||
.unwrap_or(false);
|
||||
let skip_fee_check = matches_skip_fee_check || sub_matches_skip_fee_check;
|
||||
|
||||
let response = match (subcommand, sub_matches) {
|
||||
("deploy", Some(matches)) => {
|
||||
let mut bulk_signers = vec![Some(
|
||||
default_signer.signer_from_path(matches, wallet_manager)?,
|
||||
@@ -476,6 +498,7 @@ pub fn parse_program_subcommand(
|
||||
is_final: matches.is_present("final"),
|
||||
max_len,
|
||||
allow_excessive_balance: matches.is_present("allow_excessive_balance"),
|
||||
skip_fee_check,
|
||||
}),
|
||||
signers: signer_info.signers,
|
||||
}
|
||||
@@ -521,6 +544,7 @@ pub fn parse_program_subcommand(
|
||||
buffer_authority_signer_index: signer_info
|
||||
.index_of_or_none(buffer_authority_pubkey),
|
||||
max_len,
|
||||
skip_fee_check,
|
||||
}),
|
||||
signers: signer_info.signers,
|
||||
}
|
||||
@@ -669,6 +693,7 @@ pub fn process_program_subcommand(
|
||||
is_final,
|
||||
max_len,
|
||||
allow_excessive_balance,
|
||||
skip_fee_check,
|
||||
} => process_program_deploy(
|
||||
rpc_client,
|
||||
config,
|
||||
@@ -681,6 +706,7 @@ pub fn process_program_subcommand(
|
||||
*is_final,
|
||||
*max_len,
|
||||
*allow_excessive_balance,
|
||||
*skip_fee_check,
|
||||
),
|
||||
ProgramCliCommand::WriteBuffer {
|
||||
program_location,
|
||||
@@ -688,6 +714,7 @@ pub fn process_program_subcommand(
|
||||
buffer_pubkey,
|
||||
buffer_authority_signer_index,
|
||||
max_len,
|
||||
skip_fee_check,
|
||||
} => process_write_buffer(
|
||||
rpc_client,
|
||||
config,
|
||||
@@ -696,6 +723,7 @@ pub fn process_program_subcommand(
|
||||
*buffer_pubkey,
|
||||
*buffer_authority_signer_index,
|
||||
*max_len,
|
||||
*skip_fee_check,
|
||||
),
|
||||
ProgramCliCommand::SetBufferAuthority {
|
||||
buffer_pubkey,
|
||||
@@ -793,6 +821,7 @@ fn process_program_deploy(
|
||||
is_final: bool,
|
||||
max_len: Option<usize>,
|
||||
allow_excessive_balance: bool,
|
||||
skip_fee_check: bool,
|
||||
) -> ProcessResult {
|
||||
let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
|
||||
let (buffer_provided, buffer_signer, buffer_pubkey) = if let Some(i) = buffer_signer_index {
|
||||
@@ -947,6 +976,7 @@ fn process_program_deploy(
|
||||
&buffer_pubkey,
|
||||
Some(upgrade_authority_signer),
|
||||
allow_excessive_balance,
|
||||
skip_fee_check,
|
||||
)
|
||||
} else {
|
||||
do_process_program_upgrade(
|
||||
@@ -957,6 +987,7 @@ fn process_program_deploy(
|
||||
config.signers[upgrade_authority_signer_index],
|
||||
&buffer_pubkey,
|
||||
buffer_signer,
|
||||
skip_fee_check,
|
||||
)
|
||||
};
|
||||
if result.is_ok() && is_final {
|
||||
@@ -983,6 +1014,7 @@ fn process_write_buffer(
|
||||
buffer_pubkey: Option<Pubkey>,
|
||||
buffer_authority_signer_index: Option<SignerIndex>,
|
||||
max_len: Option<usize>,
|
||||
skip_fee_check: bool,
|
||||
) -> ProcessResult {
|
||||
// Create ephemeral keypair to use for Buffer account, if not provided
|
||||
let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
|
||||
@@ -1050,6 +1082,7 @@ fn process_write_buffer(
|
||||
&buffer_pubkey,
|
||||
Some(buffer_authority),
|
||||
true,
|
||||
skip_fee_check,
|
||||
);
|
||||
|
||||
if result.is_err() && buffer_signer_index.is_none() && buffer_signer.is_some() {
|
||||
@@ -1636,6 +1669,7 @@ pub fn process_deploy(
|
||||
buffer_signer_index: Option<SignerIndex>,
|
||||
use_deprecated_loader: bool,
|
||||
allow_excessive_balance: bool,
|
||||
skip_fee_check: bool,
|
||||
) -> ProcessResult {
|
||||
// Create ephemeral keypair to use for Buffer account, if not provided
|
||||
let (words, mnemonic, buffer_keypair) = create_ephemeral_keypair()?;
|
||||
@@ -1666,6 +1700,7 @@ pub fn process_deploy(
|
||||
&buffer_signer.pubkey(),
|
||||
Some(buffer_signer),
|
||||
allow_excessive_balance,
|
||||
skip_fee_check,
|
||||
);
|
||||
if result.is_err() && buffer_signer_index.is_none() {
|
||||
report_ephemeral_mnemonic(words, mnemonic);
|
||||
@@ -1704,6 +1739,7 @@ fn do_process_program_write_and_deploy(
|
||||
buffer_pubkey: &Pubkey,
|
||||
buffer_authority_signer: Option<&dyn Signer>,
|
||||
allow_excessive_balance: bool,
|
||||
skip_fee_check: bool,
|
||||
) -> ProcessResult {
|
||||
// Build messages to calculate fees
|
||||
let mut messages: Vec<&Message> = Vec::new();
|
||||
@@ -1834,7 +1870,9 @@ fn do_process_program_write_and_deploy(
|
||||
messages.push(message);
|
||||
}
|
||||
|
||||
check_payer(&rpc_client, config, balance_needed, &messages)?;
|
||||
if !skip_fee_check {
|
||||
check_payer(&rpc_client, config, balance_needed, &messages)?;
|
||||
}
|
||||
|
||||
send_deploy_messages(
|
||||
rpc_client,
|
||||
@@ -1868,6 +1906,7 @@ fn do_process_program_upgrade(
|
||||
upgrade_authority: &dyn Signer,
|
||||
buffer_pubkey: &Pubkey,
|
||||
buffer_signer: Option<&dyn Signer>,
|
||||
skip_fee_check: bool,
|
||||
) -> ProcessResult {
|
||||
let loader_id = bpf_loader_upgradeable::id();
|
||||
let data_len = program_data.len();
|
||||
@@ -1967,7 +2006,10 @@ fn do_process_program_upgrade(
|
||||
);
|
||||
messages.push(&final_message);
|
||||
|
||||
check_payer(&rpc_client, config, balance_needed, &messages)?;
|
||||
if !skip_fee_check {
|
||||
check_payer(&rpc_client, config, balance_needed, &messages)?;
|
||||
}
|
||||
|
||||
send_deploy_messages(
|
||||
rpc_client,
|
||||
config,
|
||||
@@ -2255,6 +2297,7 @@ mod tests {
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
||||
}
|
||||
@@ -2281,6 +2324,7 @@ mod tests {
|
||||
is_final: false,
|
||||
max_len: Some(42),
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
||||
}
|
||||
@@ -2309,6 +2353,7 @@ mod tests {
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![
|
||||
read_keypair_file(&keypair_file).unwrap().into(),
|
||||
@@ -2339,6 +2384,7 @@ mod tests {
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
||||
}
|
||||
@@ -2368,6 +2414,7 @@ mod tests {
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![
|
||||
read_keypair_file(&keypair_file).unwrap().into(),
|
||||
@@ -2400,6 +2447,7 @@ mod tests {
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![
|
||||
read_keypair_file(&keypair_file).unwrap().into(),
|
||||
@@ -2427,6 +2475,7 @@ mod tests {
|
||||
upgrade_authority_signer_index: 0,
|
||||
is_final: true,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
allow_excessive_balance: false,
|
||||
}),
|
||||
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
||||
@@ -2460,6 +2509,7 @@ mod tests {
|
||||
buffer_pubkey: None,
|
||||
buffer_authority_signer_index: Some(0),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
||||
}
|
||||
@@ -2483,6 +2533,7 @@ mod tests {
|
||||
buffer_pubkey: None,
|
||||
buffer_authority_signer_index: Some(0),
|
||||
max_len: Some(42),
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
||||
}
|
||||
@@ -2509,6 +2560,7 @@ mod tests {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: Some(0),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![
|
||||
read_keypair_file(&keypair_file).unwrap().into(),
|
||||
@@ -2538,6 +2590,7 @@ mod tests {
|
||||
buffer_pubkey: None,
|
||||
buffer_authority_signer_index: Some(1),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![
|
||||
read_keypair_file(&keypair_file).unwrap().into(),
|
||||
@@ -2572,6 +2625,7 @@ mod tests {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: Some(2),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![
|
||||
read_keypair_file(&keypair_file).unwrap().into(),
|
||||
@@ -3014,6 +3068,7 @@ mod tests {
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
}),
|
||||
signers: vec![&default_keypair],
|
||||
output_format: OutputFormat::JsonCompact,
|
||||
|
||||
@@ -1383,17 +1383,12 @@ pub fn process_stake_authorize(
|
||||
};
|
||||
if let Some(authorized) = authorized {
|
||||
match authorization_type {
|
||||
StakeAuthorize::Staker => {
|
||||
// first check authorized withdrawer
|
||||
check_current_authority(&authorized.withdrawer, &authority.pubkey())
|
||||
.or_else(|_| {
|
||||
// ...then check authorized staker. If neither matches, error will
|
||||
// print the stake key as `expected`
|
||||
check_current_authority(&authorized.staker, &authority.pubkey())
|
||||
})?;
|
||||
}
|
||||
StakeAuthorize::Staker => check_current_authority(
|
||||
&[authorized.withdrawer, authorized.staker],
|
||||
&authority.pubkey(),
|
||||
)?,
|
||||
StakeAuthorize::Withdrawer => {
|
||||
check_current_authority(&authorized.withdrawer, &authority.pubkey())?;
|
||||
check_current_authority(&[authorized.withdrawer], &authority.pubkey())?;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -1935,7 +1930,7 @@ pub fn process_stake_set_lockup(
|
||||
};
|
||||
if let Some(lockup) = lockup {
|
||||
if lockup.custodian != Pubkey::default() {
|
||||
check_current_authority(&lockup.custodian, &custodian.pubkey())?;
|
||||
check_current_authority(&[lockup.custodian], &custodian.pubkey())?;
|
||||
}
|
||||
} else {
|
||||
return Err(CliError::RpcRequestError(format!(
|
||||
@@ -2119,13 +2114,13 @@ fn get_stake_account_state(
|
||||
}
|
||||
|
||||
pub(crate) fn check_current_authority(
|
||||
account_current_authority: &Pubkey,
|
||||
permitted_authorities: &[Pubkey],
|
||||
provided_current_authority: &Pubkey,
|
||||
) -> Result<(), CliError> {
|
||||
if account_current_authority != provided_current_authority {
|
||||
if !permitted_authorities.contains(provided_current_authority) {
|
||||
Err(CliError::RpcRequestError(format!(
|
||||
"Invalid current authority provided: {:?}, expected {:?}",
|
||||
provided_current_authority, account_current_authority
|
||||
"Invalid authority provided: {:?}, expected {:?}",
|
||||
provided_current_authority, permitted_authorities
|
||||
)))
|
||||
} else {
|
||||
Ok(())
|
||||
|
||||
@@ -910,7 +910,10 @@ pub fn process_vote_authorize(
|
||||
"Invalid vote account state; no authorized voters found".to_string(),
|
||||
)
|
||||
})?;
|
||||
check_current_authority(¤t_authorized_voter, &authorized.pubkey())?;
|
||||
check_current_authority(
|
||||
&[current_authorized_voter, vote_state.authorized_withdrawer],
|
||||
&authorized.pubkey(),
|
||||
)?;
|
||||
if let Some(signer) = new_authorized_signer {
|
||||
if signer.is_interactive() {
|
||||
return Err(CliError::BadParameter(format!(
|
||||
@@ -927,7 +930,7 @@ pub fn process_vote_authorize(
|
||||
(new_authorized_pubkey, "new_authorized_pubkey".to_string()),
|
||||
)?;
|
||||
if let Some(vote_state) = vote_state {
|
||||
check_current_authority(&vote_state.authorized_withdrawer, &authorized.pubkey())?
|
||||
check_current_authority(&[vote_state.authorized_withdrawer], &authorized.pubkey())?
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,6 +62,7 @@ fn test_cli_program_deploy_non_upgradeable() {
|
||||
address: None,
|
||||
use_deprecated_loader: false,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
};
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
let response = process_command(&config);
|
||||
@@ -91,6 +92,7 @@ fn test_cli_program_deploy_non_upgradeable() {
|
||||
address: Some(1),
|
||||
use_deprecated_loader: false,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
};
|
||||
process_command(&config).unwrap();
|
||||
let account1 = rpc_client
|
||||
@@ -118,6 +120,7 @@ fn test_cli_program_deploy_non_upgradeable() {
|
||||
address: Some(1),
|
||||
use_deprecated_loader: false,
|
||||
allow_excessive_balance: false,
|
||||
skip_fee_check: false,
|
||||
};
|
||||
process_command(&config).unwrap_err();
|
||||
|
||||
@@ -127,6 +130,7 @@ fn test_cli_program_deploy_non_upgradeable() {
|
||||
address: Some(1),
|
||||
use_deprecated_loader: false,
|
||||
allow_excessive_balance: true,
|
||||
skip_fee_check: false,
|
||||
};
|
||||
process_command(&config).unwrap();
|
||||
let account2 = rpc_client
|
||||
@@ -193,6 +197,7 @@ fn test_cli_program_deploy_no_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: true,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
let response = process_command(&config);
|
||||
@@ -218,6 +223,7 @@ fn test_cli_program_deploy_no_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap_err();
|
||||
}
|
||||
@@ -278,6 +284,7 @@ fn test_cli_program_deploy_with_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: false,
|
||||
max_len: Some(max_len),
|
||||
skip_fee_check: false,
|
||||
});
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
let response = process_command(&config);
|
||||
@@ -325,6 +332,7 @@ fn test_cli_program_deploy_with_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: false,
|
||||
max_len: Some(max_len),
|
||||
skip_fee_check: false,
|
||||
});
|
||||
let response = process_command(&config);
|
||||
let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
|
||||
@@ -366,6 +374,7 @@ fn test_cli_program_deploy_with_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: false,
|
||||
max_len: Some(max_len),
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap();
|
||||
let program_account = rpc_client.get_account(&program_pubkey).unwrap();
|
||||
@@ -420,6 +429,7 @@ fn test_cli_program_deploy_with_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap();
|
||||
let program_account = rpc_client.get_account(&program_pubkey).unwrap();
|
||||
@@ -494,6 +504,7 @@ fn test_cli_program_deploy_with_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: false,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap_err();
|
||||
|
||||
@@ -509,6 +520,7 @@ fn test_cli_program_deploy_with_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: true,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
let response = process_command(&config);
|
||||
let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
|
||||
@@ -611,6 +623,7 @@ fn test_cli_program_close_program() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: false,
|
||||
max_len: Some(max_len),
|
||||
skip_fee_check: false,
|
||||
});
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
process_command(&config).unwrap();
|
||||
@@ -695,6 +708,7 @@ fn test_cli_program_write_buffer() {
|
||||
buffer_pubkey: None,
|
||||
buffer_authority_signer_index: None,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
let response = process_command(&config);
|
||||
@@ -729,6 +743,7 @@ fn test_cli_program_write_buffer() {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: None,
|
||||
max_len: Some(max_len),
|
||||
skip_fee_check: false,
|
||||
});
|
||||
let response = process_command(&config);
|
||||
let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
|
||||
@@ -790,6 +805,7 @@ fn test_cli_program_write_buffer() {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: Some(2),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
let response = process_command(&config);
|
||||
let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
|
||||
@@ -827,6 +843,7 @@ fn test_cli_program_write_buffer() {
|
||||
buffer_pubkey: None,
|
||||
buffer_authority_signer_index: Some(2),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
let response = process_command(&config);
|
||||
let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
|
||||
@@ -899,6 +916,7 @@ fn test_cli_program_write_buffer() {
|
||||
buffer_pubkey: None,
|
||||
buffer_authority_signer_index: None,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
let response = process_command(&config);
|
||||
@@ -938,6 +956,7 @@ fn test_cli_program_write_buffer() {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: None,
|
||||
max_len: None, //Some(max_len),
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap();
|
||||
config.signers = vec![&keypair, &buffer_keypair];
|
||||
@@ -951,6 +970,7 @@ fn test_cli_program_write_buffer() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: true,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
let error = process_command(&config).unwrap_err();
|
||||
@@ -1008,6 +1028,7 @@ fn test_cli_program_set_buffer_authority() {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: None,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap();
|
||||
let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
|
||||
@@ -1123,6 +1144,7 @@ fn test_cli_program_mismatch_buffer_authority() {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: Some(2),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap();
|
||||
let buffer_account = rpc_client.get_account(&buffer_keypair.pubkey()).unwrap();
|
||||
@@ -1145,6 +1167,7 @@ fn test_cli_program_mismatch_buffer_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: true,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap_err();
|
||||
|
||||
@@ -1160,6 +1183,7 @@ fn test_cli_program_mismatch_buffer_authority() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: true,
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap();
|
||||
}
|
||||
@@ -1216,6 +1240,7 @@ fn test_cli_program_show() {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: Some(2),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap();
|
||||
|
||||
@@ -1275,6 +1300,7 @@ fn test_cli_program_show() {
|
||||
upgrade_authority_signer_index: 1,
|
||||
is_final: false,
|
||||
max_len: Some(max_len),
|
||||
skip_fee_check: false,
|
||||
});
|
||||
config.output_format = OutputFormat::JsonCompact;
|
||||
let min_slot = rpc_client.get_slot().unwrap();
|
||||
@@ -1401,6 +1427,7 @@ fn test_cli_program_dump() {
|
||||
buffer_pubkey: Some(buffer_keypair.pubkey()),
|
||||
buffer_authority_signer_index: Some(2),
|
||||
max_len: None,
|
||||
skip_fee_check: false,
|
||||
});
|
||||
process_command(&config).unwrap();
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-client-test"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana RPC Test"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -14,25 +14,25 @@ publish = false
|
||||
futures-util = "0.3.21"
|
||||
serde_json = "1.0.79"
|
||||
serial_test = "0.6.0"
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
|
||||
solana-rpc = { path = "../rpc", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-test-validator = { path = "../test-validator", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
|
||||
solana-rpc = { path = "../rpc", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-test-validator = { path = "../test-validator", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
systemstat = "0.1.10"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
|
||||
[dev-dependencies]
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-client"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Client"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -35,15 +35,16 @@ semver = "1.0.6"
|
||||
serde = "1.0.136"
|
||||
serde_derive = "1.0.103"
|
||||
serde_json = "1.0.79"
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-faucet = { path = "../faucet", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-faucet = { path = "../faucet", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
thiserror = "1.0"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
tokio-stream = "0.1.8"
|
||||
@@ -54,7 +55,7 @@ url = "2.2.2"
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.5.0"
|
||||
jsonrpc-http-server = "18.0.0"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
use {
|
||||
crate::{tpu_connection::TpuConnection, udp_client::UdpTpuConnection},
|
||||
crate::{
|
||||
quic_client::QuicTpuConnection, tpu_connection::TpuConnection, udp_client::UdpTpuConnection,
|
||||
},
|
||||
lazy_static::lazy_static,
|
||||
solana_sdk::{transaction::VersionedTransaction, transport::TransportError},
|
||||
std::{
|
||||
collections::{hash_map::Entry, BTreeMap, HashMap},
|
||||
net::{SocketAddr, UdpSocket},
|
||||
@@ -11,9 +14,15 @@ use {
|
||||
// Should be non-zero
|
||||
static MAX_CONNECTIONS: usize = 64;
|
||||
|
||||
#[derive(Clone)]
|
||||
enum Connection {
|
||||
Udp(Arc<UdpTpuConnection>),
|
||||
Quic(Arc<QuicTpuConnection>),
|
||||
}
|
||||
|
||||
struct ConnMap {
|
||||
// Keeps track of the connection associated with an addr and the last time it was used
|
||||
map: HashMap<SocketAddr, (Arc<dyn TpuConnection + 'static + Sync + Send>, u64)>,
|
||||
map: HashMap<SocketAddr, (Connection, u64)>,
|
||||
// Helps to find the least recently used connection. The search and inserts are O(log(n))
|
||||
// but since we're bounding the size of the collections, this should be constant
|
||||
// (and hopefully negligible) time. In theory, we can do this in constant time
|
||||
@@ -23,6 +32,7 @@ struct ConnMap {
|
||||
// that seems non-"Rust-y" and low bang/buck. This is still pretty terrible though...
|
||||
last_used_times: BTreeMap<u64, SocketAddr>,
|
||||
ticks: u64,
|
||||
use_quic: bool,
|
||||
}
|
||||
|
||||
impl ConnMap {
|
||||
@@ -31,21 +41,31 @@ impl ConnMap {
|
||||
map: HashMap::new(),
|
||||
last_used_times: BTreeMap::new(),
|
||||
ticks: 0,
|
||||
use_quic: false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_use_quic(&mut self, use_quic: bool) {
|
||||
self.use_quic = use_quic;
|
||||
}
|
||||
}
|
||||
|
||||
lazy_static! {
|
||||
static ref CONNECTION_MAP: Mutex<ConnMap> = Mutex::new(ConnMap::new());
|
||||
}
|
||||
|
||||
pub fn set_use_quic(use_quic: bool) {
|
||||
let mut map = (*CONNECTION_MAP).lock().unwrap();
|
||||
map.set_use_quic(use_quic);
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
// TODO: see https://github.com/solana-labs/solana/issues/23661
|
||||
// remove lazy_static and optimize and refactor this
|
||||
pub fn get_connection(addr: &SocketAddr) -> Arc<dyn TpuConnection + 'static + Sync + Send> {
|
||||
fn get_connection(addr: &SocketAddr) -> Connection {
|
||||
let mut map = (*CONNECTION_MAP).lock().unwrap();
|
||||
let ticks = map.ticks;
|
||||
|
||||
let use_quic = map.use_quic;
|
||||
let (conn, target_ticks) = match map.map.entry(*addr) {
|
||||
Entry::Occupied(mut entry) => {
|
||||
let mut pair = entry.get_mut();
|
||||
@@ -57,12 +77,15 @@ pub fn get_connection(addr: &SocketAddr) -> Arc<dyn TpuConnection + 'static + Sy
|
||||
let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
|
||||
// TODO: see https://github.com/solana-labs/solana/issues/23659
|
||||
// make it configurable (e.g. via the command line) whether to use UDP or Quic
|
||||
let conn = Arc::new(UdpTpuConnection::new(send_socket, *addr));
|
||||
|
||||
let conn = if use_quic {
|
||||
Connection::Quic(Arc::new(QuicTpuConnection::new(send_socket, *addr)))
|
||||
} else {
|
||||
Connection::Udp(Arc::new(UdpTpuConnection::new(send_socket, *addr)))
|
||||
};
|
||||
|
||||
entry.insert((conn.clone(), ticks));
|
||||
(
|
||||
conn as Arc<dyn TpuConnection + 'static + Sync + Send>,
|
||||
ticks,
|
||||
)
|
||||
(conn, ticks)
|
||||
}
|
||||
};
|
||||
|
||||
@@ -85,13 +108,69 @@ pub fn get_connection(addr: &SocketAddr) -> Arc<dyn TpuConnection + 'static + Sy
|
||||
conn
|
||||
}
|
||||
|
||||
// TODO: see https://github.com/solana-labs/solana/issues/23851
|
||||
// use enum_dispatch and get rid of this tedious code.
|
||||
// The main blocker to using enum_dispatch right now is that
|
||||
// the it doesn't work with static methods like TpuConnection::new
|
||||
// which is used by thin_client. This will be eliminated soon
|
||||
// once thin_client is moved to using this connection cache.
|
||||
// Once that is done, we will migrate to using enum_dispatch
|
||||
// This will be done in a followup to
|
||||
// https://github.com/solana-labs/solana/pull/23817
|
||||
pub fn send_wire_transaction_batch(
|
||||
packets: &[&[u8]],
|
||||
addr: &SocketAddr,
|
||||
) -> Result<(), TransportError> {
|
||||
let conn = get_connection(addr);
|
||||
match conn {
|
||||
Connection::Udp(conn) => conn.send_wire_transaction_batch(packets),
|
||||
Connection::Quic(conn) => conn.send_wire_transaction_batch(packets),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn send_wire_transaction(
|
||||
wire_transaction: &[u8],
|
||||
addr: &SocketAddr,
|
||||
) -> Result<(), TransportError> {
|
||||
let conn = get_connection(addr);
|
||||
match conn {
|
||||
Connection::Udp(conn) => conn.send_wire_transaction(wire_transaction),
|
||||
Connection::Quic(conn) => conn.send_wire_transaction(wire_transaction),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn serialize_and_send_transaction(
|
||||
transaction: &VersionedTransaction,
|
||||
addr: &SocketAddr,
|
||||
) -> Result<(), TransportError> {
|
||||
let conn = get_connection(addr);
|
||||
match conn {
|
||||
Connection::Udp(conn) => conn.serialize_and_send_transaction(transaction),
|
||||
Connection::Quic(conn) => conn.serialize_and_send_transaction(transaction),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn par_serialize_and_send_transaction_batch(
|
||||
transactions: &[VersionedTransaction],
|
||||
addr: &SocketAddr,
|
||||
) -> Result<(), TransportError> {
|
||||
let conn = get_connection(addr);
|
||||
match conn {
|
||||
Connection::Udp(conn) => conn.par_serialize_and_send_transaction_batch(transactions),
|
||||
Connection::Quic(conn) => conn.par_serialize_and_send_transaction_batch(transactions),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use {
|
||||
crate::connection_cache::{get_connection, CONNECTION_MAP, MAX_CONNECTIONS},
|
||||
crate::{
|
||||
connection_cache::{get_connection, Connection, CONNECTION_MAP, MAX_CONNECTIONS},
|
||||
tpu_connection::TpuConnection,
|
||||
},
|
||||
rand::{Rng, SeedableRng},
|
||||
rand_chacha::ChaChaRng,
|
||||
std::net::SocketAddr,
|
||||
std::net::{IpAddr, SocketAddr},
|
||||
};
|
||||
|
||||
fn get_addr(rng: &mut ChaChaRng) -> SocketAddr {
|
||||
@@ -105,6 +184,13 @@ mod tests {
|
||||
addr_str.parse().expect("Invalid address")
|
||||
}
|
||||
|
||||
fn ip(conn: Connection) -> IpAddr {
|
||||
match conn {
|
||||
Connection::Udp(conn) => conn.tpu_addr().ip(),
|
||||
Connection::Quic(conn) => conn.tpu_addr().ip(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_connection_cache() {
|
||||
// Allow the test to run deterministically
|
||||
@@ -120,7 +206,7 @@ mod tests {
|
||||
// be lazy and not connect until first use or handle connection errors somehow
|
||||
// (without crashing, as would be required in a real practical validator)
|
||||
let first_addr = get_addr(&mut rng);
|
||||
assert!(get_connection(&first_addr).tpu_addr().ip() == first_addr.ip());
|
||||
assert!(ip(get_connection(&first_addr)) == first_addr.ip());
|
||||
let addrs = (0..MAX_CONNECTIONS)
|
||||
.into_iter()
|
||||
.map(|_| {
|
||||
@@ -133,7 +219,7 @@ mod tests {
|
||||
let map = (*CONNECTION_MAP).lock().unwrap();
|
||||
addrs.iter().for_each(|a| {
|
||||
let conn = map.map.get(a).expect("Address not found");
|
||||
assert!(a.ip() == conn.0.tpu_addr().ip());
|
||||
assert!(a.ip() == ip(conn.0.clone()));
|
||||
});
|
||||
|
||||
assert!(map.map.get(&first_addr).is_none());
|
||||
|
||||
@@ -7,10 +7,8 @@ use {
|
||||
futures::future::join_all,
|
||||
itertools::Itertools,
|
||||
quinn::{ClientConfig, Endpoint, EndpointConfig, NewConnection, WriteError},
|
||||
rayon::iter::{IntoParallelIterator, ParallelIterator},
|
||||
solana_sdk::{
|
||||
quic::{QUIC_MAX_CONCURRENT_STREAMS, QUIC_PORT_OFFSET},
|
||||
transaction::Transaction,
|
||||
transport::Result as TransportResult,
|
||||
},
|
||||
std::{
|
||||
@@ -65,21 +63,22 @@ impl TpuConnection for QuicTpuConnection {
|
||||
&self.client.addr
|
||||
}
|
||||
|
||||
fn send_wire_transaction(&self, data: &[u8]) -> TransportResult<()> {
|
||||
fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
let _guard = self.client.runtime.enter();
|
||||
let send_buffer = self.client.send_buffer(data);
|
||||
let send_buffer = self.client.send_buffer(wire_transaction);
|
||||
self.client.runtime.block_on(send_buffer)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn send_batch(&self, transactions: &[Transaction]) -> TransportResult<()> {
|
||||
let buffers = transactions
|
||||
.into_par_iter()
|
||||
.map(|tx| bincode::serialize(&tx).expect("serialize Transaction in send_batch"))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
let _guard = self.client.runtime.enter();
|
||||
let send_batch = self.client.send_batch(&buffers);
|
||||
let send_batch = self.client.send_batch(buffers);
|
||||
self.client.runtime.block_on(send_batch)?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -162,12 +161,18 @@ impl QuicClient {
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn send_buffer(&self, data: &[u8]) -> Result<(), ClientErrorKind> {
|
||||
self._send_buffer(data).await?;
|
||||
pub async fn send_buffer<T>(&self, data: T) -> Result<(), ClientErrorKind>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
self._send_buffer(data.as_ref()).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn send_batch(&self, buffers: &[Vec<u8>]) -> Result<(), ClientErrorKind> {
|
||||
pub async fn send_batch<T>(&self, buffers: &[T]) -> Result<(), ClientErrorKind>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
// Start off by "testing" the connection by sending the first transaction
|
||||
// This will also connect to the server if not already connected
|
||||
// and reconnect and retry if the first send attempt failed
|
||||
@@ -182,7 +187,7 @@ impl QuicClient {
|
||||
if buffers.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
let connection = self._send_buffer(&buffers[0]).await?;
|
||||
let connection = self._send_buffer(buffers[0].as_ref()).await?;
|
||||
|
||||
// Used to avoid dereferencing the Arc multiple times below
|
||||
// by just getting a reference to the NewConnection once
|
||||
@@ -196,7 +201,7 @@ impl QuicClient {
|
||||
join_all(
|
||||
buffs
|
||||
.into_iter()
|
||||
.map(|buf| Self::_send_buffer_using_conn(buf, connection_ref)),
|
||||
.map(|buf| Self::_send_buffer_using_conn(buf.as_ref(), connection_ref)),
|
||||
)
|
||||
});
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ use {
|
||||
signers::Signers,
|
||||
system_instruction,
|
||||
timing::duration_as_ms,
|
||||
transaction::{self, Transaction},
|
||||
transaction::{self, Transaction, VersionedTransaction},
|
||||
transport::Result as TransportResult,
|
||||
},
|
||||
std::{
|
||||
@@ -215,10 +215,13 @@ impl<C: 'static + TpuConnection> ThinClient<C> {
|
||||
let mut num_confirmed = 0;
|
||||
let mut wait_time = MAX_PROCESSING_AGE;
|
||||
// resend the same transaction until the transaction has no chance of succeeding
|
||||
let wire_transaction =
|
||||
bincode::serialize(&transaction).expect("transaction serialization failed");
|
||||
while now.elapsed().as_secs() < wait_time as u64 {
|
||||
if num_confirmed == 0 {
|
||||
// Send the transaction if there has been no confirmation (e.g. the first time)
|
||||
self.tpu_connection().send_transaction(transaction)?;
|
||||
self.tpu_connection()
|
||||
.send_wire_transaction(&wire_transaction)?;
|
||||
}
|
||||
|
||||
if let Ok(confirmed_blocks) = self.poll_for_signature_confirmation(
|
||||
@@ -601,12 +604,17 @@ impl<C: 'static + TpuConnection> SyncClient for ThinClient<C> {
|
||||
|
||||
impl<C: 'static + TpuConnection> AsyncClient for ThinClient<C> {
|
||||
fn async_send_transaction(&self, transaction: Transaction) -> TransportResult<Signature> {
|
||||
self.tpu_connection().send_transaction(&transaction)?;
|
||||
let transaction = VersionedTransaction::from(transaction);
|
||||
self.tpu_connection()
|
||||
.serialize_and_send_transaction(&transaction)?;
|
||||
Ok(transaction.signatures[0])
|
||||
}
|
||||
|
||||
fn async_send_batch(&self, transactions: Vec<Transaction>) -> TransportResult<()> {
|
||||
self.tpu_connection().send_batch(&transactions)
|
||||
let batch: Vec<VersionedTransaction> = transactions.into_iter().map(Into::into).collect();
|
||||
self.tpu_connection()
|
||||
.par_serialize_and_send_transaction_batch(&batch[..])?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn async_send_message<T: Signers>(
|
||||
|
||||
@@ -1,21 +1,40 @@
|
||||
use {
|
||||
solana_sdk::{transaction::Transaction, transport::Result as TransportResult},
|
||||
rayon::iter::{IntoParallelIterator, ParallelIterator},
|
||||
solana_sdk::{transaction::VersionedTransaction, transport::Result as TransportResult},
|
||||
std::net::{SocketAddr, UdpSocket},
|
||||
};
|
||||
|
||||
pub trait TpuConnection {
|
||||
fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self
|
||||
where
|
||||
Self: Sized;
|
||||
fn new(client_socket: UdpSocket, tpu_addr: SocketAddr) -> Self;
|
||||
|
||||
fn tpu_addr(&self) -> &SocketAddr;
|
||||
|
||||
fn send_transaction(&self, tx: &Transaction) -> TransportResult<()> {
|
||||
let data = bincode::serialize(tx).expect("serialize Transaction in send_transaction");
|
||||
self.send_wire_transaction(&data)
|
||||
fn serialize_and_send_transaction(
|
||||
&self,
|
||||
transaction: &VersionedTransaction,
|
||||
) -> TransportResult<()> {
|
||||
let wire_transaction =
|
||||
bincode::serialize(transaction).expect("serialize Transaction in send_batch");
|
||||
self.send_wire_transaction(&wire_transaction)
|
||||
}
|
||||
|
||||
fn send_wire_transaction(&self, data: &[u8]) -> TransportResult<()>;
|
||||
fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
|
||||
where
|
||||
T: AsRef<[u8]>;
|
||||
|
||||
fn send_batch(&self, transactions: &[Transaction]) -> TransportResult<()>;
|
||||
fn par_serialize_and_send_transaction_batch(
|
||||
&self,
|
||||
transactions: &[VersionedTransaction],
|
||||
) -> TransportResult<()> {
|
||||
let buffers = transactions
|
||||
.into_par_iter()
|
||||
.map(|tx| bincode::serialize(&tx).expect("serialize Transaction in send_batch"))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
self.send_wire_transaction_batch(&buffers)
|
||||
}
|
||||
|
||||
fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
|
||||
where
|
||||
T: AsRef<[u8]>;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
|
||||
use {
|
||||
crate::tpu_connection::TpuConnection,
|
||||
solana_sdk::{transaction::Transaction, transport::Result as TransportResult},
|
||||
core::iter::repeat,
|
||||
solana_sdk::transport::Result as TransportResult,
|
||||
solana_streamer::sendmmsg::batch_send,
|
||||
std::net::{SocketAddr, UdpSocket},
|
||||
};
|
||||
|
||||
@@ -24,19 +26,20 @@ impl TpuConnection for UdpTpuConnection {
|
||||
&self.addr
|
||||
}
|
||||
|
||||
fn send_wire_transaction(&self, data: &[u8]) -> TransportResult<()> {
|
||||
self.socket.send_to(data, self.addr)?;
|
||||
fn send_wire_transaction<T>(&self, wire_transaction: T) -> TransportResult<()>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
self.socket.send_to(wire_transaction.as_ref(), self.addr)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn send_batch(&self, transactions: &[Transaction]) -> TransportResult<()> {
|
||||
transactions
|
||||
.iter()
|
||||
.map(|tx| bincode::serialize(&tx).expect("serialize Transaction in send_batch"))
|
||||
.try_for_each(|buff| -> TransportResult<()> {
|
||||
self.socket.send_to(&buff, self.addr)?;
|
||||
Ok(())
|
||||
})?;
|
||||
fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
let pkts: Vec<_> = buffers.iter().zip(repeat(self.tpu_addr())).collect();
|
||||
batch_send(&self.socket, &pkts)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "solana-core"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
homepage = "https://solana.com/"
|
||||
documentation = "https://docs.rs/solana-core"
|
||||
readme = "../README.md"
|
||||
@@ -33,30 +33,30 @@ rayon = "1.5.1"
|
||||
retain_mut = "0.1.7"
|
||||
serde = "1.0.136"
|
||||
serde_derive = "1.0.103"
|
||||
solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.4" }
|
||||
solana-bloom = { path = "../bloom", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.4" }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
|
||||
solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.10.4" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.4" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-poh = { path = "../poh", version = "=1.10.4" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
|
||||
solana-replica-lib = { path = "../replica-lib", version = "=1.10.4" }
|
||||
solana-rpc = { path = "../rpc", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.6" }
|
||||
solana-bloom = { path = "../bloom", version = "=1.10.6" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.6" }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
|
||||
solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.10.6" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.6" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-poh = { path = "../poh", version = "=1.10.6" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
|
||||
solana-replica-lib = { path = "../replica-lib", version = "=1.10.6" }
|
||||
solana-rpc = { path = "../rpc", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
sys-info = "0.9.1"
|
||||
tempfile = "3.3.0"
|
||||
thiserror = "1.0"
|
||||
@@ -69,10 +69,10 @@ raptorq = "1.6.5"
|
||||
reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
||||
serde_json = "1.0.79"
|
||||
serial_test = "0.6.0"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
static_assertions = "1.1.0"
|
||||
systemstat = "0.1.10"
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ use {
|
||||
histogram::Histogram,
|
||||
itertools::Itertools,
|
||||
retain_mut::RetainMut,
|
||||
solana_client::connection_cache::send_wire_transaction_batch,
|
||||
solana_entry::entry::hash_transactions,
|
||||
solana_gossip::{cluster_info::ClusterInfo, contact_info::ContactInfo},
|
||||
solana_ledger::blockstore_processor::TransactionStatusSender,
|
||||
@@ -51,8 +52,8 @@ use {
|
||||
transaction::{
|
||||
self, AddressLoader, SanitizedTransaction, TransactionError, VersionedTransaction,
|
||||
},
|
||||
transport::TransportError,
|
||||
},
|
||||
solana_streamer::sendmmsg::{batch_send, SendPktsError},
|
||||
solana_transaction_status::token_balances::{
|
||||
collect_token_balances, TransactionTokenBalancesSet,
|
||||
},
|
||||
@@ -60,7 +61,7 @@ use {
|
||||
cmp,
|
||||
collections::HashMap,
|
||||
env,
|
||||
net::{SocketAddr, UdpSocket},
|
||||
net::SocketAddr,
|
||||
sync::{
|
||||
atomic::{AtomicU64, AtomicUsize, Ordering},
|
||||
Arc, Mutex, RwLock,
|
||||
@@ -482,11 +483,10 @@ impl BankingStage {
|
||||
/// Forwards all valid, unprocessed packets in the buffer, up to a rate limit. Returns
|
||||
/// the number of successfully forwarded packets in second part of tuple
|
||||
fn forward_buffered_packets(
|
||||
socket: &std::net::UdpSocket,
|
||||
tpu_forwards: &std::net::SocketAddr,
|
||||
packets: Vec<&Packet>,
|
||||
data_budget: &DataBudget,
|
||||
) -> (std::io::Result<()>, usize) {
|
||||
) -> (std::result::Result<(), TransportError>, usize) {
|
||||
const INTERVAL_MS: u64 = 100;
|
||||
const MAX_BYTES_PER_SECOND: usize = 10_000 * 1200;
|
||||
const MAX_BYTES_PER_INTERVAL: usize = MAX_BYTES_PER_SECOND * INTERVAL_MS as usize / 1000;
|
||||
@@ -502,18 +502,35 @@ impl BankingStage {
|
||||
.iter()
|
||||
.filter_map(|p| {
|
||||
if !p.meta.forwarded() && data_budget.take(p.meta.size) {
|
||||
Some((&p.data[..p.meta.size], tpu_forwards))
|
||||
Some(&p.data[..p.meta.size])
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
||||
// TODO: see https://github.com/solana-labs/solana/issues/23819
|
||||
// fix this so returns the correct number of succeeded packets
|
||||
// when there's an error sending the batch. This was left as-is for now
|
||||
// in favor of shipping Quic support, which was considered higher-priority
|
||||
if !packet_vec.is_empty() {
|
||||
inc_new_counter_info!("banking_stage-forwarded_packets", packet_vec.len());
|
||||
if let Err(SendPktsError::IoError(ioerr, num_failed)) = batch_send(socket, &packet_vec)
|
||||
{
|
||||
return (Err(ioerr), packet_vec.len().saturating_sub(num_failed));
|
||||
|
||||
let mut measure = Measure::start("banking_stage-forward-us");
|
||||
|
||||
let res = send_wire_transaction_batch(&packet_vec, tpu_forwards);
|
||||
|
||||
measure.stop();
|
||||
inc_new_counter_info!(
|
||||
"banking_stage-forward-us",
|
||||
measure.as_us() as usize,
|
||||
1000,
|
||||
1000
|
||||
);
|
||||
|
||||
if let Err(err) = res {
|
||||
inc_new_counter_info!("banking_stage-forward_packets-failed-batches", 1);
|
||||
return (Err(err), 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -766,7 +783,6 @@ impl BankingStage {
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn process_buffered_packets(
|
||||
my_pubkey: &Pubkey,
|
||||
socket: &std::net::UdpSocket,
|
||||
poh_recorder: &Arc<Mutex<PohRecorder>>,
|
||||
cluster_info: &ClusterInfo,
|
||||
buffered_packet_batches: &mut UnprocessedPacketBatches,
|
||||
@@ -846,7 +862,6 @@ impl BankingStage {
|
||||
cluster_info,
|
||||
buffered_packet_batches,
|
||||
poh_recorder,
|
||||
socket,
|
||||
false,
|
||||
data_budget,
|
||||
slot_metrics_tracker,
|
||||
@@ -865,7 +880,6 @@ impl BankingStage {
|
||||
cluster_info,
|
||||
buffered_packet_batches,
|
||||
poh_recorder,
|
||||
socket,
|
||||
true,
|
||||
data_budget,
|
||||
slot_metrics_tracker,
|
||||
@@ -887,7 +901,6 @@ impl BankingStage {
|
||||
cluster_info: &ClusterInfo,
|
||||
buffered_packet_batches: &mut UnprocessedPacketBatches,
|
||||
poh_recorder: &Arc<Mutex<PohRecorder>>,
|
||||
socket: &UdpSocket,
|
||||
hold: bool,
|
||||
data_budget: &DataBudget,
|
||||
slot_metrics_tracker: &mut LeaderSlotMetricsTracker,
|
||||
@@ -913,7 +926,7 @@ impl BankingStage {
|
||||
Self::filter_valid_packets_for_forwarding(buffered_packet_batches.iter());
|
||||
let forwardable_packets_len = forwardable_packets.len();
|
||||
let (_forward_result, sucessful_forwarded_packets_count) =
|
||||
Self::forward_buffered_packets(socket, &addr, forwardable_packets, data_budget);
|
||||
Self::forward_buffered_packets(&addr, forwardable_packets, data_budget);
|
||||
let failed_forwarded_packets_count =
|
||||
forwardable_packets_len.saturating_sub(sucessful_forwarded_packets_count);
|
||||
|
||||
@@ -958,7 +971,6 @@ impl BankingStage {
|
||||
cost_model: Arc<RwLock<CostModel>>,
|
||||
) {
|
||||
let recorder = poh_recorder.lock().unwrap().recorder();
|
||||
let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
|
||||
let mut buffered_packet_batches = UnprocessedPacketBatches::with_capacity(batch_limit);
|
||||
let mut banking_stage_stats = BankingStageStats::new(id);
|
||||
let qos_service = QosService::new(cost_model, id);
|
||||
@@ -970,7 +982,6 @@ impl BankingStage {
|
||||
|_| {
|
||||
Self::process_buffered_packets(
|
||||
&my_pubkey,
|
||||
&socket,
|
||||
poh_recorder,
|
||||
cluster_info,
|
||||
&mut buffered_packet_batches,
|
||||
@@ -3835,7 +3846,6 @@ mod tests {
|
||||
|
||||
let local_node = Node::new_localhost_with_pubkey(validator_pubkey);
|
||||
let cluster_info = new_test_cluster_info(local_node.info);
|
||||
let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
|
||||
let recv_socket = &local_node.sockets.tpu_forwards[0];
|
||||
|
||||
let test_cases = vec![
|
||||
@@ -3857,7 +3867,6 @@ mod tests {
|
||||
&cluster_info,
|
||||
&mut unprocessed_packet_batches,
|
||||
&poh_recorder,
|
||||
&send_socket,
|
||||
true,
|
||||
&data_budget,
|
||||
&mut LeaderSlotMetricsTracker::new(0),
|
||||
@@ -3935,7 +3944,6 @@ mod tests {
|
||||
|
||||
let local_node = Node::new_localhost_with_pubkey(validator_pubkey);
|
||||
let cluster_info = new_test_cluster_info(local_node.info);
|
||||
let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
|
||||
let recv_socket = &local_node.sockets.tpu_forwards[0];
|
||||
|
||||
let test_cases = vec![
|
||||
@@ -3969,7 +3977,6 @@ mod tests {
|
||||
&cluster_info,
|
||||
&mut unprocessed_packet_batches,
|
||||
&poh_recorder,
|
||||
&send_socket,
|
||||
hold,
|
||||
&DataBudget::default(),
|
||||
&mut LeaderSlotMetricsTracker::new(0),
|
||||
|
||||
@@ -326,7 +326,7 @@ pub fn new_cluster_nodes<T: 'static>(
|
||||
.collect();
|
||||
let broadcast = TypeId::of::<T>() == TypeId::of::<BroadcastStage>();
|
||||
let stakes: Vec<u64> = nodes.iter().map(|node| node.stake).collect();
|
||||
let mut weighted_shuffle = WeightedShuffle::new(&stakes).unwrap();
|
||||
let mut weighted_shuffle = WeightedShuffle::new("cluster-nodes", &stakes);
|
||||
if broadcast {
|
||||
weighted_shuffle.remove_index(index[&self_pubkey]);
|
||||
}
|
||||
|
||||
@@ -1298,6 +1298,7 @@ fn load_blockstore(
|
||||
BlockstoreOptions {
|
||||
recovery_mode: config.wal_recovery_mode.clone(),
|
||||
column_options: config.ledger_column_options.clone(),
|
||||
enforce_ulimit_nofile: config.enforce_ulimit_nofile,
|
||||
..BlockstoreOptions::default()
|
||||
},
|
||||
)
|
||||
|
||||
@@ -1531,7 +1531,7 @@ Returns the latest blockhash
|
||||
|
||||
- `RpcResponse<object>` - RpcResponse JSON object with `value` field set to a JSON object including:
|
||||
- `blockhash: <string>` - a Hash as base-58 encoded string
|
||||
- `lastValidBlockHeight: u64` - Slot
|
||||
- `lastValidBlockHeight: <u64>` - last [block height](../../terminology.md#block-height) at which the blockhash will be valid
|
||||
|
||||
#### Example:
|
||||
|
||||
@@ -3059,7 +3059,7 @@ curl http://localhost:8899 -X POST -H "Content-Type: application/json" -d '
|
||||
Result:
|
||||
|
||||
```json
|
||||
{ "jsonrpc": "2.0", "result": { "solana-core": "1.10.4" }, "id": 1 }
|
||||
{ "jsonrpc": "2.0", "result": { "solana-core": "1.10.6" }, "id": 1 }
|
||||
```
|
||||
|
||||
### getVoteAccounts
|
||||
@@ -5147,7 +5147,7 @@ The result will be an RpcResponse JSON object with `value` set to a JSON object
|
||||
- `blockhash: <string>` - a Hash as base-58 encoded string
|
||||
- `feeCalculator: <object>` - FeeCalculator object, the fee schedule for this block hash
|
||||
- `lastValidSlot: <u64>` - DEPRECATED - this value is inaccurate and should not be relied upon
|
||||
- `lastValidBlockHeight: <u64>` - last [block height](../../terminology.md#block-height) at which a blockhash will be valid
|
||||
- `lastValidBlockHeight: <u64>` - last [block height](../../terminology.md#block-height) at which the blockhash will be valid
|
||||
|
||||
#### Example:
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ solana-validator ... \
|
||||
```
|
||||
|
||||
Note that once running your validator *will terminate* if it's not able to write
|
||||
its tower into etcd before submitting a vote transactioin, so it's essential
|
||||
its tower into etcd before submitting a vote transaction, so it's essential
|
||||
that your etcd endpoint remain accessible at all times.
|
||||
|
||||
### Secondary Validator
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-dos"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -15,18 +15,18 @@ clap = {version = "3.1.5", features = ["derive", "cargo"]}
|
||||
log = "0.4.14"
|
||||
rand = "0.7.0"
|
||||
serde = "1.0.136"
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-core = { path = "../core", version = "=1.10.4" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-core = { path = "../core", version = "=1.10.6" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
[dev-dependencies]
|
||||
solana-local-cluster = { path = "../local-cluster", version = "=1.10.4" }
|
||||
solana-local-cluster = { path = "../local-cluster", version = "=1.10.6" }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-download-utils"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Download Utils"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -14,8 +14,8 @@ console = "0.15.0"
|
||||
indicatif = "0.16.2"
|
||||
log = "0.4.14"
|
||||
reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-entry"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Entry"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -18,16 +18,16 @@ log = "0.4.11"
|
||||
rand = "0.7.0"
|
||||
rayon = "1.5.1"
|
||||
serde = "1.0.136"
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
|
||||
[dev-dependencies]
|
||||
matches = "0.1.9"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-faucet"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Faucet"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -17,12 +17,12 @@ crossbeam-channel = "0.5"
|
||||
log = "0.4.14"
|
||||
serde = "1.0.136"
|
||||
serde_derive = "1.0.103"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-cli-config = { path = "../cli-config", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
|
||||
thiserror = "1.0"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-frozen-abi"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Frozen ABI"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -18,7 +18,7 @@ serde = "1.0.136"
|
||||
serde_derive = "1.0.103"
|
||||
serde_bytes = "0.11"
|
||||
sha2 = "0.10.2"
|
||||
solana-frozen-abi-macro = { path = "macro", version = "=1.10.4" }
|
||||
solana-frozen-abi-macro = { path = "macro", version = "=1.10.6" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[target.'cfg(not(target_arch = "bpf"))'.dependencies]
|
||||
@@ -27,7 +27,7 @@ im = { version = "15.0.0", features = ["rayon", "serde"] }
|
||||
memmap2 = "0.5.3"
|
||||
|
||||
[target.'cfg(not(target_arch = "bpf"))'.dev-dependencies]
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[build-dependencies]
|
||||
rustc_version = "0.4"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-frozen-abi-macro"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Frozen ABI Macro"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-genesis-utils"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Genesis Utils"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,9 +10,9 @@ documentation = "https://docs.rs/solana-download-utils"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-download-utils = { path = "../download-utils", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-download-utils = { path = "../download-utils", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-genesis"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -15,16 +15,16 @@ clap = "2.33.1"
|
||||
serde = "1.0.136"
|
||||
serde_json = "1.0.79"
|
||||
serde_yaml = "0.8.23"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.4" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-cli-config = { path = "../cli-config", version = "=1.10.6" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.6" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
tempfile = "3.3.0"
|
||||
|
||||
[[bin]]
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-geyser-plugin-interface"
|
||||
description = "The Solana Geyser plugin interface."
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -11,8 +11,8 @@ documentation = "https://docs.rs/solana-geyser-plugin-interface"
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.11"
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
thiserror = "1.0.30"
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-geyser-plugin-manager"
|
||||
description = "The Solana Geyser plugin manager."
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -16,13 +16,13 @@ json5 = "0.4.1"
|
||||
libloading = "0.7.3"
|
||||
log = "0.4.11"
|
||||
serde_json = "1.0.79"
|
||||
solana-geyser-plugin-interface = { path = "../geyser-plugin-interface", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-rpc = { path = "../rpc", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-geyser-plugin-interface = { path = "../geyser-plugin-interface", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-rpc = { path = "../rpc", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
thiserror = "1.0.30"
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-gossip"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -27,24 +27,24 @@ rayon = "1.5.1"
|
||||
serde = "1.0.136"
|
||||
serde_bytes = "0.11"
|
||||
serde_derive = "1.0.103"
|
||||
solana-bloom = { path = "../bloom", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.4" }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-bloom = { path = "../bloom", version = "=1.10.6" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.6" }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
@@ -32,8 +32,7 @@ fn bench_weighted_shuffle_new(bencher: &mut Bencher) {
|
||||
let weights = make_weights(&mut rng);
|
||||
bencher.iter(|| {
|
||||
rng.fill(&mut seed[..]);
|
||||
let shuffle = WeightedShuffle::new(&weights).unwrap();
|
||||
shuffle
|
||||
WeightedShuffle::new("", &weights)
|
||||
.shuffle(&mut ChaChaRng::from_seed(seed))
|
||||
.collect::<Vec<_>>()
|
||||
});
|
||||
|
||||
@@ -635,6 +635,10 @@ impl ClusterInfo {
|
||||
self.my_contact_info.write().unwrap().id = id;
|
||||
|
||||
self.insert_self();
|
||||
self.push_message(CrdsValue::new_signed(
|
||||
CrdsData::Version(Version::new(self.id())),
|
||||
&self.keypair(),
|
||||
));
|
||||
self.push_self(&HashMap::new(), None);
|
||||
}
|
||||
|
||||
@@ -2011,7 +2015,7 @@ impl ClusterInfo {
|
||||
return packet_batch;
|
||||
}
|
||||
let mut rng = rand::thread_rng();
|
||||
let shuffle = WeightedShuffle::new(&scores).unwrap().shuffle(&mut rng);
|
||||
let shuffle = WeightedShuffle::new("handle-pull-requests", &scores).shuffle(&mut rng);
|
||||
let mut total_bytes = 0;
|
||||
let mut sent = 0;
|
||||
for (addr, response) in shuffle.map(|i| &responses[i]) {
|
||||
|
||||
@@ -246,8 +246,7 @@ impl CrdsGossipPull {
|
||||
return Err(CrdsGossipError::NoPeers);
|
||||
}
|
||||
let mut rng = rand::thread_rng();
|
||||
let mut peers = WeightedShuffle::new(&weights)
|
||||
.unwrap()
|
||||
let mut peers = WeightedShuffle::new("pull-options", &weights)
|
||||
.shuffle(&mut rng)
|
||||
.map(|i| peers[i]);
|
||||
let peer = {
|
||||
|
||||
@@ -169,8 +169,7 @@ impl CrdsGossipPush {
|
||||
.filter(|(_, stake)| *stake > 0)
|
||||
.collect();
|
||||
let weights: Vec<_> = peers.iter().map(|(_, stake)| *stake).collect();
|
||||
WeightedShuffle::new(&weights)
|
||||
.unwrap()
|
||||
WeightedShuffle::new("prune-received-cache", &weights)
|
||||
.shuffle(&mut rng)
|
||||
.map(move |i| peers[i])
|
||||
};
|
||||
@@ -370,7 +369,7 @@ impl CrdsGossipPush {
|
||||
return;
|
||||
}
|
||||
let num_bloom_items = MIN_NUM_BLOOM_ITEMS.max(network_size);
|
||||
let shuffle = WeightedShuffle::new(&weights).unwrap().shuffle(&mut rng);
|
||||
let shuffle = WeightedShuffle::new("push-options", &weights).shuffle(&mut rng);
|
||||
let mut active_set = self.active_set.write().unwrap();
|
||||
let need = Self::compute_need(self.num_active, active_set.len(), ratio);
|
||||
for peer in shuffle.map(|i| peers[i]) {
|
||||
|
||||
@@ -15,12 +15,6 @@ use {
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum WeightedShuffleError<T> {
|
||||
NegativeWeight(T),
|
||||
SumOverflow,
|
||||
}
|
||||
|
||||
/// Implements an iterator where indices are shuffled according to their
|
||||
/// weights:
|
||||
/// - Returned indices are unique in the range [0, weights.len()).
|
||||
@@ -43,34 +37,48 @@ impl<T> WeightedShuffle<T>
|
||||
where
|
||||
T: Copy + Default + PartialOrd + AddAssign + CheckedAdd,
|
||||
{
|
||||
/// Returns error if:
|
||||
/// - any of the weights are negative.
|
||||
/// - sum of weights overflows.
|
||||
pub fn new(weights: &[T]) -> Result<Self, WeightedShuffleError<T>> {
|
||||
/// If weights are negative or overflow the total sum
|
||||
/// they are treated as zero.
|
||||
pub fn new(name: &'static str, weights: &[T]) -> Self {
|
||||
let size = weights.len() + 1;
|
||||
let zero = <T as Default>::default();
|
||||
let mut arr = vec![zero; size];
|
||||
let mut sum = zero;
|
||||
let mut zeros = Vec::default();
|
||||
let mut num_negative = 0;
|
||||
let mut num_overflow = 0;
|
||||
for (mut k, &weight) in (1usize..).zip(weights) {
|
||||
#[allow(clippy::neg_cmp_op_on_partial_ord)]
|
||||
// weight < zero does not work for NaNs.
|
||||
if !(weight >= zero) {
|
||||
return Err(WeightedShuffleError::NegativeWeight(weight));
|
||||
zeros.push(k - 1);
|
||||
num_negative += 1;
|
||||
continue;
|
||||
}
|
||||
if weight == zero {
|
||||
zeros.push(k - 1);
|
||||
continue;
|
||||
}
|
||||
sum = sum
|
||||
.checked_add(&weight)
|
||||
.ok_or(WeightedShuffleError::SumOverflow)?;
|
||||
sum = match sum.checked_add(&weight) {
|
||||
Some(val) => val,
|
||||
None => {
|
||||
zeros.push(k - 1);
|
||||
num_overflow += 1;
|
||||
continue;
|
||||
}
|
||||
};
|
||||
while k < size {
|
||||
arr[k] += weight;
|
||||
k += k & k.wrapping_neg();
|
||||
}
|
||||
}
|
||||
Ok(Self { arr, sum, zeros })
|
||||
if num_negative > 0 {
|
||||
datapoint_error!("weighted-shuffle-negative", (name, num_negative, i64));
|
||||
}
|
||||
if num_overflow > 0 {
|
||||
datapoint_error!("weighted-shuffle-overflow", (name, num_overflow, i64));
|
||||
}
|
||||
Self { arr, sum, zeros }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -343,7 +351,7 @@ mod tests {
|
||||
fn test_weighted_shuffle_empty_weights() {
|
||||
let weights = Vec::<u64>::new();
|
||||
let mut rng = rand::thread_rng();
|
||||
let shuffle = WeightedShuffle::new(&weights).unwrap();
|
||||
let shuffle = WeightedShuffle::new("", &weights);
|
||||
assert!(shuffle.clone().shuffle(&mut rng).next().is_none());
|
||||
assert!(shuffle.first(&mut rng).is_none());
|
||||
}
|
||||
@@ -354,7 +362,7 @@ mod tests {
|
||||
let weights = vec![0u64; 5];
|
||||
let seed = [37u8; 32];
|
||||
let mut rng = ChaChaRng::from_seed(seed);
|
||||
let shuffle = WeightedShuffle::new(&weights).unwrap();
|
||||
let shuffle = WeightedShuffle::new("", &weights);
|
||||
assert_eq!(
|
||||
shuffle.clone().shuffle(&mut rng).collect::<Vec<_>>(),
|
||||
[1, 4, 2, 3, 0]
|
||||
@@ -372,14 +380,14 @@ mod tests {
|
||||
let weights = [1, 0, 1000, 0, 0, 10, 100, 0];
|
||||
let mut counts = [0; 8];
|
||||
for _ in 0..100000 {
|
||||
let mut shuffle = WeightedShuffle::new(&weights).unwrap().shuffle(&mut rng);
|
||||
let mut shuffle = WeightedShuffle::new("", &weights).shuffle(&mut rng);
|
||||
counts[shuffle.next().unwrap()] += 1;
|
||||
let _ = shuffle.count(); // consume the rest.
|
||||
}
|
||||
assert_eq!(counts, [95, 0, 90069, 0, 0, 908, 8928, 0]);
|
||||
let mut counts = [0; 8];
|
||||
for _ in 0..100000 {
|
||||
let mut shuffle = WeightedShuffle::new(&weights).unwrap();
|
||||
let mut shuffle = WeightedShuffle::new("", &weights);
|
||||
shuffle.remove_index(5);
|
||||
shuffle.remove_index(3);
|
||||
shuffle.remove_index(1);
|
||||
@@ -390,6 +398,26 @@ mod tests {
|
||||
assert_eq!(counts, [97, 0, 90862, 0, 0, 0, 9041, 0]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_weighted_shuffle_negative_overflow() {
|
||||
const SEED: [u8; 32] = [48u8; 32];
|
||||
let weights = [19i64, 23, 7, 0, 0, 23, 3, 0, 5, 0, 19, 29];
|
||||
let mut rng = ChaChaRng::from_seed(SEED);
|
||||
let shuffle = WeightedShuffle::new("", &weights);
|
||||
assert_eq!(
|
||||
shuffle.shuffle(&mut rng).collect::<Vec<_>>(),
|
||||
[8, 1, 5, 10, 11, 0, 2, 6, 9, 4, 3, 7]
|
||||
);
|
||||
// Negative weights and overflowing ones are treated as zero.
|
||||
let weights = [19, 23, 7, -57, i64::MAX, 23, 3, i64::MAX, 5, -79, 19, 29];
|
||||
let mut rng = ChaChaRng::from_seed(SEED);
|
||||
let shuffle = WeightedShuffle::new("", &weights);
|
||||
assert_eq!(
|
||||
shuffle.shuffle(&mut rng).collect::<Vec<_>>(),
|
||||
[8, 1, 5, 10, 11, 0, 2, 6, 9, 4, 3, 7]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_weighted_shuffle_hard_coded() {
|
||||
let weights = [
|
||||
@@ -397,7 +425,7 @@ mod tests {
|
||||
];
|
||||
let seed = [48u8; 32];
|
||||
let mut rng = ChaChaRng::from_seed(seed);
|
||||
let mut shuffle = WeightedShuffle::new(&weights).unwrap();
|
||||
let mut shuffle = WeightedShuffle::new("", &weights);
|
||||
assert_eq!(
|
||||
shuffle.clone().shuffle(&mut rng).collect::<Vec<_>>(),
|
||||
[2, 12, 18, 0, 14, 15, 17, 10, 1, 9, 7, 6, 13, 20, 4, 19, 3, 8, 11, 16, 5]
|
||||
@@ -417,7 +445,7 @@ mod tests {
|
||||
assert_eq!(shuffle.first(&mut rng), Some(4));
|
||||
let seed = [37u8; 32];
|
||||
let mut rng = ChaChaRng::from_seed(seed);
|
||||
let mut shuffle = WeightedShuffle::new(&weights).unwrap();
|
||||
let mut shuffle = WeightedShuffle::new("", &weights);
|
||||
assert_eq!(
|
||||
shuffle.clone().shuffle(&mut rng).collect::<Vec<_>>(),
|
||||
[19, 3, 15, 14, 6, 10, 17, 18, 9, 2, 4, 1, 0, 7, 8, 20, 12, 13, 16, 5, 11]
|
||||
@@ -447,13 +475,13 @@ mod tests {
|
||||
let mut seed = [0u8; 32];
|
||||
rng.fill(&mut seed[..]);
|
||||
let mut rng = ChaChaRng::from_seed(seed);
|
||||
let shuffle = WeightedShuffle::new(&weights).unwrap();
|
||||
let shuffle = WeightedShuffle::new("", &weights);
|
||||
let shuffle: Vec<_> = shuffle.shuffle(&mut rng).collect();
|
||||
let mut rng = ChaChaRng::from_seed(seed);
|
||||
let shuffle_slow = weighted_shuffle_slow(&mut rng, weights.clone());
|
||||
assert_eq!(shuffle, shuffle_slow);
|
||||
let mut rng = ChaChaRng::from_seed(seed);
|
||||
let shuffle = WeightedShuffle::new(&weights).unwrap();
|
||||
let shuffle = WeightedShuffle::new("", &weights);
|
||||
assert_eq!(shuffle.first(&mut rng), Some(shuffle_slow[0]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-install"
|
||||
description = "The solana cluster software installer"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -26,12 +26,12 @@ reqwest = { version = "0.11.10", default-features = false, features = ["blocking
|
||||
semver = "1.0.6"
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
serde_yaml = "0.8.23"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-config-program = { path = "../programs/config", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-config-program = { path = "../programs/config", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
tar = "0.4.38"
|
||||
tempfile = "3.3.0"
|
||||
url = "2.2.2"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-keygen"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana key generation utility"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -14,11 +14,11 @@ bs58 = "0.4.0"
|
||||
clap = "2.33"
|
||||
dirs-next = "2.0.0"
|
||||
num_cpus = "1.13.1"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
|
||||
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-cli-config = { path = "../cli-config", version = "=1.10.6" }
|
||||
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
tiny-bip39 = "0.8.2"
|
||||
|
||||
[[bin]]
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-ledger-tool"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -21,20 +21,20 @@ log = { version = "0.4.14" }
|
||||
regex = "1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0.79"
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
|
||||
solana-cli-output = { path = "../cli-output", version = "=1.10.4" }
|
||||
solana-core = { path = "../core", version = "=1.10.4" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.4" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
|
||||
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
|
||||
solana-cli-output = { path = "../cli-output", version = "=1.10.6" }
|
||||
solana-core = { path = "../core", version = "=1.10.6" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.6" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "=1.10.6" }
|
||||
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
|
||||
[target.'cfg(not(target_env = "msvc"))'.dependencies]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-ledger"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana ledger"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -11,6 +11,7 @@ edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
bincode = "1.3.3"
|
||||
bitflags = "1.3.1"
|
||||
byteorder = "1.4.3"
|
||||
chrono = { version = "0.4.11", features = ["serde"] }
|
||||
chrono-humanize = "0.2.1"
|
||||
@@ -21,6 +22,7 @@ itertools = "0.10.3"
|
||||
lazy_static = "1.4.0"
|
||||
libc = "0.2.120"
|
||||
log = { version = "0.4.14" }
|
||||
lru = "0.7.3"
|
||||
num-derive = "0.3"
|
||||
num-traits = "0.2"
|
||||
num_cpus = "1.13.1"
|
||||
@@ -32,21 +34,21 @@ reed-solomon-erasure = { version = "5.0.1", features = ["simd-accel"] }
|
||||
serde = "1.0.136"
|
||||
serde_bytes = "0.11.5"
|
||||
sha2 = "0.10.2"
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.4" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.4" }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.4" }
|
||||
solana-storage-proto = { path = "../storage-proto", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.6" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.6" }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.6" }
|
||||
solana-storage-proto = { path = "../storage-proto", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
tempfile = "3.3.0"
|
||||
thiserror = "1.0"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
@@ -63,8 +65,8 @@ features = ["lz4"]
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.5.0"
|
||||
matches = "0.1.9"
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[build-dependencies]
|
||||
rustc_version = "0.4"
|
||||
|
||||
@@ -16,6 +16,7 @@ use {
|
||||
max_ticks_per_n_shreds, ErasureSetId, Result as ShredResult, Shred, ShredId, ShredType,
|
||||
Shredder, SHRED_PAYLOAD_SIZE,
|
||||
},
|
||||
slot_stats::{ShredSource, SlotsStats},
|
||||
},
|
||||
bincode::deserialize,
|
||||
crossbeam_channel::{bounded, Receiver, Sender, TrySendError},
|
||||
@@ -50,7 +51,7 @@ use {
|
||||
borrow::Cow,
|
||||
cell::RefCell,
|
||||
cmp,
|
||||
collections::{hash_map::Entry as HashMapEntry, BTreeMap, BTreeSet, HashMap, HashSet},
|
||||
collections::{hash_map::Entry as HashMapEntry, BTreeSet, HashMap, HashSet},
|
||||
convert::TryInto,
|
||||
fs,
|
||||
io::{Error as IoError, ErrorKind},
|
||||
@@ -60,7 +61,6 @@ use {
|
||||
atomic::{AtomicBool, Ordering},
|
||||
Arc, Mutex, RwLock, RwLockWriteGuard,
|
||||
},
|
||||
time::Instant,
|
||||
},
|
||||
tempfile::{Builder, TempDir},
|
||||
thiserror::Error,
|
||||
@@ -181,26 +181,6 @@ pub struct Blockstore {
|
||||
column_options: LedgerColumnOptions,
|
||||
}
|
||||
|
||||
struct SlotsStats {
|
||||
last_cleanup_ts: Instant,
|
||||
stats: BTreeMap<Slot, SlotStats>,
|
||||
}
|
||||
|
||||
impl Default for SlotsStats {
|
||||
fn default() -> Self {
|
||||
SlotsStats {
|
||||
last_cleanup_ts: Instant::now(),
|
||||
stats: BTreeMap::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct SlotStats {
|
||||
num_repaired: usize,
|
||||
num_recovered: usize,
|
||||
}
|
||||
|
||||
pub struct IndexMetaWorkingSetEntry {
|
||||
index: Index,
|
||||
// true only if at least one shred for this Index was inserted since the time this
|
||||
@@ -223,13 +203,6 @@ pub struct SlotMetaWorkingSetEntry {
|
||||
did_insert_occur: bool,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Debug, Clone)]
|
||||
enum ShredSource {
|
||||
Turbine,
|
||||
Repaired,
|
||||
Recovered,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct BlockstoreInsertionMetrics {
|
||||
pub num_shreds: usize,
|
||||
@@ -1250,13 +1223,13 @@ impl Blockstore {
|
||||
let mut newly_completed_data_sets: Vec<CompletedDataSetInfo> = vec![];
|
||||
let mut inserted_indices = Vec::new();
|
||||
for (i, (shred, is_repaired)) in shreds.into_iter().zip(is_repaired).enumerate() {
|
||||
let shred_source = if is_repaired {
|
||||
ShredSource::Repaired
|
||||
} else {
|
||||
ShredSource::Turbine
|
||||
};
|
||||
match shred.shred_type() {
|
||||
ShredType::Data => {
|
||||
let shred_source = if is_repaired {
|
||||
ShredSource::Repaired
|
||||
} else {
|
||||
ShredSource::Turbine
|
||||
};
|
||||
match self.check_insert_data_shred(
|
||||
shred,
|
||||
&mut erasure_metas,
|
||||
@@ -1295,7 +1268,7 @@ impl Blockstore {
|
||||
&mut index_meta_time,
|
||||
handle_duplicate,
|
||||
is_trusted,
|
||||
is_repaired,
|
||||
shred_source,
|
||||
metrics,
|
||||
);
|
||||
}
|
||||
@@ -1464,10 +1437,9 @@ impl Blockstore {
|
||||
}
|
||||
|
||||
fn erasure_mismatch(shred1: &Shred, shred2: &Shred) -> bool {
|
||||
// TODO should also compare first-coding-index once position field is
|
||||
// populated across cluster.
|
||||
shred1.coding_header.num_coding_shreds != shred2.coding_header.num_coding_shreds
|
||||
|| shred1.coding_header.num_data_shreds != shred2.coding_header.num_data_shreds
|
||||
|| shred1.first_coding_index() != shred2.first_coding_index()
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
@@ -1481,7 +1453,7 @@ impl Blockstore {
|
||||
index_meta_time: &mut u64,
|
||||
handle_duplicate: &F,
|
||||
is_trusted: bool,
|
||||
is_repaired: bool,
|
||||
shred_source: ShredSource,
|
||||
metrics: &mut BlockstoreInsertionMetrics,
|
||||
) -> bool
|
||||
where
|
||||
@@ -1548,13 +1520,10 @@ impl Blockstore {
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
if is_repaired {
|
||||
let mut slots_stats = self.slots_stats.lock().unwrap();
|
||||
let mut e = slots_stats.stats.entry(slot).or_default();
|
||||
e.num_repaired += 1;
|
||||
}
|
||||
|
||||
self.slots_stats
|
||||
.lock()
|
||||
.unwrap()
|
||||
.add_shred(slot, shred_source);
|
||||
// insert coding shred into rocks
|
||||
let result = self
|
||||
.insert_coding_shred(index_meta, &shred, write_batch)
|
||||
@@ -1700,7 +1669,7 @@ impl Blockstore {
|
||||
just_inserted_shreds,
|
||||
&self.last_root,
|
||||
leader_schedule,
|
||||
shred_source.clone(),
|
||||
shred_source,
|
||||
) {
|
||||
return Err(InsertDataShredError::InvalidShred);
|
||||
}
|
||||
@@ -1972,49 +1941,12 @@ impl Blockstore {
|
||||
end_index,
|
||||
})
|
||||
.collect();
|
||||
if shred_source == ShredSource::Repaired || shred_source == ShredSource::Recovered {
|
||||
{
|
||||
let mut slots_stats = self.slots_stats.lock().unwrap();
|
||||
let mut e = slots_stats.stats.entry(slot_meta.slot).or_default();
|
||||
if shred_source == ShredSource::Repaired {
|
||||
e.num_repaired += 1;
|
||||
slots_stats.add_shred(slot_meta.slot, shred_source);
|
||||
if slot_meta.is_full() {
|
||||
slots_stats.set_full(slot_meta);
|
||||
}
|
||||
if shred_source == ShredSource::Recovered {
|
||||
e.num_recovered += 1;
|
||||
}
|
||||
}
|
||||
if slot_meta.is_full() {
|
||||
let (num_repaired, num_recovered) = {
|
||||
let mut slots_stats = self.slots_stats.lock().unwrap();
|
||||
if let Some(e) = slots_stats.stats.remove(&slot_meta.slot) {
|
||||
if slots_stats.last_cleanup_ts.elapsed().as_secs() > 30 {
|
||||
let root = self.last_root();
|
||||
slots_stats.stats = slots_stats.stats.split_off(&root);
|
||||
slots_stats.last_cleanup_ts = Instant::now();
|
||||
}
|
||||
(e.num_repaired, e.num_recovered)
|
||||
} else {
|
||||
(0, 0)
|
||||
}
|
||||
};
|
||||
datapoint_info!(
|
||||
"shred_insert_is_full",
|
||||
(
|
||||
"total_time_ms",
|
||||
solana_sdk::timing::timestamp() - slot_meta.first_shred_timestamp,
|
||||
i64
|
||||
),
|
||||
("slot", slot_meta.slot, i64),
|
||||
(
|
||||
"last_index",
|
||||
slot_meta
|
||||
.last_index
|
||||
.and_then(|ix| i64::try_from(ix).ok())
|
||||
.unwrap_or(-1),
|
||||
i64
|
||||
),
|
||||
("num_repaired", num_repaired, i64),
|
||||
("num_recovered", num_recovered, i64),
|
||||
);
|
||||
}
|
||||
trace!("inserted shred into slot {:?} and index {:?}", slot, index);
|
||||
Ok(newly_completed_data_sets)
|
||||
@@ -6355,7 +6287,7 @@ pub mod tests {
|
||||
panic!("no dupes");
|
||||
},
|
||||
false,
|
||||
false,
|
||||
ShredSource::Turbine,
|
||||
&mut BlockstoreInsertionMetrics::default(),
|
||||
));
|
||||
|
||||
@@ -6373,7 +6305,7 @@ pub mod tests {
|
||||
counter.fetch_add(1, Ordering::Relaxed);
|
||||
},
|
||||
false,
|
||||
false,
|
||||
ShredSource::Turbine,
|
||||
&mut BlockstoreInsertionMetrics::default(),
|
||||
));
|
||||
assert_eq!(counter.load(Ordering::Relaxed), 1);
|
||||
@@ -6487,7 +6419,7 @@ pub mod tests {
|
||||
);
|
||||
coding_shred.common_header.fec_set_index = std::u32::MAX - 1;
|
||||
coding_shred.coding_header.num_data_shreds = 2;
|
||||
coding_shred.coding_header.num_coding_shreds = 3;
|
||||
coding_shred.coding_header.num_coding_shreds = 4;
|
||||
coding_shred.coding_header.position = 1;
|
||||
coding_shred.common_header.index = std::u32::MAX - 1;
|
||||
assert!(!Blockstore::should_insert_coding_shred(
|
||||
|
||||
@@ -257,10 +257,6 @@ impl ErasureMeta {
|
||||
None => return false,
|
||||
};
|
||||
other.__unused_size = self.__unused_size;
|
||||
// Ignore first_coding_index field for now to be backward compatible.
|
||||
// TODO remove this once cluster is upgraded to always populate
|
||||
// first_coding_index field.
|
||||
other.first_coding_index = self.first_coding_index;
|
||||
self == &other
|
||||
}
|
||||
|
||||
@@ -275,16 +271,7 @@ impl ErasureMeta {
|
||||
|
||||
pub(crate) fn coding_shreds_indices(&self) -> Range<u64> {
|
||||
let num_coding = self.config.num_coding() as u64;
|
||||
// first_coding_index == 0 may imply that the field is not populated.
|
||||
// self.set_index to be backward compatible.
|
||||
// TODO remove this once cluster is upgraded to always populate
|
||||
// first_coding_index field.
|
||||
let first_coding_index = if self.first_coding_index == 0 {
|
||||
self.set_index
|
||||
} else {
|
||||
self.first_coding_index
|
||||
};
|
||||
first_coding_index..first_coding_index + num_coding
|
||||
self.first_coding_index..self.first_coding_index + num_coding
|
||||
}
|
||||
|
||||
pub(crate) fn status(&self, index: &Index) -> ErasureMetaStatus {
|
||||
|
||||
@@ -8,6 +8,7 @@ pub mod bigtable_delete;
|
||||
pub mod bigtable_upload;
|
||||
pub mod bigtable_upload_service;
|
||||
pub mod block_error;
|
||||
mod slot_stats;
|
||||
#[macro_use]
|
||||
pub mod blockstore;
|
||||
pub mod ancestor_iterator;
|
||||
|
||||
@@ -504,9 +504,10 @@ impl Shred {
|
||||
pub(crate) fn first_coding_index(&self) -> Option<u32> {
|
||||
match self.shred_type() {
|
||||
ShredType::Data => None,
|
||||
// TODO should be: self.index() - self.coding_header.position
|
||||
// once position field is populated.
|
||||
ShredType::Code => Some(self.fec_set_index()),
|
||||
ShredType::Code => {
|
||||
let position = u32::from(self.coding_header.position);
|
||||
self.index().checked_sub(position)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -536,25 +537,25 @@ impl Shred {
|
||||
|
||||
// Returns the block index within the erasure coding set.
|
||||
fn erasure_block_index(&self) -> Option<usize> {
|
||||
let index = self.index().checked_sub(self.fec_set_index())?;
|
||||
let index = usize::try_from(index).ok()?;
|
||||
match self.shred_type() {
|
||||
ShredType::Data => Some(index),
|
||||
ShredType::Data => {
|
||||
let index = self.index().checked_sub(self.fec_set_index())?;
|
||||
usize::try_from(index).ok()
|
||||
}
|
||||
ShredType::Code => {
|
||||
// TODO should use first_coding_index once position field is
|
||||
// populated.
|
||||
// Assert that the last shred index in the erasure set does not
|
||||
// overshoot u32.
|
||||
self.fec_set_index().checked_add(u32::from(
|
||||
self.coding_header
|
||||
.num_data_shreds
|
||||
.max(self.coding_header.num_coding_shreds)
|
||||
.checked_sub(1)?,
|
||||
self.coding_header.num_data_shreds.checked_sub(1)?,
|
||||
))?;
|
||||
self.first_coding_index()?.checked_add(u32::from(
|
||||
self.coding_header.num_coding_shreds.checked_sub(1)?,
|
||||
))?;
|
||||
let num_data_shreds = usize::from(self.coding_header.num_data_shreds);
|
||||
let num_coding_shreds = usize::from(self.coding_header.num_coding_shreds);
|
||||
let position = usize::from(self.coding_header.position);
|
||||
let fec_set_size = num_data_shreds.checked_add(num_coding_shreds)?;
|
||||
let index = index.checked_add(num_data_shreds)?;
|
||||
let index = position.checked_add(num_data_shreds)?;
|
||||
(index < fec_set_size).then(|| index)
|
||||
}
|
||||
}
|
||||
|
||||
90
ledger/src/slot_stats.rs
Normal file
90
ledger/src/slot_stats.rs
Normal file
@@ -0,0 +1,90 @@
|
||||
use {
|
||||
crate::blockstore_meta::SlotMeta, bitflags::bitflags, lru::LruCache, solana_sdk::clock::Slot,
|
||||
};
|
||||
|
||||
const SLOTS_STATS_CACHE_CAPACITY: usize = 300;
|
||||
|
||||
macro_rules! get_mut_entry (
|
||||
($cache:expr, $key:expr) => (
|
||||
match $cache.get_mut(&$key) {
|
||||
Some(entry) => entry,
|
||||
None => {
|
||||
$cache.put($key, SlotStats::default());
|
||||
$cache.get_mut(&$key).unwrap()
|
||||
}
|
||||
}
|
||||
);
|
||||
);
|
||||
|
||||
#[derive(Copy, Clone, Debug)]
|
||||
pub(crate) enum ShredSource {
|
||||
Turbine,
|
||||
Repaired,
|
||||
Recovered,
|
||||
}
|
||||
|
||||
bitflags! {
|
||||
#[derive(Default)]
|
||||
struct SlotFlags: u8 {
|
||||
const DEAD = 0b00000001;
|
||||
const FULL = 0b00000010;
|
||||
const ROOTED = 0b00000100;
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct SlotStats {
|
||||
flags: SlotFlags,
|
||||
num_repaired: usize,
|
||||
num_recovered: usize,
|
||||
}
|
||||
|
||||
pub(crate) struct SlotsStats(LruCache<Slot, SlotStats>);
|
||||
|
||||
impl Default for SlotsStats {
|
||||
fn default() -> Self {
|
||||
// LruCache::unbounded because capacity is enforced manually.
|
||||
Self(LruCache::unbounded())
|
||||
}
|
||||
}
|
||||
|
||||
impl SlotsStats {
|
||||
pub(crate) fn add_shred(&mut self, slot: Slot, source: ShredSource) {
|
||||
let entry = get_mut_entry!(self.0, slot);
|
||||
match source {
|
||||
ShredSource::Turbine => (),
|
||||
ShredSource::Repaired => entry.num_repaired += 1,
|
||||
ShredSource::Recovered => entry.num_recovered += 1,
|
||||
}
|
||||
self.maybe_evict_cache();
|
||||
}
|
||||
|
||||
pub(crate) fn set_full(&mut self, slot_meta: &SlotMeta) {
|
||||
let total_time_ms =
|
||||
solana_sdk::timing::timestamp().saturating_sub(slot_meta.first_shred_timestamp);
|
||||
let last_index = slot_meta
|
||||
.last_index
|
||||
.and_then(|ix| i64::try_from(ix).ok())
|
||||
.unwrap_or(-1);
|
||||
let entry = get_mut_entry!(self.0, slot_meta.slot);
|
||||
if !entry.flags.contains(SlotFlags::FULL) {
|
||||
datapoint_info!(
|
||||
"shred_insert_is_full",
|
||||
("total_time_ms", total_time_ms, i64),
|
||||
("slot", slot_meta.slot, i64),
|
||||
("last_index", last_index, i64),
|
||||
("num_repaired", entry.num_repaired, i64),
|
||||
("num_recovered", entry.num_recovered, i64),
|
||||
);
|
||||
}
|
||||
entry.flags |= SlotFlags::FULL;
|
||||
self.maybe_evict_cache();
|
||||
}
|
||||
|
||||
fn maybe_evict_cache(&mut self) {
|
||||
while self.0.len() > SLOTS_STATS_CACHE_CAPACITY {
|
||||
let (_slot, _entry) = self.0.pop_lru().unwrap();
|
||||
// TODO: submit metrics for (slot, entry).
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-local-cluster"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -16,25 +16,25 @@ itertools = "0.10.3"
|
||||
log = "0.4.14"
|
||||
rand = "0.7.0"
|
||||
rayon = "1.5.1"
|
||||
solana-client = { path = "../client", version = "=1.10.4" }
|
||||
solana-config-program = { path = "../programs/config", version = "=1.10.4" }
|
||||
solana-core = { path = "../core", version = "=1.10.4" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.4" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.4" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-client = { path = "../client", version = "=1.10.6" }
|
||||
solana-config-program = { path = "../programs/config", version = "=1.10.6" }
|
||||
solana-core = { path = "../core", version = "=1.10.6" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.6" }
|
||||
solana-gossip = { path = "../gossip", version = "=1.10.6" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-stake-program = { path = "../programs/stake", version = "=1.10.6" }
|
||||
solana-streamer = { path = "../streamer", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
tempfile = "3.3.0"
|
||||
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.5.0"
|
||||
gag = "1.0.0"
|
||||
serial_test = "0.6.0"
|
||||
solana-download-utils = { path = "../download-utils", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-download-utils = { path = "../download-utils", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
edition = "2021"
|
||||
name = "solana-log-analyzer"
|
||||
description = "The solana cluster network analysis tool"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -14,8 +14,8 @@ byte-unit = "4.0.14"
|
||||
clap = "2.33.1"
|
||||
serde = "1.0.136"
|
||||
serde_json = "1.0.79"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
|
||||
[[bin]]
|
||||
name = "solana-log-analyzer"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-logger"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Logger"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "solana-measure"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
homepage = "https://solana.com/"
|
||||
documentation = "https://docs.rs/solana-measure"
|
||||
readme = "../README.md"
|
||||
@@ -12,7 +12,7 @@ edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.14"
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-merkle-root-bench"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -11,11 +11,11 @@ publish = false
|
||||
[dependencies]
|
||||
clap = "2.33.1"
|
||||
log = "0.4.14"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-merkle-tree"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Merkle Tree"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -11,7 +11,7 @@ edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
fast-math = "0.1"
|
||||
solana-program = { path = "../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../sdk/program", version = "=1.10.6" }
|
||||
|
||||
# This can go once the BPF toolchain target Rust 1.42.0+
|
||||
[target.bpfel-unknown-unknown.dependencies]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-metrics"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Metrics"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -15,7 +15,7 @@ gethostname = "0.2.3"
|
||||
lazy_static = "1.4.0"
|
||||
log = "0.4.14"
|
||||
reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
|
||||
[dev-dependencies]
|
||||
env_logger = "0.9.0"
|
||||
|
||||
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-net-shaper"
|
||||
description = "The solana cluster network shaping tool"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -14,7 +14,7 @@ clap = "2.33.1"
|
||||
rand = "0.7.0"
|
||||
serde = "1.0.136"
|
||||
serde_json = "1.0.79"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[[bin]]
|
||||
name = "solana-net-shaper"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-net-utils"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Network Utilities"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -19,9 +19,9 @@ rand = "0.7.0"
|
||||
serde = "1.0.136"
|
||||
serde_derive = "1.0.103"
|
||||
socket2 = "0.4.4"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
url = "2.2.2"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-notifier"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Notifier"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-perf"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana Performance APIs"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -22,10 +22,10 @@ log = "0.4.14"
|
||||
rand = "0.7.0"
|
||||
rayon = "1.5.1"
|
||||
serde = "1.0.136"
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
|
||||
[target."cfg(target_os = \"linux\")".dependencies]
|
||||
caps = "0.5.3"
|
||||
@@ -37,7 +37,7 @@ name = "solana_perf"
|
||||
|
||||
[dev-dependencies]
|
||||
matches = "0.1.9"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[[bench]]
|
||||
name = "sigverify"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
edition = "2021"
|
||||
name = "solana-poh-bench"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
@@ -14,12 +14,12 @@ clap = "2.33.1"
|
||||
log = "0.4.14"
|
||||
rand = "0.7.0"
|
||||
rayon = "1.5.1"
|
||||
solana-entry = { path = "../entry", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-version = { path = "../version", version = "=1.10.4" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-version = { path = "../version", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-poh"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana PoH"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -13,21 +13,21 @@ edition = "2021"
|
||||
core_affinity = "0.5.10"
|
||||
crossbeam-channel = "0.5"
|
||||
log = "0.4.14"
|
||||
solana-entry = { path = "../entry", version = "=1.10.4" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-sys-tuner = { path = "../sys-tuner", version = "=1.10.4" }
|
||||
solana-entry = { path = "../entry", version = "=1.10.6" }
|
||||
solana-ledger = { path = "../ledger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-metrics = { path = "../metrics", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-sys-tuner = { path = "../sys-tuner", version = "=1.10.6" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
bincode = "1.3.3"
|
||||
matches = "0.1.9"
|
||||
rand = "0.7.0"
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-perf = { path = "../perf", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-program-runtime"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana program runtime"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -19,15 +19,15 @@ log = "0.4.14"
|
||||
num-derive = { version = "0.3" }
|
||||
num-traits = { version = "0.2" }
|
||||
serde = { version = "1.0.129", features = ["derive", "rc"] }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
|
||||
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
|
||||
solana-measure = { path = "../measure", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
thiserror = "1.0"
|
||||
enum-iterator = "0.7.0"
|
||||
|
||||
[dev-dependencies]
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib"]
|
||||
|
||||
@@ -5,7 +5,7 @@ edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
name = "solana-program-test"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
|
||||
[dependencies]
|
||||
async-trait = "0.1.52"
|
||||
@@ -14,13 +14,13 @@ bincode = "1.3.3"
|
||||
chrono-humanize = "0.2.1"
|
||||
log = "0.4.14"
|
||||
serde = "1.0.136"
|
||||
solana-banks-client = { path = "../banks-client", version = "=1.10.4" }
|
||||
solana-banks-server = { path = "../banks-server", version = "=1.10.4" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.4" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.4" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.4" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
|
||||
solana-banks-client = { path = "../banks-client", version = "=1.10.6" }
|
||||
solana-banks-server = { path = "../banks-server", version = "=1.10.6" }
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.6" }
|
||||
solana-logger = { path = "../logger", version = "=1.10.6" }
|
||||
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
|
||||
solana-runtime = { path = "../runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../sdk", version = "=1.10.6" }
|
||||
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
|
||||
thiserror = "1.0"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "solana-address-lookup-table-program-tests"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
@@ -14,9 +14,9 @@ publish = false
|
||||
[dev-dependencies]
|
||||
assert_matches = "1.5.0"
|
||||
bincode = "1.3.3"
|
||||
solana-address-lookup-table-program = { path = "../address-lookup-table", version = "=1.10.4" }
|
||||
solana-program-test = { path = "../../program-test", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../../sdk", version = "=1.10.4" }
|
||||
solana-address-lookup-table-program = { path = "../address-lookup-table", version = "=1.10.6" }
|
||||
solana-program-test = { path = "../../program-test", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../../sdk", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-address-lookup-table-program"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana address lookup table program"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -16,14 +16,14 @@ log = "0.4.14"
|
||||
num-derive = "0.3"
|
||||
num-traits = "0.2"
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
solana-frozen-abi = { path = "../../frozen-abi", version = "=1.10.4" }
|
||||
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.10.4" }
|
||||
solana-program = { path = "../../sdk/program", version = "=1.10.4" }
|
||||
solana-frozen-abi = { path = "../../frozen-abi", version = "=1.10.6" }
|
||||
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.10.6" }
|
||||
solana-program = { path = "../../sdk/program", version = "=1.10.6" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[target.'cfg(not(target_arch = "bpf"))'.dependencies]
|
||||
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../../sdk", version = "=1.10.4" }
|
||||
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../../sdk", version = "=1.10.6" }
|
||||
|
||||
[build-dependencies]
|
||||
rustc_version = "0.4"
|
||||
|
||||
434
programs/bpf/Cargo.lock
generated
434
programs/bpf/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "solana-bpf-programs"
|
||||
description = "Blockchain, Rebuilt for Scale"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
documentation = "https://docs.rs/solana"
|
||||
homepage = "https://solana.com/"
|
||||
readme = "README.md"
|
||||
@@ -26,19 +26,19 @@ itertools = "0.10.1"
|
||||
log = "0.4.11"
|
||||
miow = "0.3.6"
|
||||
net2 = "0.2.37"
|
||||
solana-bpf-rust-invoke = { path = "rust/invoke", version = "=1.10.4"}
|
||||
solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.10.4"}
|
||||
solana-bpf-rust-realloc = { path = "rust/realloc", version = "=1.10.4"}
|
||||
solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.10.4"}
|
||||
solana-cli-output = { path = "../../cli-output", version = "=1.10.4" }
|
||||
solana-logger = { path = "../../logger", version = "=1.10.4" }
|
||||
solana-measure = { path = "../../measure", version = "=1.10.4" }
|
||||
solana-bpf-rust-invoke = { path = "rust/invoke", version = "=1.10.6"}
|
||||
solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.10.6"}
|
||||
solana-bpf-rust-realloc = { path = "rust/realloc", version = "=1.10.6"}
|
||||
solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.10.6"}
|
||||
solana-cli-output = { path = "../../cli-output", version = "=1.10.6" }
|
||||
solana-logger = { path = "../../logger", version = "=1.10.6" }
|
||||
solana-measure = { path = "../../measure", version = "=1.10.6" }
|
||||
solana_rbpf = "=0.2.24"
|
||||
solana-runtime = { path = "../../runtime", version = "=1.10.4" }
|
||||
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.4" }
|
||||
solana-sdk = { path = "../../sdk", version = "=1.10.4" }
|
||||
solana-transaction-status = { path = "../../transaction-status", version = "=1.10.4" }
|
||||
solana-account-decoder = { path = "../../account-decoder", version = "=1.10.4" }
|
||||
solana-runtime = { path = "../../runtime", version = "=1.10.6" }
|
||||
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.6" }
|
||||
solana-sdk = { path = "../../sdk", version = "=1.10.6" }
|
||||
solana-transaction-status = { path = "../../transaction-status", version = "=1.10.6" }
|
||||
solana-account-decoder = { path = "../../account-decoder", version = "=1.10.6" }
|
||||
|
||||
[[bench]]
|
||||
name = "bpf_loader"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-128bit"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-128bit"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-128bit-dep"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-128bit-dep"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
targets = ["x86_64-unknown-linux-gnu"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-alloc"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-alloc"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-call-depth"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-call-depth"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-caller-access"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-caller-access"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-custom-heap"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-custom-heap"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[features]
|
||||
default = ["custom-heap"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-dep-crate"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -11,9 +11,9 @@ edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
byteorder = { version = "1", default-features = false }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
# list of crates which must be buildable for bpf programs
|
||||
solana-address-lookup-table-program = { path = "../../../../programs/address-lookup-table", version = "=1.10.4" }
|
||||
solana-address-lookup-table-program = { path = "../../../../programs/address-lookup-table", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-deprecated-loader"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-deprecated-loader"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-dup-accounts"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-dup-accounts"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-error-handling"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -12,7 +12,7 @@ edition = "2021"
|
||||
[dependencies]
|
||||
num-derive = "0.3"
|
||||
num-traits = "0.2"
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
thiserror = "1.0"
|
||||
|
||||
[lib]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-external-spend"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-external-spend"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-finalize"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-finalize"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-instruction-introspection"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-instruction-introspection"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-invoke"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -15,7 +15,7 @@ program = []
|
||||
|
||||
[dependencies]
|
||||
solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib", "cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-invoke-and-error"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-error"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-invoke-and-ok"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-ok"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-invoke-and-return"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-return"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-invoked"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -14,7 +14,7 @@ default = ["program"]
|
||||
program = []
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["lib", "cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-iter"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-iter"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "solana-bpf-rust-log-data"
|
||||
version = "1.10.4"
|
||||
version = "1.10.6"
|
||||
description = "Solana BPF test program written in Rust"
|
||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-log-data"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
|
||||
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
|
||||
|
||||
[features]
|
||||
default = ["program"]
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user