Compare commits

...

20 Commits

Author SHA1 Message Date
mergify[bot]
c597a6c828 Report timing info for stakes cache updates from txs (backport #20856) (#20883)
* Report timing info for stakes cache updates from txs (#20856)

(cherry picked from commit 735016661b)

# Conflicts:
#	runtime/src/bank.rs

* resolve conflicts

Co-authored-by: Justin Starry <justin@solana.com>
2021-10-22 15:51:20 -04:00
mergify[bot]
d890aa93a5 Add counter for new transactions in SendTransactionService (#20852) (#20858)
* Add counter for inserted transactions

* Add counter for tx recv

(cherry picked from commit 8959d5e21c)

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
2021-10-21 23:08:54 -06:00
mergify[bot]
1d7f6a2c66 Rpc: filters performance improvement (#20185) (#20862)
* Add Base58,Base64,Bytes to MemcmpEncodedBytes

* Rpc: decode memcmp before filtering accounts

* Add deprecated attribute

* Add Memcmp::bytes

* Fix clippy for deprecated

* Another clippy fix

* merge RpcFilterError::DataTooLarge

* add deprecation for Base58DataTooLarge

* change filter data size limit

* strict data size len for base58

* add magic numbers

* fix tests

(cherry picked from commit e9a427b9c8)

Co-authored-by: Kirill Fomichev <fanatid@ya.ru>
2021-10-22 01:29:49 +00:00
mergify[bot]
a483a7da47 Add counter for dropped duplicated packets, fix dropped_packets_count (#20834) (#20837)
(cherry picked from commit 71d0bd4605)

Co-authored-by: Tao Zhu <82401714+taozhu-chicago@users.noreply.github.com>
2021-10-21 04:55:11 +00:00
mergify[bot]
e333cd48e8 rpc-send-tx-svc server-side retry knobs (backport #20818) (#20829)
* rpc-send-tx-svc: add with_config constructor

(cherry picked from commit fe098b5ddc)

# Conflicts:
#	Cargo.lock
#	core/Cargo.toml
#	replica-node/Cargo.toml
#	rpc/src/rpc_service.rs
#	rpc/src/send_transaction_service.rs
#	validator/Cargo.toml

* rpc-send-tx-svc: server-side retry knobs

(cherry picked from commit 2744a2128c)

Co-authored-by: Trent Nelson <trent@solana.com>
2021-10-21 00:13:46 +00:00
mergify[bot]
b3be0b7b44 cli: account for rpc nodes when considering feature set adoption (#20773)
(cherry picked from commit 5794bba65c)

Co-authored-by: Trent Nelson <trent@solana.com>
2021-10-20 23:33:21 +00:00
Brooks Prumo
4ec275b5cd fix bad merge 2021-10-18 13:56:45 -07:00
Brooks Prumo
a6e6bc6dc0 Ignore RUSTSEC-2020-0159
(cherry picked from commit 7baeb04f26)

# Conflicts:
#	ci/do-audit.sh
2021-10-18 13:56:45 -07:00
mergify[bot]
91e56bdb5e clap-utils: trim single-quotes from signer uris on windows (#20694)
(cherry picked from commit 6649dfa899)

Co-authored-by: Trent Nelson <trent@solana.com>
2021-10-14 18:01:42 +00:00
mergify[bot]
3fd0f45e91 Include token owners in TransactionTokenBalances (backport #20642) (#20676)
* Include token owners in TransactionTokenBalances (#20642)

* Cache owners in TransactionTokenBalances

* Light cleanup

* Use return struct, and remove pub

* Single-use statements

* Why not, just do the whole crate

* Add metrics

* Make datapoint_debug to prevent spam unless troubleshooting

(cherry picked from commit e806fa6904)

# Conflicts:
#	ledger/src/blockstore.rs
#	transaction-status/Cargo.toml
#	transaction-status/src/token_balances.rs

* Fix conflicts

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
2021-10-14 16:37:35 +00:00
mergify[bot]
84644ce994 Ignore delinquent stake on exit (#20367) (#20381)
* add --ignore-delinquency flag to validator exit and wait-for-restart-window sub commands

* Fix a merge issue

* Add missing variable declaration

* Remove empty line to help CI checks pass

* run rustfmt

* Change argument wording for clarity and verbosity

* Change --ignore-delinquent-stake to --max-delinquent-stake

* cargo fmtgit add validator/src/main.rsgit add validator/src/main.rs

* Adjust per mvines

* Formatting

* Improve input validation

* Please automate cargo fmt somehow

(cherry picked from commit fc5dd7f3bc)

Co-authored-by: Michael <68944931+michaelh-laine@users.noreply.github.com>
2021-10-12 19:14:30 +00:00
mergify[bot]
353cb8efa5 solana-validator wait-for-restart-window command now accepts an optional --identity argument (backport #18684) (#20609)
* wait-for-restart-window command now accepts an optional --identity argument

(cherry picked from commit c418e8f370)

# Conflicts:
#	validator/src/main.rs

* Fixed cherry-pick conflicts

Co-authored-by: Michael Vines <mvines@gmail.com>
Co-authored-by: Steven Czabaniuk <steven@solana.com>
2021-10-12 06:15:30 +00:00
Michael Vines
779f36a1bd Rework AVX/AVX2 detection again
(cherry picked from commit c16510152e)
2021-10-10 15:28:26 -07:00
mergify[bot]
7b216d67ce Remove support for dynamically loaded native programs (backport #20444) (#20483)
* Remove support for dynamically loaded native programs (#20444)

(cherry picked from commit 785fcb63f5)

* nudge

Co-authored-by: Jack May <jack@solana.com>
2021-10-09 01:18:13 +00:00
mergify[bot]
ca271892c8 Fix solana docker image (#20550)
The docker image fails with:

/usr/bin/solana-run.sh: line 66: ./fetch-spl.sh: No such file or directory

In the solana docker image, scripts/run.sh is copied to
/usr/bin/solana-run.sh and fetch-spl.sh to /usr/bin/fetch-spl.sh. This
means that the line:

cd "$(dirname "$0")/.."

means we're doing a "cd /usr", which means we can't find fetch-spl.sh or
spl-genesis-args.sh (i.e., the error above).

(cherry picked from commit 2762f6f96f)

Co-authored-by: Sean Young <sean@mess.org>
2021-10-08 22:33:42 +00:00
Tyera Eulberg
598e2934ba v1.7: Bump crates to resolve audit failures (#20553)
* Bump nix

* Bump sha2 to resolve warning
2021-10-08 20:59:57 +00:00
mergify[bot]
9ff9234280 adds metrics for number of nodes vs number of pubkeys (backport #20512) (#20523)
* adds metrics for number of nodes vs number of pubkeys (#20512)

(cherry picked from commit 0da661de62)

# Conflicts:
#	gossip/src/cluster_info_metrics.rs

* removes backport merge conflicts

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
2021-10-08 15:20:27 +00:00
mergify[bot]
8f07b46a69 Enable easy full-rpc services on testnet nodes (#20530) (#20532)
(cherry picked from commit afe866ad02)

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
2021-10-08 03:02:48 +00:00
mergify[bot]
b48bfc19c1 Fixup docs on deprecated JSON-RPC methods (backport #20515) (#20520)
* Update expected removal version to match backward-compatibility policy (#20515)

(cherry picked from commit d56ad8ff4f)

# Conflicts:
#	docs/src/developing/clients/jsonrpc-api.md

* Fix conflict

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
2021-10-08 00:41:35 +00:00
Trent Nelson
33c24ec3ae Bump version to 1.7.16 (#20519) 2021-10-07 18:29:40 -06:00
169 changed files with 1798 additions and 1836 deletions

361
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -45,9 +45,6 @@ members = [
"programs/bpf_loader",
"programs/config",
"programs/exchange",
"programs/failure",
"programs/noop",
"programs/ownable",
"programs/secp256k1",
"programs/stake",
"programs/vote",

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-account-decoder"
version = "1.7.15"
version = "1.7.16"
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.122"
serde_derive = "1.0.103"
serde_json = "1.0.56"
solana-config-program = { path = "../programs/config", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-config-program = { path = "../programs/config", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
thiserror = "1.0"
zstd = "0.5.1"

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-accounts-bench"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -11,11 +11,11 @@ publish = false
[dependencies]
log = "0.4.11"
rayon = "1.5.0"
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
rand = "0.7.0"
clap = "2.33.1"
crossbeam-channel = "0.4"

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-accounts-cluster-bench"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -13,24 +13,24 @@ clap = "2.33.1"
log = "0.4.11"
rand = "0.7.0"
rayon = "1.4.1"
solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-core = { path = "../core", version = "=1.7.15" }
solana-faucet = { path = "../faucet", version = "=1.7.15" }
solana-gossip = { path = "../gossip", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-account-decoder = { path = "../account-decoder", version = "=1.7.16" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-core = { path = "../core", version = "=1.7.16" }
solana-faucet = { path = "../faucet", version = "=1.7.16" }
solana-gossip = { path = "../gossip", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
[dev-dependencies]
solana-local-cluster = { path = "../local-cluster", version = "=1.7.15" }
solana-local-cluster = { path = "../local-cluster", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-banking-bench"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -14,18 +14,18 @@ crossbeam-channel = "0.4"
log = "0.4.11"
rand = "0.7.0"
rayon = "1.5.0"
solana-core = { path = "../core", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-gossip = { path = "../gossip", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-perf = { path = "../perf", version = "=1.7.15" }
solana-poh = { path = "../poh", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-core = { path = "../core", version = "=1.7.16" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-gossip = { path = "../gossip", version = "=1.7.16" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-perf = { path = "../perf", version = "=1.7.16" }
solana-poh = { path = "../poh", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-banks-client"
version = "1.7.15"
version = "1.7.16"
description = "Solana banks client"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -15,16 +15,16 @@ borsh = "0.9.0"
borsh-derive = "0.9.0"
futures = "0.3"
mio = "0.7.6"
solana-banks-interface = { path = "../banks-interface", version = "=1.7.15" }
solana-program = { path = "../sdk/program", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-banks-interface = { path = "../banks-interface", version = "=1.7.16" }
solana-program = { path = "../sdk/program", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
tarpc = { version = "0.24.1", features = ["full"] }
tokio = { version = "1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }
[dev-dependencies]
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-banks-server = { path = "../banks-server", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-banks-server = { path = "../banks-server", version = "=1.7.16" }
[lib]
crate-type = ["lib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-banks-interface"
version = "1.7.15"
version = "1.7.16"
description = "Solana banks RPC interface"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
mio = "0.7.6"
serde = { version = "1.0.122", features = ["derive"] }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
tarpc = { version = "0.24.1", features = ["full"] }
[dev-dependencies]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-banks-server"
version = "1.7.15"
version = "1.7.16"
description = "Solana banks server"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -14,10 +14,10 @@ bincode = "1.3.1"
futures = "0.3"
log = "0.4.11"
mio = "0.7.6"
solana-banks-interface = { path = "../banks-interface", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-banks-interface = { path = "../banks-interface", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
tarpc = { version = "0.24.1", features = ["full"] }
tokio = { version = "1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-bench-exchange"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -18,23 +18,23 @@ rand = "0.7.0"
rayon = "1.5.0"
serde_json = "1.0.56"
serde_yaml = "0.8.13"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-core = { path = "../core", version = "=1.7.15" }
solana-genesis = { path = "../genesis", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-exchange-program = { path = "../programs/exchange", version = "=1.7.15" }
solana-faucet = { path = "../faucet", version = "=1.7.15" }
solana-gossip = { path = "../gossip", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-core = { path = "../core", version = "=1.7.16" }
solana-genesis = { path = "../genesis", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-exchange-program = { path = "../programs/exchange", version = "=1.7.16" }
solana-faucet = { path = "../faucet", version = "=1.7.16" }
solana-gossip = { path = "../gossip", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
[dev-dependencies]
solana-local-cluster = { path = "../local-cluster", version = "=1.7.15" }
solana-local-cluster = { path = "../local-cluster", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-bench-streamer"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ publish = false
[dependencies]
clap = "2.33.1"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-bench-tps"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -15,24 +15,24 @@ log = "0.4.11"
rayon = "1.5.0"
serde_json = "1.0.56"
serde_yaml = "0.8.13"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-core = { path = "../core", version = "=1.7.15" }
solana-genesis = { path = "../genesis", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-faucet = { path = "../faucet", version = "=1.7.15" }
solana-gossip = { path = "../gossip", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-core = { path = "../core", version = "=1.7.16" }
solana-genesis = { path = "../genesis", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-faucet = { path = "../faucet", version = "=1.7.16" }
solana-gossip = { path = "../gossip", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
[dev-dependencies]
serial_test = "0.4.0"
solana-local-cluster = { path = "../local-cluster", version = "=1.7.15" }
solana-local-cluster = { path = "../local-cluster", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -45,5 +45,12 @@ cargo_audit_ignores=(
# Blocked on jsonrpc removing dependency on unmaintained `websocket`
# https://github.com/paritytech/jsonrpc/issues/605
--ignore RUSTSEC-2021-0079
# chrono: Potential segfault in `localtime_r` invocations
#
# Blocked due to no safe upgrade
# https://github.com/chronotope/chrono/issues/499
--ignore RUSTSEC-2020-0159
)
scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-clap-utils"
version = "1.7.15"
version = "1.7.16"
description = "Solana utilities for the clap"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -12,8 +12,8 @@ edition = "2018"
[dependencies]
clap = "2.33.0"
rpassword = "4.0"
solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
thiserror = "1.0.21"
tiny-bip39 = "0.8.1"
uriparse = "0.6.3"

View File

@@ -258,6 +258,15 @@ pub(crate) fn parse_signer_source<S: AsRef<str>>(
let source = {
#[cfg(target_family = "windows")]
{
// trim matched single-quotes since cmd.exe won't
let mut source = source;
while let Some(trimmed) = source.strip_prefix('\'') {
source = if let Some(trimmed) = trimmed.strip_suffix('\'') {
trimmed
} else {
break;
}
}
source.replace("\\", "/")
}
#[cfg(not(target_family = "windows"))]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-cli-config"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-cli-output"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -20,12 +20,12 @@ indicatif = "0.15.0"
serde = "1.0.122"
serde_derive = "1.0.103"
serde_json = "1.0.56"
solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-account-decoder = { path = "../account-decoder", version = "=1.7.16" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
[package.metadata.docs.rs]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-cli"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -29,30 +29,30 @@ reqwest = { version = "0.11.2", default-features = false, features = ["blocking"
serde = "1.0.122"
serde_derive = "1.0.103"
serde_json = "1.0.56"
solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-cli-config = { path = "../cli-config", version = "=1.7.15" }
solana-cli-output = { path = "../cli-output", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-config-program = { path = "../programs/config", version = "=1.7.15" }
solana-faucet = { path = "../faucet", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-account-decoder = { path = "../account-decoder", version = "=1.7.16" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.16" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-cli-config = { path = "../cli-config", version = "=1.7.16" }
solana-cli-output = { path = "../cli-output", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-config-program = { path = "../programs/config", version = "=1.7.16" }
solana-faucet = { path = "../faucet", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana_rbpf = "=0.2.11"
solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
thiserror = "1.0.21"
tiny-bip39 = "0.8.1"
url = "2.1.1"
[dev-dependencies]
solana-core = { path = "../core", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-core = { path = "../core", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
tempfile = "3.1.0"
[[bin]]

View File

@@ -1721,7 +1721,7 @@ pub fn process_show_stakes(
// Filter by `StakeState::Stake(_, _)`
rpc_filter::RpcFilterType::Memcmp(rpc_filter::Memcmp {
offset: 0,
bytes: rpc_filter::MemcmpEncodedBytes::Binary(
bytes: rpc_filter::MemcmpEncodedBytes::Base58(
bs58::encode([2, 0, 0, 0]).into_string(),
),
encoding: Some(rpc_filter::MemcmpEncoding::Binary),
@@ -1729,7 +1729,7 @@ pub fn process_show_stakes(
// Filter by `Delegation::voter_pubkey`, which begins at byte offset 124
rpc_filter::RpcFilterType::Memcmp(rpc_filter::Memcmp {
offset: 124,
bytes: rpc_filter::MemcmpEncodedBytes::Binary(
bytes: rpc_filter::MemcmpEncodedBytes::Base58(
vote_account_pubkeys[0].to_string(),
),
encoding: Some(rpc_filter::MemcmpEncoding::Binary),

View File

@@ -222,43 +222,63 @@ pub fn process_feature_subcommand(
}
}
fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, f64>, ClientError> {
fn feature_set_stats(rpc_client: &RpcClient) -> Result<HashMap<u32, (f64, f32)>, ClientError> {
// Validator identity -> feature set
let feature_set_map = rpc_client
let feature_sets = rpc_client
.get_cluster_nodes()?
.into_iter()
.map(|contact_info| (contact_info.pubkey, contact_info.feature_set))
.collect::<HashMap<_, _>>();
.map(|contact_info| {
(
contact_info.pubkey,
contact_info.feature_set,
contact_info.rpc.is_some(),
)
})
.collect::<Vec<_>>();
let vote_accounts = rpc_client.get_vote_accounts()?;
let total_active_stake: u64 = vote_accounts
.current
let mut total_active_stake: u64 = vote_accounts
.delinquent
.iter()
.chain(vote_accounts.delinquent.iter())
.map(|vote_account| vote_account.activated_stake)
.sum();
// Sum all active stake by feature set
let mut active_stake_by_feature_set: HashMap<u32, u64> = HashMap::new();
for vote_account in vote_accounts.current {
if let Some(Some(feature_set)) = feature_set_map.get(&vote_account.node_pubkey) {
*active_stake_by_feature_set.entry(*feature_set).or_default() +=
vote_account.activated_stake;
} else {
*active_stake_by_feature_set
.entry(0 /* "unknown" */)
.or_default() += vote_account.activated_stake;
let vote_stakes = vote_accounts
.current
.into_iter()
.map(|vote_account| {
total_active_stake += vote_account.activated_stake;
(vote_account.node_pubkey, vote_account.activated_stake)
})
.collect::<HashMap<_, _>>();
let mut feature_set_stats: HashMap<u32, (u64, u32)> = HashMap::new();
let mut total_rpc_nodes = 0;
for (node_id, feature_set, is_rpc) in feature_sets {
let feature_set = feature_set.unwrap_or(0);
let feature_set_entry = feature_set_stats.entry(feature_set).or_default();
if let Some(vote_stake) = vote_stakes.get(&node_id) {
feature_set_entry.0 += *vote_stake;
}
if is_rpc {
feature_set_entry.1 += 1;
total_rpc_nodes += 1;
}
}
Ok(active_stake_by_feature_set
Ok(feature_set_stats
.into_iter()
.map(|(feature_set, active_stake)| {
(
feature_set,
active_stake as f64 * 100. / total_active_stake as f64,
)
.filter_map(|(feature_set, (active_stake, is_rpc))| {
let active_stake = active_stake as f64 * 100. / total_active_stake as f64;
let is_rpc = is_rpc as f32 * 100. / total_rpc_nodes as f32;
if active_stake >= 0.001 || is_rpc >= 0.001 {
Some((feature_set, (active_stake, is_rpc)))
} else {
None
}
})
.collect())
}
@@ -267,50 +287,93 @@ fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, f6
fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<bool, ClientError> {
let my_feature_set = solana_version::Version::default().feature_set;
let active_stake_by_feature_set = active_stake_by_feature_set(rpc_client)?;
let feature_set_stats = feature_set_stats(rpc_client)?;
let feature_activation_allowed = active_stake_by_feature_set
let (stake_allowed, rpc_allowed) = feature_set_stats
.get(&my_feature_set)
.map(|percentage| *percentage >= 95.)
.unwrap_or(false);
.map(|(stake_percent, rpc_percent)| (*stake_percent >= 95., *rpc_percent >= 95.))
.unwrap_or((false, false));
if !feature_activation_allowed && !quiet {
if active_stake_by_feature_set.get(&my_feature_set).is_none() {
if !stake_allowed && !rpc_allowed && !quiet {
if feature_set_stats.get(&my_feature_set).is_none() {
println!(
"{}",
style("To activate features the tool and cluster feature sets must match, select a tool version that matches the cluster")
.bold());
} else {
println!(
"{}",
style("To activate features the stake must be >= 95%").bold()
);
if !stake_allowed {
print!(
"\n{}",
style("To activate features the stake must be >= 95%")
.bold()
.red()
);
}
if !rpc_allowed {
print!(
"\n{}",
style("To activate features the RPC nodes must be >= 95%")
.bold()
.red()
);
}
}
println!(
"\n\n{}",
style(format!("Tool Feature Set: {}", my_feature_set)).bold()
);
let feature_set_title = "Feature Set";
let stake_percent_title = "Stake";
let rpc_percent_title = "RPC";
let mut stats_output = Vec::new();
let mut max_feature_set_len = feature_set_title.len();
let mut max_stake_percent_len = stake_percent_title.len();
let mut max_rpc_percent_len = rpc_percent_title.len();
for (feature_set, (stake_percent, rpc_percent)) in feature_set_stats.iter() {
let me = *feature_set == my_feature_set;
let feature_set = if *feature_set == 0 {
"unknown".to_string()
} else {
feature_set.to_string()
};
let stake_percent = format!("{:.2}%", stake_percent);
let rpc_percent = format!("{:.2}%", rpc_percent);
max_feature_set_len = max_feature_set_len.max(feature_set.len());
max_stake_percent_len = max_stake_percent_len.max(stake_percent.len());
max_rpc_percent_len = max_rpc_percent_len.max(rpc_percent.len());
stats_output.push((feature_set, stake_percent, rpc_percent, me));
}
println!(
"{}",
style(format!("Tool Feature Set: {}", my_feature_set)).bold()
style(format!(
"{1:<0$} {3:<2$} {5:<4$}",
max_feature_set_len,
feature_set_title,
max_stake_percent_len,
stake_percent_title,
max_rpc_percent_len,
rpc_percent_title,
))
.bold(),
);
println!("{}", style("Cluster Feature Sets and Stakes:").bold());
for (feature_set, percentage) in active_stake_by_feature_set.iter() {
if *feature_set == 0 {
println!(" unknown - {:.2}%", percentage);
} else {
println!(
" {:<10} - {:.2}% {}",
feature_set,
percentage,
if *feature_set == my_feature_set {
" <-- me"
} else {
""
}
);
}
for (feature_set, stake_percent, rpc_percent, me) in stats_output {
println!(
"{1:>0$} {3:>2$} {5:>4$} {6}",
max_feature_set_len,
feature_set,
max_stake_percent_len,
stake_percent,
max_rpc_percent_len,
rpc_percent,
if me { "<-- me" } else { "" },
);
}
println!();
}
Ok(feature_activation_allowed)
Ok(stake_allowed && rpc_allowed)
}
fn status_from_account(account: Account) -> Option<CliFeatureStatus> {

View File

@@ -1146,18 +1146,18 @@ fn get_buffers(
) -> Result<CliUpgradeableBuffers, Box<dyn std::error::Error>> {
let mut filters = vec![RpcFilterType::Memcmp(Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1, 0, 0, 0]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1, 0, 0, 0]).into_string()),
encoding: None,
})];
if let Some(authority_pubkey) = authority_pubkey {
filters.push(RpcFilterType::Memcmp(Memcmp {
offset: ACCOUNT_TYPE_SIZE,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1]).into_string()),
encoding: None,
}));
filters.push(RpcFilterType::Memcmp(Memcmp {
offset: ACCOUNT_TYPE_SIZE + OPTION_SIZE,
bytes: MemcmpEncodedBytes::Binary(
bytes: MemcmpEncodedBytes::Base58(
bs58::encode(authority_pubkey.as_ref()).into_string(),
),
encoding: None,
@@ -1199,18 +1199,18 @@ fn get_programs(
) -> Result<CliUpgradeablePrograms, Box<dyn std::error::Error>> {
let mut filters = vec![RpcFilterType::Memcmp(Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![3, 0, 0, 0]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![3, 0, 0, 0]).into_string()),
encoding: None,
})];
if let Some(authority_pubkey) = authority_pubkey {
filters.push(RpcFilterType::Memcmp(Memcmp {
offset: ACCOUNT_TYPE_SIZE + SLOT_SIZE,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1]).into_string()),
encoding: None,
}));
filters.push(RpcFilterType::Memcmp(Memcmp {
offset: ACCOUNT_TYPE_SIZE + SLOT_SIZE + OPTION_SIZE,
bytes: MemcmpEncodedBytes::Binary(
bytes: MemcmpEncodedBytes::Base58(
bs58::encode(authority_pubkey.as_ref()).into_string(),
),
encoding: None,
@@ -1234,7 +1234,7 @@ fn get_programs(
bytes.extend_from_slice(programdata_address.as_ref());
let filters = vec![RpcFilterType::Memcmp(Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(bytes).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(bytes).into_string()),
encoding: None,
})];

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-client"
version = "1.7.15"
version = "1.7.16"
description = "Solana Client"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -24,14 +24,14 @@ semver = "0.11.0"
serde = "1.0.122"
serde_derive = "1.0.103"
serde_json = "1.0.56"
solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-faucet = { path = "../faucet", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-account-decoder = { path = "../account-decoder", version = "=1.7.16" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-faucet = { path = "../faucet", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tungstenite = "0.10.1"
@@ -40,7 +40,7 @@ url = "2.1.1"
[dev-dependencies]
assert_matches = "1.3.0"
jsonrpc-http-server = "18.0.0"
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,4 +1,9 @@
use thiserror::Error;
#![allow(deprecated)]
use {std::borrow::Cow, thiserror::Error};
const MAX_DATA_SIZE: usize = 128;
const MAX_DATA_BASE58_SIZE: usize = 175;
const MAX_DATA_BASE64_SIZE: usize = 172;
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
@@ -15,15 +20,50 @@ impl RpcFilterType {
let encoding = compare.encoding.as_ref().unwrap_or(&MemcmpEncoding::Binary);
match encoding {
MemcmpEncoding::Binary => {
let MemcmpEncodedBytes::Binary(bytes) = &compare.bytes;
if bytes.len() > 128 {
Err(RpcFilterError::Base58DataTooLarge)
} else {
bs58::decode(&bytes)
.into_vec()
.map(|_| ())
.map_err(|e| e.into())
use MemcmpEncodedBytes::*;
match &compare.bytes {
Binary(bytes) if bytes.len() > MAX_DATA_BASE58_SIZE => {
Err(RpcFilterError::Base58DataTooLarge)
}
Base58(bytes) if bytes.len() > MAX_DATA_BASE58_SIZE => {
Err(RpcFilterError::DataTooLarge)
}
Base64(bytes) if bytes.len() > MAX_DATA_BASE64_SIZE => {
Err(RpcFilterError::DataTooLarge)
}
Bytes(bytes) if bytes.len() > MAX_DATA_SIZE => {
Err(RpcFilterError::DataTooLarge)
}
_ => Ok(()),
}?;
match &compare.bytes {
Binary(bytes) => {
let bytes = bs58::decode(&bytes)
.into_vec()
.map_err(RpcFilterError::DecodeError)?;
if bytes.len() > MAX_DATA_SIZE {
Err(RpcFilterError::Base58DataTooLarge)
} else {
Ok(())
}
}
Base58(bytes) => {
let bytes = bs58::decode(&bytes).into_vec()?;
if bytes.len() > MAX_DATA_SIZE {
Err(RpcFilterError::DataTooLarge)
} else {
Ok(())
}
}
Base64(bytes) => {
let bytes = base64::decode(&bytes)?;
if bytes.len() > MAX_DATA_SIZE {
Err(RpcFilterError::DataTooLarge)
} else {
Ok(())
}
}
Bytes(_) => Ok(()),
}
}
}
@@ -34,10 +74,24 @@ impl RpcFilterType {
#[derive(Error, PartialEq, Debug)]
pub enum RpcFilterError {
#[error("bs58 decode error")]
DecodeError(#[from] bs58::decode::Error),
#[error("encoded binary data should be less than 129 bytes")]
DataTooLarge,
#[deprecated(
since = "1.9.0",
note = "Error for MemcmpEncodedBytes::Binary which is deprecated"
)]
#[error("encoded binary (base 58) data should be less than 129 bytes")]
Base58DataTooLarge,
#[deprecated(
since = "1.9.0",
note = "Error for MemcmpEncodedBytes::Binary which is deprecated"
)]
#[error("bs58 decode error")]
DecodeError(bs58::decode::Error),
#[error("base58 decode error")]
Base58DecodeError(#[from] bs58::decode::Error),
#[error("base64 decode error")]
Base64DecodeError(#[from] base64::DecodeError),
}
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -49,7 +103,14 @@ pub enum MemcmpEncoding {
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", untagged)]
pub enum MemcmpEncodedBytes {
#[deprecated(
since = "1.9.0",
note = "Please use MemcmpEncodedBytes::Base58 instead"
)]
Binary(String),
Base58(String),
Base64(String),
Bytes(Vec<u8>),
}
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -63,14 +124,18 @@ pub struct Memcmp {
}
impl Memcmp {
pub fn bytes_match(&self, data: &[u8]) -> bool {
pub fn bytes(&self) -> Option<Cow<Vec<u8>>> {
use MemcmpEncodedBytes::*;
match &self.bytes {
MemcmpEncodedBytes::Binary(bytes) => {
let bytes = bs58::decode(bytes).into_vec();
if bytes.is_err() {
return false;
}
let bytes = bytes.unwrap();
Binary(bytes) | Base58(bytes) => bs58::decode(bytes).into_vec().ok().map(Cow::Owned),
Base64(bytes) => base64::decode(bytes).ok().map(Cow::Owned),
Bytes(bytes) => Some(Cow::Borrowed(bytes)),
}
}
pub fn bytes_match(&self, data: &[u8]) -> bool {
match self.bytes() {
Some(bytes) => {
if self.offset > data.len() {
return false;
}
@@ -79,6 +144,7 @@ impl Memcmp {
}
data[self.offset..self.offset + bytes.len()] == bytes[..]
}
None => false,
}
}
}
@@ -87,6 +153,15 @@ impl Memcmp {
mod tests {
use super::*;
#[test]
fn test_worst_case_encoded_tx_goldens() {
let ff_data = vec![0xffu8; MAX_DATA_SIZE];
let data58 = bs58::encode(&ff_data).into_string();
assert_eq!(data58.len(), MAX_DATA_BASE58_SIZE);
let data64 = base64::encode(&ff_data);
assert_eq!(data64.len(), MAX_DATA_BASE64_SIZE);
}
#[test]
fn test_bytes_match() {
let data = vec![1, 2, 3, 4, 5];
@@ -94,7 +169,7 @@ mod tests {
// Exact match of data succeeds
assert!(Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1, 2, 3, 4, 5]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1, 2, 3, 4, 5]).into_string()),
encoding: None,
}
.bytes_match(&data));
@@ -102,7 +177,7 @@ mod tests {
// Partial match of data succeeds
assert!(Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![1, 2]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![1, 2]).into_string()),
encoding: None,
}
.bytes_match(&data));
@@ -110,7 +185,7 @@ mod tests {
// Offset partial match of data succeeds
assert!(Memcmp {
offset: 2,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![3, 4]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![3, 4]).into_string()),
encoding: None,
}
.bytes_match(&data));
@@ -118,7 +193,7 @@ mod tests {
// Incorrect partial match of data fails
assert!(!Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![2]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![2]).into_string()),
encoding: None,
}
.bytes_match(&data));
@@ -126,7 +201,7 @@ mod tests {
// Bytes overrun data fails
assert!(!Memcmp {
offset: 2,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![3, 4, 5, 6]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![3, 4, 5, 6]).into_string()),
encoding: None,
}
.bytes_match(&data));
@@ -134,7 +209,7 @@ mod tests {
// Offset outside data fails
assert!(!Memcmp {
offset: 6,
bytes: MemcmpEncodedBytes::Binary(bs58::encode(vec![5]).into_string()),
bytes: MemcmpEncodedBytes::Base58(bs58::encode(vec![5]).into_string()),
encoding: None,
}
.bytes_match(&data));
@@ -142,7 +217,7 @@ mod tests {
// Invalid base-58 fails
assert!(!Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary("III".to_string()),
bytes: MemcmpEncodedBytes::Base58("III".to_string()),
encoding: None,
}
.bytes_match(&data));
@@ -157,7 +232,7 @@ mod tests {
assert_eq!(
RpcFilterType::Memcmp(Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary(base58_bytes.to_string()),
bytes: MemcmpEncodedBytes::Base58(base58_bytes.to_string()),
encoding: None,
})
.verify(),
@@ -172,11 +247,11 @@ mod tests {
assert_eq!(
RpcFilterType::Memcmp(Memcmp {
offset: 0,
bytes: MemcmpEncodedBytes::Binary(base58_bytes.to_string()),
bytes: MemcmpEncodedBytes::Base58(base58_bytes.to_string()),
encoding: None,
})
.verify(),
Err(RpcFilterError::Base58DataTooLarge)
Err(RpcFilterError::DataTooLarge)
);
}
}

View File

@@ -1,7 +1,7 @@
[package]
name = "solana-core"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
homepage = "https://solana.com/"
documentation = "https://docs.rs/solana-core"
readme = "../README.md"
@@ -43,33 +43,33 @@ retain_mut = "0.1.2"
serde = "1.0.122"
serde_bytes = "0.11"
serde_derive = "1.0.103"
solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
solana-banks-server = { path = "../banks-server", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-gossip = { path = "../gossip", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-perf = { path = "../perf", version = "=1.7.15" }
solana-poh = { path = "../poh", version = "=1.7.15" }
solana-program-test = { path = "../program-test", version = "=1.7.15" }
solana-rpc = { path = "../rpc", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.15" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-account-decoder = { path = "../account-decoder", version = "=1.7.16" }
solana-banks-server = { path = "../banks-server", version = "=1.7.16" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-gossip = { path = "../gossip", version = "=1.7.16" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana-perf = { path = "../perf", version = "=1.7.16" }
solana-poh = { path = "../poh", version = "=1.7.16" }
solana-program-test = { path = "../program-test", version = "=1.7.16" }
solana-rpc = { path = "../rpc", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.16" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
spl-token-v2-0 = { package = "spl-token", version = "=3.2.0", features = ["no-entrypoint"] }
tempfile = "3.1.0"
thiserror = "1.0"
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.16" }
trees = "0.2.1"
[dev-dependencies]
@@ -82,8 +82,8 @@ num_cpus = "1.13.0"
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
serde_json = "1.0.56"
serial_test = "0.4.0"
solana-stake-program = { path = "../programs/stake", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-stake-program = { path = "../programs/stake", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
symlink = "0.1.0"
systemstat = "0.1.5"
tokio = { version = "1", features = ["full"] }

View File

@@ -88,6 +88,7 @@ pub struct BankingStageStats {
new_tx_count: AtomicUsize,
dropped_packet_batches_count: AtomicUsize,
dropped_packets_count: AtomicUsize,
dropped_duplicated_packets_count: AtomicUsize,
newly_buffered_packets_count: AtomicUsize,
current_buffered_packets_count: AtomicUsize,
current_buffered_packet_batches_count: AtomicUsize,
@@ -137,6 +138,12 @@ impl BankingStageStats {
self.dropped_packets_count.swap(0, Ordering::Relaxed) as i64,
i64
),
(
"dropped_duplicated_packets_count",
self.dropped_duplicated_packets_count
.swap(0, Ordering::Relaxed) as i64,
i64
),
(
"newly_buffered_packets_count",
self.newly_buffered_packets_count.swap(0, Ordering::Relaxed) as i64,
@@ -1258,8 +1265,8 @@ impl BankingStage {
buffered_packets,
msgs,
packet_indexes,
&mut dropped_packets_count,
&mut dropped_packet_batches_count,
&mut dropped_packets_count,
&mut newly_buffered_packets_count,
batch_limit,
duplicates,
@@ -1353,6 +1360,9 @@ impl BankingStage {
banking_stage_stats
.dropped_packet_batches_count
.fetch_add(dropped_packet_batches_count, Ordering::Relaxed);
banking_stage_stats
.dropped_packets_count
.fetch_add(dropped_packets_count, Ordering::Relaxed);
banking_stage_stats
.newly_buffered_packets_count
.fetch_add(newly_buffered_packets_count, Ordering::Relaxed);
@@ -1379,6 +1389,7 @@ impl BankingStage {
banking_stage_stats: &BankingStageStats,
) {
{
let original_packets_count = packet_indexes.len();
let mut packet_duplicate_check_time = Measure::start("packet_duplicate_check");
let mut duplicates = duplicates.lock().unwrap();
let (cache, hasher) = duplicates.deref_mut();
@@ -1396,6 +1407,12 @@ impl BankingStage {
banking_stage_stats
.packet_duplicate_check_elapsed
.fetch_add(packet_duplicate_check_time.as_us(), Ordering::Relaxed);
banking_stage_stats
.dropped_duplicated_packets_count
.fetch_add(
original_packets_count.saturating_sub(packet_indexes.len()),
Ordering::Relaxed,
);
}
if Self::packet_has_more_unprocessed_transactions(&packet_indexes) {
if unprocessed_packets.len() >= batch_limit {

View File

@@ -63,6 +63,11 @@ impl ReplaySlotStats {
("load_us", self.execute_timings.load_us, i64),
("execute_us", self.execute_timings.execute_us, i64),
("store_us", self.execute_timings.store_us, i64),
(
"update_stakes_cache_us",
self.execute_timings.update_stakes_cache_us,
i64
),
(
"total_batches_len",
self.execute_timings.total_batches_len,

View File

@@ -1,5 +1,6 @@
//! The `validator` module hosts all the validator microservices.
pub use solana_perf::report_target_features;
use {
crate::{
broadcast_stage::BroadcastStageType,
@@ -52,6 +53,7 @@ use {
rpc_pubsub_service::{PubSubConfig, PubSubService},
rpc_service::JsonRpcService,
rpc_subscriptions::RpcSubscriptions,
send_transaction_service,
transaction_status_service::TransactionStatusService,
},
solana_runtime::{
@@ -132,8 +134,7 @@ pub struct ValidatorConfig {
pub contact_debug_interval: u64,
pub contact_save_interval: u64,
pub bpf_jit: bool,
pub send_transaction_retry_ms: u64,
pub send_transaction_leader_forward_count: u64,
pub send_transaction_service_config: send_transaction_service::Config,
pub no_poh_speed_test: bool,
pub poh_pinned_cpu_core: usize,
pub poh_hashes_per_batch: u64,
@@ -190,8 +191,7 @@ impl Default for ValidatorConfig {
contact_debug_interval: DEFAULT_CONTACT_DEBUG_INTERVAL_MILLIS,
contact_save_interval: DEFAULT_CONTACT_SAVE_INTERVAL_MILLIS,
bpf_jit: false,
send_transaction_retry_ms: 2000,
send_transaction_leader_forward_count: 2,
send_transaction_service_config: send_transaction_service::Config::default(),
no_poh_speed_test: true,
poh_pinned_cpu_core: poh_service::DEFAULT_PINNED_CPU_CORE,
poh_hashes_per_batch: poh_service::DEFAULT_HASHES_PER_BATCH,
@@ -548,8 +548,7 @@ impl Validator {
config.trusted_validators.clone(),
rpc_override_health_check.clone(),
optimistically_confirmed_bank.clone(),
config.send_transaction_retry_ms,
config.send_transaction_leader_forward_count,
config.send_transaction_service_config.clone(),
max_slots.clone(),
leader_schedule_cache.clone(),
max_complete_transaction_status_slot,
@@ -1448,76 +1447,6 @@ fn wait_for_supermajority(
Ok(true)
}
fn is_rosetta_emulated() -> bool {
#[cfg(target_os = "macos")]
{
use std::str::FromStr;
std::process::Command::new("sysctl")
.args(&["-in", "sysctl.proc_translated"])
.output()
.map_err(|_| ())
.and_then(|output| String::from_utf8(output.stdout).map_err(|_| ()))
.and_then(|stdout| u8::from_str(stdout.trim()).map_err(|_| ()))
.map(|enabled| enabled == 1)
.unwrap_or(false)
}
#[cfg(not(target_os = "macos"))]
{
false
}
}
pub fn report_target_features() {
warn!(
"CUDA is {}abled",
if solana_perf::perf_libs::api().is_some() {
"en"
} else {
"dis"
}
);
if !is_rosetta_emulated() {
unsafe { check_avx() };
unsafe { check_avx2() };
}
}
// Validator binaries built on a machine with AVX support will generate invalid opcodes
// when run on machines without AVX causing a non-obvious process abort. Instead detect
// the mismatch and error cleanly.
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#[target_feature(enable = "avx")]
unsafe fn check_avx() {
if is_x86_feature_detected!("avx") {
info!("AVX detected");
} else {
error!(
"Incompatible CPU detected: missing AVX support. Please build from source on the target"
);
abort();
}
}
#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
unsafe fn check_avx() {}
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#[target_feature(enable = "avx2")]
unsafe fn check_avx2() {
if is_x86_feature_detected!("avx2") {
info!("AVX2 detected");
} else {
error!(
"Incompatible CPU detected: missing AVX2 support. Please build from source on the target"
);
abort();
}
}
#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
unsafe fn check_avx2() {}
// Get the activated stake percentage (based on the provided bank) that is visible in gossip
fn get_stake_percent_in_gossip(bank: &Bank, cluster_info: &ClusterInfo, log: bool) -> u64 {
let mut online_stake = 0;

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-crate-features"
version = "1.7.15"
version = "1.7.16"
description = "Solana Crate Features"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"

View File

@@ -3039,7 +3039,7 @@ curl http://localhost:8899 -X POST -H "Content-Type: application/json" -d '
Result:
```json
{"jsonrpc":"2.0","result":{"solana-core": "1.7.15"},"id":1}
{"jsonrpc":"2.0","result":{"solana-core": "1.7.16"},"id":1}
```
### getVoteAccounts
@@ -4151,7 +4151,7 @@ Response:
### getConfirmedBlock
**DEPRECATED: Please use [getBlock](jsonrpc-api.md#getblock) instead**
This method is expected to be removed in solana-core v1.8
This method is expected to be removed in solana-core v2.0
Returns identity and transaction information about a confirmed block in the ledger
@@ -4345,7 +4345,7 @@ For more details on returned data:
### getConfirmedBlocks
**DEPRECATED: Please use [getBlocks](jsonrpc-api.md#getblocks) instead**
This method is expected to be removed in solana-core v1.8
This method is expected to be removed in solana-core v2.0
Returns a list of confirmed blocks between two slots
@@ -4379,7 +4379,7 @@ Result:
### getConfirmedBlocksWithLimit
**DEPRECATED: Please use [getBlocksWithLimit](jsonrpc-api.md#getblockswithlimit) instead**
This method is expected to be removed in solana-core v1.8
This method is expected to be removed in solana-core v2.0
Returns a list of confirmed blocks starting at the given slot
@@ -4411,7 +4411,7 @@ Result:
### getConfirmedSignaturesForAddress2
**DEPRECATED: Please use [getSignaturesForAddress](jsonrpc-api.md#getsignaturesforaddress) instead**
This method is expected to be removed in solana-core v1.8
This method is expected to be removed in solana-core v2.0
Returns confirmed signatures for transactions involving an
address backwards in time from the provided signature or most recent confirmed block
@@ -4473,7 +4473,7 @@ Result:
### getConfirmedTransaction
**DEPRECATED: Please use [getTransaction](jsonrpc-api.md#gettransaction) instead**
This method is expected to be removed in solana-core v1.8
This method is expected to be removed in solana-core v2.0
Returns transaction details for a confirmed transaction

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-dos"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -14,18 +14,18 @@ clap = "2.33.1"
log = "0.4.11"
rand = "0.7.0"
rayon = "1.5.0"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-core = { path = "../core", version = "=1.7.15" }
solana-gossip = { path = "../gossip", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-perf = { path = "../perf", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-core = { path = "../core", version = "=1.7.16" }
solana-gossip = { path = "../gossip", version = "=1.7.16" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana-perf = { path = "../perf", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-download-utils"
version = "1.7.15"
version = "1.7.16"
description = "Solana Download Utils"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -15,8 +15,8 @@ console = "0.14.1"
indicatif = "0.15.0"
log = "0.4.11"
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
tar = "0.4.37"
[lib]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-faucet"
version = "1.7.15"
version = "1.7.16"
description = "Solana Faucet"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -16,12 +16,12 @@ clap = "2.33"
log = "0.4.11"
serde = "1.0.122"
serde_derive = "1.0.103"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-cli-config = { path = "../cli-config", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-cli-config = { path = "../cli-config", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-frozen-abi"
version = "1.7.15"
version = "1.7.16"
description = "Solana Frozen ABI"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -16,11 +16,11 @@ log = "0.4.11"
serde = "1.0.122"
serde_derive = "1.0.103"
sha2 = "0.9.2"
solana-frozen-abi-macro = { path = "macro", version = "=1.7.15" }
solana-frozen-abi-macro = { path = "macro", version = "=1.7.16" }
thiserror = "1.0"
[target.'cfg(not(target_arch = "bpf"))'.dependencies]
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.16" }
generic-array = { version = "0.14.3", default-features = false, features = ["serde", "more_lengths"]}
memmap2 = "0.1.0"

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-frozen-abi-macro"
version = "1.7.15"
version = "1.7.16"
description = "Solana Frozen ABI Macro"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-genesis-utils"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-download-utils = { path = "../download-utils", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-download-utils = { path = "../download-utils", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
[lib]
crate-type = ["lib"]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-genesis"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -16,16 +16,16 @@ chrono = "0.4"
serde = "1.0.122"
serde_json = "1.0.56"
serde_yaml = "0.8.13"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-cli-config = { path = "../cli-config", version = "=1.7.15" }
solana-exchange-program = { path = "../programs/exchange", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-stake-program = { path = "../programs/stake", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-cli-config = { path = "../cli-config", version = "=1.7.16" }
solana-exchange-program = { path = "../programs/exchange", version = "=1.7.16" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-stake-program = { path = "../programs/stake", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
tempfile = "3.1.0"
[[bin]]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-gossip"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -26,22 +26,22 @@ rayon = "1.5.0"
serde = "1.0.122"
serde_bytes = "0.11"
serde_derive = "1.0.103"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.15" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-net-utils = { path = "../net-utils", version = "=1.7.15" }
solana-perf = { path = "../perf", version = "=1.7.15" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.16" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.16" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
solana-net-utils = { path = "../net-utils", version = "=1.7.16" }
solana-perf = { path = "../perf", version = "=1.7.16" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
thiserror = "1.0"
[dev-dependencies]

View File

@@ -163,11 +163,12 @@ pub(crate) fn submit_gossip_stats(
gossip: &RwLock<CrdsGossip>,
stakes: &HashMap<Pubkey, u64>,
) {
let (table_size, num_nodes, purged_values_size, failed_inserts_size) = {
let (table_size, num_nodes, num_pubkeys, purged_values_size, failed_inserts_size) = {
let gossip = gossip.read().unwrap();
(
gossip.crds.len(),
gossip.crds.num_nodes(),
gossip.crds.num_pubkeys(),
gossip.crds.num_purged(),
gossip.pull.failed_inserts.len(),
)
@@ -192,6 +193,7 @@ pub(crate) fn submit_gossip_stats(
("failed_inserts_size", failed_inserts_size as i64, i64),
("num_nodes", num_nodes as i64, i64),
("num_nodes_staked", num_nodes_staked as i64, i64),
("num_pubkeys", num_pubkeys, i64),
);
datapoint_info!(
"cluster_info_stats2",

View File

@@ -319,8 +319,13 @@ impl Crds {
.map(move |i| self.table.index(*i))
}
/// Returns number of known pubkeys (network size).
/// Returns number of known contact-infos (network size).
pub(crate) fn num_nodes(&self) -> usize {
self.nodes.len()
}
/// Returns number of unique pubkeys.
pub(crate) fn num_pubkeys(&self) -> usize {
self.records.len()
}

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-install"
description = "The solana cluster software installer"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -16,21 +16,21 @@ bzip2 = "0.3.3"
chrono = { version = "0.4.11", features = ["serde"] }
clap = { version = "2.33.1" }
console = "0.14.1"
ctrlc = { version = "3.1.5", features = ["termination"] }
ctrlc = { version = "3.1.9", features = ["termination"] }
dirs-next = "2.0.0"
indicatif = "0.15.0"
lazy_static = "1.4.0"
nix = "0.19.0"
nix = "0.20.0"
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
serde = { version = "1.0.122", features = ["derive"] }
serde_json = "1.0.62"
serde_yaml = "0.8.13"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-config-program = { path = "../programs/config", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-config-program = { path = "../programs/config", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
semver = "0.9.0"
tar = "0.4.37"
tempfile = "3.1.0"

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-keygen"
version = "1.7.15"
version = "1.7.16"
description = "Solana key generation utility"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -14,11 +14,11 @@ bs58 = "0.3.1"
clap = "2.33"
dirs-next = "2.0.0"
num_cpus = "1.13.0"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-cli-config = { path = "../cli-config", version = "=1.7.15" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-cli-config = { path = "../cli-config", version = "=1.7.16" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
tiny-bip39 = "0.8.1"
[[bin]]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-ledger-tool"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -24,18 +24,18 @@ regex = "1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.56"
serde_yaml = "0.8.13"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-cli-output = { path = "../cli-output", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-stake-program = { path = "../programs/stake", version = "=1.7.15" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.15" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-cli-output = { path = "../cli-output", version = "=1.7.16" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-stake-program = { path = "../programs/stake", version = "=1.7.16" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.16" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
tempfile = "3.1.0"
tokio = { version = "1", features = ["full"] }

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-ledger"
version = "1.7.15"
version = "1.7.16"
description = "Solana ledger"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -33,21 +33,21 @@ rayon = "1.5.0"
serde = "1.0.122"
serde_bytes = "0.11.5"
sha2 = "0.9.2"
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.15" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.15" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.15" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-perf = { path = "../perf", version = "=1.7.15" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.15" }
solana-storage-proto = { path = "../storage-proto", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.16" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.7.16" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.7.16" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-merkle-tree = { path = "../merkle-tree", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
solana-perf = { path = "../perf", version = "=1.7.16" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.16" }
solana-storage-proto = { path = "../storage-proto", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
tempfile = "3.1.0"
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
@@ -72,7 +72,7 @@ features = ["lz4"]
[dev-dependencies]
assert_matches = "1.3.0"
matches = "0.1.6"
solana-account-decoder = { path = "../account-decoder", version = "=1.7.15" }
solana-account-decoder = { path = "../account-decoder", version = "=1.7.16" }
[build-dependencies]
rustc_version = "0.2"

View File

@@ -8387,6 +8387,7 @@ pub mod tests {
amount: "11".to_string(),
ui_amount_string: "1.1".to_string(),
},
owner: Pubkey::new_unique().to_string(),
}]),
post_token_balances: Some(vec![TransactionTokenBalance {
account_index: 0,
@@ -8397,6 +8398,7 @@ pub mod tests {
amount: "11".to_string(),
ui_amount_string: "1.1".to_string(),
},
owner: Pubkey::new_unique().to_string(),
}]),
rewards: Some(vec![Reward {
pubkey: "My11111111111111111111111111111111111111111".to_string(),

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-local-cluster"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -17,22 +17,22 @@ fs_extra = "1.2.0"
log = "0.4.11"
rand = "0.7.0"
rayon = "1.5.0"
solana-config-program = { path = "../programs/config", version = "=1.7.15" }
solana-core = { path = "../core", version = "=1.7.15" }
solana-client = { path = "../client", version = "=1.7.15" }
solana-download-utils = { path = "../download-utils", version = "=1.7.15" }
solana-exchange-program = { path = "../programs/exchange", version = "=1.7.15" }
solana-faucet = { path = "../faucet", version = "=1.7.15" }
solana-gossip = { path = "../gossip", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
solana-rpc = { path = "../rpc", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-stake-program = { path = "../programs/stake", version = "=1.7.15" }
solana-streamer = { path = "../streamer", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-config-program = { path = "../programs/config", version = "=1.7.16" }
solana-core = { path = "../core", version = "=1.7.16" }
solana-client = { path = "../client", version = "=1.7.16" }
solana-download-utils = { path = "../download-utils", version = "=1.7.16" }
solana-exchange-program = { path = "../programs/exchange", version = "=1.7.16" }
solana-faucet = { path = "../faucet", version = "=1.7.16" }
solana-gossip = { path = "../gossip", version = "=1.7.16" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.16" }
solana-rpc = { path = "../rpc", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-stake-program = { path = "../programs/stake", version = "=1.7.16" }
solana-streamer = { path = "../streamer", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
tempfile = "3.1.0"
[dev-dependencies]

View File

@@ -42,8 +42,7 @@ pub fn safe_clone_config(config: &ValidatorConfig) -> ValidatorConfig {
contact_debug_interval: config.contact_debug_interval,
contact_save_interval: config.contact_save_interval,
bpf_jit: config.bpf_jit,
send_transaction_retry_ms: config.send_transaction_retry_ms,
send_transaction_leader_forward_count: config.send_transaction_leader_forward_count,
send_transaction_service_config: config.send_transaction_service_config.clone(),
no_poh_speed_test: config.no_poh_speed_test,
poh_pinned_cpu_core: config.poh_pinned_cpu_core,
account_indexes: config.account_indexes.clone(),

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018"
name = "solana-log-analyzer"
description = "The solana cluster network analysis tool"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -14,9 +14,9 @@ byte-unit = "4.0.9"
clap = "2.33.1"
serde = "1.0.122"
serde_json = "1.0.56"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
[[bin]]
name = "solana-log-analyzer"

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-logger"
version = "1.7.15"
version = "1.7.16"
description = "Solana Logger"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"

View File

@@ -1,7 +1,7 @@
[package]
name = "solana-measure"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
homepage = "https://solana.com/"
documentation = "https://docs.rs/solana-measure"
readme = "../README.md"
@@ -12,8 +12,8 @@ edition = "2018"
[dependencies]
log = "0.4.11"
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-merkle-root-bench"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -10,11 +10,11 @@ publish = false
[dependencies]
log = "0.4.11"
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
clap = "2.33.1"
[package.metadata.docs.rs]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-merkle-tree"
version = "1.7.15"
version = "1.7.16"
description = "Solana Merkle Tree"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-merkle-tree"
edition = "2018"
[dependencies]
solana-program = { path = "../sdk/program", version = "=1.7.15" }
solana-program = { path = "../sdk/program", version = "=1.7.16" }
fast-math = "0.1"
# This can go once the BPF toolchain target Rust 1.42.0+

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-metrics"
version = "1.7.15"
version = "1.7.16"
description = "Solana Metrics"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -15,7 +15,7 @@ gethostname = "0.2.1"
lazy_static = "1.4.0"
log = "0.4.11"
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
[dev-dependencies]
rand = "0.7.0"

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-net-shaper"
description = "The solana cluster network shaping tool"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -13,8 +13,8 @@ publish = false
clap = "2.33.1"
serde = "1.0.122"
serde_json = "1.0.56"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
rand = "0.7.0"
[[bin]]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-net-utils"
version = "1.7.15"
version = "1.7.16"
description = "Solana Network Utilities"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -13,15 +13,15 @@ edition = "2018"
bincode = "1.3.1"
clap = "2.33.1"
log = "0.4.11"
nix = "0.19.0"
nix = "0.20.0"
rand = "0.7.0"
serde = "1.0.122"
serde_derive = "1.0.103"
socket2 = "0.3.17"
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
tokio = { version = "1", features = ["full"] }
url = "2.1.1"

View File

@@ -106,6 +106,8 @@ Operate a configured testnet
- Override the number of slots in an epoch
--warp-slot WARP_SLOT
- Boot from a snapshot that has warped ahead to WARP_SLOT rather than a slot 0 genesis.
--full-rpc
- Support full RPC services on all nodes
sanity/start-specific options:
-F - Discard validator nodes that didn't bootup successfully
-o noInstallCheck - Skip solana-install sanity
@@ -312,6 +314,7 @@ startBootstrapLeader() {
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
\"$gpuMode\" \
\"$maybeWarpSlot\" \
\"$maybeFullRpc\" \
\"$waitForNodeInit\" \
\"$extraPrimordialStakes\" \
\"$TMPFS_ACCOUNTS\" \
@@ -384,6 +387,7 @@ startNode() {
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
\"$gpuMode\" \
\"$maybeWarpSlot\" \
\"$maybeFullRpc\" \
\"$waitForNodeInit\" \
\"$extraPrimordialStakes\" \
\"$TMPFS_ACCOUNTS\" \
@@ -795,6 +799,7 @@ netemCommand="add"
clientDelayStart=0
netLogDir=
maybeWarpSlot=
maybeFullRpc=false
waitForNodeInit=true
extraPrimordialStakes=0
@@ -903,6 +908,9 @@ while [[ -n $1 ]]; do
elif [[ $1 == --warp-slot ]]; then
maybeWarpSlot="$1 $2"
shift 2
elif [[ $1 == --full-rpc ]]; then
maybeFullRpc=true
shift 1
elif [[ $1 == --async-node-init ]]; then
waitForNodeInit=false
shift 1

View File

@@ -26,9 +26,10 @@ genesisOptions="${17}"
extraNodeArgs="${18}"
gpuMode="${19:-auto}"
maybeWarpSlot="${20}"
waitForNodeInit="${21}"
extraPrimordialStakes="${22:=0}"
tmpfsAccounts="${23:false}"
maybeFullRpc="${21}"
waitForNodeInit="${22}"
extraPrimordialStakes="${23:=0}"
tmpfsAccounts="${24:false}"
set +x
missing() {
@@ -286,6 +287,11 @@ EOF
args+=(--accounts /mnt/solana-accounts)
fi
if $maybeFullRpc; then
args+=(--enable-rpc-transaction-history)
args+=(--enable-cpi-and-log-storage)
fi
if [[ $airdropsEnabled = true ]]; then
cat >> ~/solana/on-reboot <<EOF
./multinode-demo/faucet.sh > faucet.log 2>&1 &
@@ -409,6 +415,11 @@ EOF
args+=(--accounts /mnt/solana-accounts)
fi
if $maybeFullRpc; then
args+=(--enable-rpc-transaction-history)
args+=(--enable-cpi-and-log-storage)
fi
cat >> ~/solana/on-reboot <<EOF
$maybeSkipAccountsCreation
nohup multinode-demo/validator.sh ${args[@]} > validator.log.\$now 2>&1 &

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-notifier"
version = "1.7.15"
version = "1.7.16"
description = "Solana Notifier"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-perf"
version = "1.7.15"
version = "1.7.16"
description = "Solana Performance APIs"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -19,11 +19,11 @@ log = "0.4.11"
rand = "0.7.0"
rayon = "1.5.0"
serde = "1.0.126"
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
[lib]
name = "solana_perf"

11
perf/build.rs Normal file
View File

@@ -0,0 +1,11 @@
fn main() {
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
{
if is_x86_feature_detected!("avx") {
println!("cargo:rustc-cfg=build_target_feature_avx");
}
if is_x86_feature_detected!("avx2") {
println!("cargo:rustc-cfg=build_target_feature_avx2");
}
}
}

View File

@@ -19,3 +19,62 @@ extern crate matches;
#[macro_use]
extern crate solana_metrics;
fn is_rosetta_emulated() -> bool {
#[cfg(target_os = "macos")]
{
use std::str::FromStr;
std::process::Command::new("sysctl")
.args(&["-in", "sysctl.proc_translated"])
.output()
.map_err(|_| ())
.and_then(|output| String::from_utf8(output.stdout).map_err(|_| ()))
.and_then(|stdout| u8::from_str(stdout.trim()).map_err(|_| ()))
.map(|enabled| enabled == 1)
.unwrap_or(false)
}
#[cfg(not(target_os = "macos"))]
{
false
}
}
pub fn report_target_features() {
warn!(
"CUDA is {}abled",
if crate::perf_libs::api().is_some() {
"en"
} else {
"dis"
}
);
// Validator binaries built on a machine with AVX support will generate invalid opcodes
// when run on machines without AVX causing a non-obvious process abort. Instead detect
// the mismatch and error cleanly.
if !is_rosetta_emulated() {
#[cfg(build_target_feature_avx)]
{
if is_x86_feature_detected!("avx") {
info!("AVX detected");
} else {
error!(
"Incompatible CPU detected: missing AVX support. Please build from source on the target"
);
std::process::abort();
}
}
#[cfg(build_target_feature_avx2)]
{
if is_x86_feature_detected!("avx2") {
info!("AVX2 detected");
} else {
error!(
"Incompatible CPU detected: missing AVX2 support. Please build from source on the target"
);
std::process::abort();
}
}
}
}

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2018"
name = "solana-poh-bench"
version = "1.7.15"
version = "1.7.16"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -13,13 +13,13 @@ clap = "2.33.1"
log = "0.4.11"
rand = "0.7.0"
rayon = "1.5.0"
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-version = { path = "../version", version = "=1.7.15" }
solana-perf = { path = "../perf", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-clap-utils = { path = "../clap-utils", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-version = { path = "../version", version = "=1.7.16" }
solana-perf = { path = "../perf", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-poh"
version = "1.7.15"
version = "1.7.16"
description = "Solana PoH"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -13,20 +13,20 @@ edition = "2018"
core_affinity = "0.5.10"
crossbeam-channel = "0.4"
log = "0.4.11"
solana-ledger = { path = "../ledger", version = "=1.7.15" }
solana-measure = { path = "../measure", version = "=1.7.15" }
solana-metrics = { path = "../metrics", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-sys-tuner = { path = "../sys-tuner", version = "=1.7.15" }
solana-ledger = { path = "../ledger", version = "=1.7.16" }
solana-measure = { path = "../measure", version = "=1.7.16" }
solana-metrics = { path = "../metrics", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-sys-tuner = { path = "../sys-tuner", version = "=1.7.16" }
thiserror = "1.0"
[dev-dependencies]
bincode = "1.3.1"
matches = "0.1.6"
rand = "0.7.0"
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-perf = { path = "../perf", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-perf = { path = "../perf", version = "=1.7.16" }
[lib]
crate-type = ["lib"]

View File

@@ -5,7 +5,7 @@ edition = "2018"
license = "Apache-2.0"
name = "solana-program-test"
repository = "https://github.com/solana-labs/solana"
version = "1.7.15"
version = "1.7.16"
[dependencies]
async-trait = "0.1.42"
@@ -17,13 +17,13 @@ log = "0.4.11"
mio = "0.7.6"
serde = "1.0.112"
serde_derive = "1.0.103"
solana-banks-client = { path = "../banks-client", version = "=1.7.15" }
solana-banks-server = { path = "../banks-server", version = "=1.7.15" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.15" }
solana-logger = { path = "../logger", version = "=1.7.15" }
solana-runtime = { path = "../runtime", version = "=1.7.15" }
solana-sdk = { path = "../sdk", version = "=1.7.15" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.15" }
solana-banks-client = { path = "../banks-client", version = "=1.7.16" }
solana-banks-server = { path = "../banks-server", version = "=1.7.16" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.16" }
solana-logger = { path = "../logger", version = "=1.7.16" }
solana-runtime = { path = "../runtime", version = "=1.7.16" }
solana-sdk = { path = "../sdk", version = "=1.7.16" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.16" }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }

284
programs/bpf/Cargo.lock generated
View File

@@ -1443,9 +1443,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.98"
version = "0.2.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6"
[[package]]
name = "libloading"
@@ -1566,9 +1566,9 @@ dependencies = [
[[package]]
name = "memoffset"
version = "0.6.1"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
dependencies = [
"autocfg",
]
@@ -1654,14 +1654,15 @@ dependencies = [
[[package]]
name = "nix"
version = "0.19.1"
version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945"
dependencies = [
"bitflags",
"cc",
"cfg-if 1.0.0",
"libc",
"memoffset",
]
[[package]]
@@ -2612,7 +2613,7 @@ dependencies = [
[[package]]
name = "solana-account-decoder"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"Inflector",
"base64 0.12.3",
@@ -2633,7 +2634,7 @@ dependencies = [
[[package]]
name = "solana-banks-client"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"borsh",
@@ -2641,7 +2642,7 @@ dependencies = [
"futures",
"mio",
"solana-banks-interface",
"solana-program 1.7.15",
"solana-program 1.7.16",
"solana-sdk",
"tarpc",
"tokio",
@@ -2650,7 +2651,7 @@ dependencies = [
[[package]]
name = "solana-banks-interface"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"mio",
"serde",
@@ -2660,7 +2661,7 @@ dependencies = [
[[package]]
name = "solana-banks-server"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"futures",
@@ -2678,7 +2679,7 @@ dependencies = [
[[package]]
name = "solana-bpf-loader-program"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"byteorder 1.3.4",
@@ -2697,7 +2698,7 @@ dependencies = [
[[package]]
name = "solana-bpf-programs"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"byteorder 1.3.4",
@@ -2709,7 +2710,7 @@ dependencies = [
"solana-account-decoder",
"solana-bpf-loader-program",
"solana-cli-output",
"solana-logger 1.7.15",
"solana-logger 1.7.16",
"solana-measure",
"solana-runtime",
"solana-sdk",
@@ -2720,288 +2721,288 @@ dependencies = [
[[package]]
name = "solana-bpf-rust-128bit"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-bpf-rust-128bit-dep",
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-128bit-dep"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-alloc"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-call-depth"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-caller-access"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-custom-heap"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-dep-crate"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"byteorder 1.3.4",
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-deprecated-loader"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-dup-accounts"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-error-handling"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"num-derive 0.2.5",
"num-traits",
"solana-program 1.7.15",
"solana-program 1.7.16",
"thiserror",
]
[[package]]
name = "solana-bpf-rust-external-spend"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-finalize"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-instruction-introspection"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-invoke"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-bpf-rust-invoked",
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-invoke-and-error"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-invoke-and-ok"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-invoke-and-return"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-invoked"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-iter"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-many-args"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-bpf-rust-many-args-dep",
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-many-args-dep"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-mem"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
"solana-program-test",
"solana-sdk",
]
[[package]]
name = "solana-bpf-rust-membuiltins"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-bpf-rust-mem",
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-noop"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-panic"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-param-passing"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-bpf-rust-param-passing-dep",
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-param-passing-dep"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-rand"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"getrandom 0.1.14",
"rand 0.7.3",
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-ro-account_modify"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-ro-modify"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-sanity"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-secp256k1-recover"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-sha"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-spoof1"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-spoof1-system"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-sysvar"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
"solana-program-test",
"solana-sdk",
]
[[package]]
name = "solana-bpf-rust-upgradeable"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-bpf-rust-upgraded"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-program 1.7.15",
"solana-program 1.7.16",
]
[[package]]
name = "solana-clap-utils"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"chrono",
"clap",
@@ -3016,7 +3017,7 @@ dependencies = [
[[package]]
name = "solana-cli-config"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"dirs-next",
"lazy_static",
@@ -3028,7 +3029,7 @@ dependencies = [
[[package]]
name = "solana-cli-output"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"Inflector",
"base64 0.13.0",
@@ -3051,7 +3052,7 @@ dependencies = [
[[package]]
name = "solana-client"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"base64 0.13.0",
"bincode",
@@ -3083,7 +3084,7 @@ dependencies = [
[[package]]
name = "solana-config-program"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"chrono",
@@ -3096,7 +3097,7 @@ dependencies = [
[[package]]
name = "solana-crate-features"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"backtrace",
"bytes 0.4.12",
@@ -3118,7 +3119,7 @@ dependencies = [
[[package]]
name = "solana-faucet"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"byteorder 1.3.4",
@@ -3128,7 +3129,7 @@ dependencies = [
"serde_derive",
"solana-clap-utils",
"solana-cli-config",
"solana-logger 1.7.15",
"solana-logger 1.7.16",
"solana-metrics",
"solana-sdk",
"solana-version",
@@ -3159,7 +3160,7 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bs58",
"bv",
@@ -3170,8 +3171,8 @@ dependencies = [
"serde",
"serde_derive",
"sha2",
"solana-frozen-abi-macro 1.7.15",
"solana-logger 1.7.15",
"solana-frozen-abi-macro 1.7.16",
"solana-logger 1.7.16",
"thiserror",
]
@@ -3189,7 +3190,7 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.6",
@@ -3210,7 +3211,7 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"env_logger",
"lazy_static",
@@ -3219,7 +3220,7 @@ dependencies = [
[[package]]
name = "solana-measure"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"log",
"solana-metrics",
@@ -3228,7 +3229,7 @@ dependencies = [
[[package]]
name = "solana-metrics"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"env_logger",
"gethostname",
@@ -3240,7 +3241,7 @@ dependencies = [
[[package]]
name = "solana-net-utils"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"clap",
@@ -3251,7 +3252,7 @@ dependencies = [
"serde_derive",
"socket2 0.3.17",
"solana-clap-utils",
"solana-logger 1.7.15",
"solana-logger 1.7.16",
"solana-sdk",
"solana-version",
"tokio",
@@ -3295,7 +3296,7 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"blake3",
@@ -3320,16 +3321,16 @@ dependencies = [
"serde_derive",
"sha2",
"sha3",
"solana-frozen-abi 1.7.15",
"solana-frozen-abi-macro 1.7.15",
"solana-logger 1.7.15",
"solana-sdk-macro 1.7.15",
"solana-frozen-abi 1.7.16",
"solana-frozen-abi-macro 1.7.16",
"solana-logger 1.7.16",
"solana-sdk-macro 1.7.16",
"thiserror",
]
[[package]]
name = "solana-program-test"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"async-trait",
"base64 0.12.3",
@@ -3343,7 +3344,7 @@ dependencies = [
"solana-banks-client",
"solana-banks-server",
"solana-bpf-loader-program",
"solana-logger 1.7.15",
"solana-logger 1.7.16",
"solana-runtime",
"solana-sdk",
"solana-vote-program",
@@ -3353,7 +3354,7 @@ dependencies = [
[[package]]
name = "solana-rayon-threadlimit"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"lazy_static",
"num_cpus",
@@ -3361,7 +3362,7 @@ dependencies = [
[[package]]
name = "solana-remote-wallet"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"base32",
"console 0.14.1",
@@ -3380,7 +3381,7 @@ dependencies = [
[[package]]
name = "solana-runtime"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"arrayref",
"bincode",
@@ -3410,9 +3411,9 @@ dependencies = [
"serde",
"serde_derive",
"solana-config-program",
"solana-frozen-abi 1.7.15",
"solana-frozen-abi-macro 1.7.15",
"solana-logger 1.7.15",
"solana-frozen-abi 1.7.16",
"solana-frozen-abi-macro 1.7.16",
"solana-logger 1.7.16",
"solana-measure",
"solana-metrics",
"solana-rayon-threadlimit",
@@ -3429,7 +3430,7 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"assert_matches",
"bincode",
@@ -3465,11 +3466,11 @@ dependencies = [
"sha2",
"sha3",
"solana-crate-features",
"solana-frozen-abi 1.7.15",
"solana-frozen-abi-macro 1.7.15",
"solana-logger 1.7.15",
"solana-program 1.7.15",
"solana-sdk-macro 1.7.15",
"solana-frozen-abi 1.7.16",
"solana-frozen-abi-macro 1.7.16",
"solana-logger 1.7.16",
"solana-program 1.7.16",
"solana-sdk-macro 1.7.16",
"thiserror",
"uriparse",
]
@@ -3489,7 +3490,7 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bs58",
"proc-macro2 1.0.24",
@@ -3500,14 +3501,14 @@ dependencies = [
[[package]]
name = "solana-secp256k1-program"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"solana-sdk",
]
[[package]]
name = "solana-stake-program"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"log",
@@ -3517,8 +3518,8 @@ dependencies = [
"serde",
"serde_derive",
"solana-config-program",
"solana-frozen-abi 1.7.15",
"solana-frozen-abi-macro 1.7.15",
"solana-frozen-abi 1.7.16",
"solana-frozen-abi-macro 1.7.16",
"solana-metrics",
"solana-sdk",
"solana-vote-program",
@@ -3527,17 +3528,20 @@ dependencies = [
[[package]]
name = "solana-transaction-status"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"Inflector",
"base64 0.12.3",
"bincode",
"bs58",
"lazy_static",
"log",
"serde",
"serde_derive",
"serde_json",
"solana-account-decoder",
"solana-measure",
"solana-metrics",
"solana-runtime",
"solana-sdk",
"solana-vote-program",
@@ -3549,21 +3553,21 @@ dependencies = [
[[package]]
name = "solana-version"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"log",
"rustc_version",
"serde",
"serde_derive",
"solana-frozen-abi 1.7.15",
"solana-frozen-abi-macro 1.7.15",
"solana-logger 1.7.15",
"solana-frozen-abi 1.7.16",
"solana-frozen-abi-macro 1.7.16",
"solana-logger 1.7.16",
"solana-sdk",
]
[[package]]
name = "solana-vote-program"
version = "1.7.15"
version = "1.7.16"
dependencies = [
"bincode",
"log",
@@ -3572,9 +3576,9 @@ dependencies = [
"rustc_version",
"serde",
"serde_derive",
"solana-frozen-abi 1.7.15",
"solana-frozen-abi-macro 1.7.15",
"solana-logger 1.7.15",
"solana-frozen-abi 1.7.16",
"solana-frozen-abi-macro 1.7.16",
"solana-logger 1.7.16",
"solana-metrics",
"solana-sdk",
"thiserror",

View File

@@ -1,7 +1,7 @@
[package]
name = "solana-bpf-programs"
description = "Blockchain, Rebuilt for Scale"
version = "1.7.15"
version = "1.7.16"
documentation = "https://docs.rs/solana"
homepage = "https://solana.com/"
readme = "README.md"
@@ -26,15 +26,15 @@ itertools = "0.10.0"
log = "0.4.11"
miow = "0.2.2"
net2 = "0.2.37"
solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.7.15" }
solana-cli-output = { path = "../../cli-output", version = "=1.7.15" }
solana-logger = { path = "../../logger", version = "=1.7.15" }
solana-measure = { path = "../../measure", version = "=1.7.15" }
solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.7.16" }
solana-cli-output = { path = "../../cli-output", version = "=1.7.16" }
solana-logger = { path = "../../logger", version = "=1.7.16" }
solana-measure = { path = "../../measure", version = "=1.7.16" }
solana_rbpf = "=0.2.11"
solana-runtime = { path = "../../runtime", version = "=1.7.15" }
solana-sdk = { path = "../../sdk", version = "=1.7.15" }
solana-transaction-status = { path = "../../transaction-status", version = "=1.7.15" }
solana-account-decoder = { path = "../../account-decoder", version = "=1.7.15" }
solana-runtime = { path = "../../runtime", version = "=1.7.16" }
solana-sdk = { path = "../../sdk", version = "=1.7.16" }
solana-transaction-status = { path = "../../transaction-status", version = "=1.7.16" }
solana-account-decoder = { path = "../../account-decoder", version = "=1.7.16" }
[[bench]]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-128bit"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-128bit-dep"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-alloc"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-call-depth"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-caller-access"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-custom-heap"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[features]
default = ["custom-heap"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-dep-crate"
version = "1.7.15"
version = "1.7.16"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2018"
[dependencies]
byteorder = { version = "1", default-features = false }
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-deprecated-loader"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-dup-accounts"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-error-handling"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
num-derive = "0.2"
num-traits = "0.2"
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
thiserror = "1.0"
[lib]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-external-spend"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-finalize"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-instruction-introspection"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-invoke"
version = "1.7.15"
version = "1.7.16"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2018"
[dependencies]
solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-invoke-and-error"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-invoke-and-ok"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-invoke-and-return"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-invoked"
version = "1.7.15"
version = "1.7.16"
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-invoked"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[features]
default = ["program"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-iter"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-many-args"
version = "1.7.15"
version = "1.7.16"
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-many-args"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-many-args-dep"
version = "1.7.15"
version = "1.7.16"
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-many-args-dep"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-mem"
version = "1.7.15"
version = "1.7.16"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -13,11 +13,11 @@ edition = "2018"
no-entrypoint = []
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[dev-dependencies]
solana-program-test = { path = "../../../../program-test", version = "=1.7.15" }
solana-sdk = { path = "../../../../sdk", version = "=1.7.15" }
solana-program-test = { path = "../../../../program-test", version = "=1.7.16" }
solana-sdk = { path = "../../../../sdk", version = "=1.7.16" }
[lib]
crate-type = ["cdylib", "lib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-membuiltins"
version = "1.7.15"
version = "1.7.16"
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-mem"
edition = "2018"
[dependencies]
solana-bpf-rust-mem = { path = "../mem", version = "=1.7.15", features = [ "no-entrypoint" ] }
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-bpf-rust-mem = { path = "../mem", version = "=1.7.16", features = [ "no-entrypoint" ] }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-noop"
version = "1.7.15"
version = "1.7.16"
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-noop"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-panic"
version = "1.7.15"
version = "1.7.16"
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-panic"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[features]
default = ["custom-panic"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-param-passing"
version = "1.7.15"
version = "1.7.16"
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-param-passing"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-param-passing-dep"
version = "1.7.15"
version = "1.7.16"
description = "Solana BPF 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-param-passing-dep"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-rand"
version = "1.7.15"
version = "1.7.16"
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 = "2018"
[dependencies]
getrandom = { version = "0.1.14", features = ["dummy"] }
rand = "0.7"
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-ro-account_modify"
version = "1.7.15"
version = "1.7.16"
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-ro-modify"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-ro-modify"
version = "1.7.15"
version = "1.7.16"
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-ro-modify"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-sanity"
version = "1.7.15"
version = "1.7.16"
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-sanity"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-secp256k1-recover"
version = "1.7.15"
version = "1.7.16"
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-secp256k1-recover"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-sha"
version = "1.7.15"
version = "1.7.16"
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-sha"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-spoof1"
version = "1.7.15"
version = "1.7.16"
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-spoof1"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-spoof1-system"
version = "1.7.15"
version = "1.7.16"
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-spoof1-system"
edition = "2018"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.7.15" }
solana-program = { path = "../../../../sdk/program", version = "=1.7.16" }
[lib]
crate-type = ["cdylib"]

Some files were not shown because too many files have changed in this diff Show More