Compare commits

...

15 Commits

Author SHA1 Message Date
mergify[bot]
8d5c7b7d89 hides implementation details of vote-accounts from public interface (#24087) (#24102)
(cherry picked from commit ef3e3dce7a)

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
2022-04-04 15:08:21 +00:00
mergify[bot]
ca1a282a60 demotes WeightedShuffle failures to error metrics (#24079) (#24088)
Since call-sites are calling unwrap anyways, panicking seems too punitive
for our use cases.

(cherry picked from commit 7cb3b6cbe2)

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
2022-04-03 18:10:00 +00:00
mergify[bot]
3f661f25fb improves Stakes::activate_epoch performance (#24068) (#24081)
Tested with mainnet stakes obtained from the ledger at 5 recent epoch
boundaries, this code is ~30% faster than current master.

Current code:
  epoch: 289, elapsed: 82901us
  epoch: 290, elapsed: 80525us
  epoch: 291, elapsed: 79122us
  epoch: 292, elapsed: 79961us
  epoch: 293, elapsed: 78965us

This commit:
  epoch: 289, elapsed: 61710us
  epoch: 290, elapsed: 55721us
  epoch: 291, elapsed: 55886us
  epoch: 292, elapsed: 55399us
  epoch: 293, elapsed: 56803us

(cherry picked from commit fa7eb7f30c)

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
2022-04-03 13:44:19 +00:00
mergify[bot]
b157a9111f Note this is a modified backport that does not SAVE the new fields, but does load them. (#24074)
Original:
Start saving/loading prior_roots(_with_hash) to snapshot (#23844)

    * Start saving/loading prior_roots(_with_hash) to snapshot

    * Update runtime/src/accounts_index.rs

    Co-authored-by: Michael Vines <mvines@gmail.com>

    * Update runtime/src/accounts_index.rs

    Co-authored-by: Michael Vines <mvines@gmail.com>

    * update comment

    Co-authored-by: Michael Vines <mvines@gmail.com>
    (cherry picked from commit 396b49a7c1)

Co-authored-by: Jeff Washington (jwash) <wash678@gmail.com>
2022-04-02 17:22:33 +00:00
mergify[bot]
f2f20af768 Fix typo in documentation (#24076) (#24077)
(cherry picked from commit 4968e7d38c)

Co-authored-by: blake <572337+bartenbach@users.noreply.github.com>
2022-04-02 13:35:39 +00:00
mergify[bot]
a8855386c1 zk-token-sdk: handle edge cases for transfer with fee (#23804) (#23818)
* zk-token-sdk: handle edge cases for transfer with fee

* zk-token-sdk: clippy

* zk-token-sdk: clippy

* zk-token-sdk: cargo fmt

(cherry picked from commit 10eeafd3d6)

Co-authored-by: samkim-crypto <skim13@cs.stanford.edu>
2022-04-01 20:02:10 -04:00
mergify[bot]
6048b71640 Revert voting service to use UDP instead of QUIC (backport #24032) (#24052)
* Revert voting service to use UDP instead of QUIC (#24032)

(cherry picked from commit df4d92f9cf)

# Conflicts:
#	core/src/voting_service.rs

* resolve merge conflicts

Co-authored-by: Pankaj Garg <pankaj@solana.com>
2022-04-01 18:52:27 +00:00
mergify[bot]
4a4a1db836 expands lifetime of SlotStats (#23872) (#24002)
Current slot stats are removed when the slot is full or every 30 seconds
if the slot is before root:
https://github.com/solana-labs/solana/blob/493a8e234/ledger/src/blockstore.rs#L2017-L2027

In order to track if the slot is ultimately marked as dead or rooted and
emit more metrics, this commit expands lifetime of SlotStats while
bounding total size of cache using an LRU eviction policy.

(cherry picked from commit 1f9c89c1e8)

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
2022-04-01 14:50:12 +00:00
mergify[bot]
c7889f8def uses first_coding_index for erasure meta obtained from coding shreds (#23974) (#24001)
Now that nodes correctly populate position field in coding shreds, and
first_coding_index in erasure meta, the old code to maintain backward
compatibility can be removed.
The commit is working towards changing erasure coding schema to 32:64.

(cherry picked from commit cda3d66b21)

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
2022-04-01 14:49:39 +00:00
Michael Vines
832f524687 Update Version CrdsData on node identity changes
(cherry picked from commit 7ef18f220a)
2022-03-28 19:57:48 -07:00
Will Hickey
a639282c0f Bump version to 1.10.6 (#23969) 2022-03-28 10:56:01 -05:00
mergify[bot]
5eb085fcaf Implement forwarding via TpuConnection (#23817) (#23936)
(cherry picked from commit 6b85c2104c)

Co-authored-by: ryleung-solana <91908731+ryleung-solana@users.noreply.github.com>
2022-03-28 16:38:44 +02:00
mergify[bot]
c66d086db1 fix: thread enforce_ulimit_nofile config down when opening blockstore (#23925) (#23958)
(cherry picked from commit f44c8f296f)

Co-authored-by: Steven Luscher <steveluscher@users.noreply.github.com>
2022-03-26 20:09:49 +00:00
mergify[bot]
0c740ebba6 Specify if archive size datapoint is for full or incremental snapshots (#23941) (#23957)
(cherry picked from commit 31b707b625)

Co-authored-by: Brooks Prumo <brooks@solana.com>
2022-03-26 19:25:39 +00:00
Will Hickey
fd49ed1959 Bump version to 1.10.5 (#23955) 2022-03-26 11:34:12 -05:00
164 changed files with 1623 additions and 1461 deletions

332
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-account-decoder"
version = "1.10.4"
version = "1.10.6"
description = "Solana account decoder"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -19,9 +19,9 @@ lazy_static = "1.4.0"
serde = "1.0.136"
serde_derive = "1.0.103"
serde_json = "1.0.79"
solana-config-program = { path = "../programs/config", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-config-program = { path = "../programs/config", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
thiserror = "1.0"
zstd = "0.11.1"

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-accounts-bench"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -12,11 +12,11 @@ publish = false
clap = "2.33.1"
log = "0.4.14"
rayon = "1.5.1"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-banks-client"
version = "1.10.4"
version = "1.10.6"
description = "Solana banks client"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -12,17 +12,17 @@ edition = "2021"
[dependencies]
borsh = "0.9.3"
futures = "0.3"
solana-banks-interface = { path = "../banks-interface", version = "=1.10.4" }
solana-program = { path = "../sdk/program", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-banks-interface = { path = "../banks-interface", version = "=1.10.6" }
solana-program = { path = "../sdk/program", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
tarpc = { version = "0.27.2", features = ["full"] }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }
[dev-dependencies]
solana-banks-server = { path = "../banks-server", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-banks-server = { path = "../banks-server", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
[lib]
crate-type = ["lib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-banks-interface"
version = "1.10.4"
version = "1.10.6"
description = "Solana banks RPC interface"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ edition = "2021"
[dependencies]
serde = { version = "1.0.136", features = ["derive"] }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
tarpc = { version = "0.27.2", features = ["full"] }
[lib]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-banks-server"
version = "1.10.4"
version = "1.10.6"
description = "Solana banks server"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -13,10 +13,10 @@ edition = "2021"
bincode = "1.3.3"
crossbeam-channel = "0.5"
futures = "0.3"
solana-banks-interface = { path = "../banks-interface", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.4" }
solana-banks-interface = { path = "../banks-interface", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.6" }
tarpc = { version = "0.27.2", features = ["full"] }
tokio = { version = "1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }

View File

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

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-bench-tps"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -15,23 +15,23 @@ log = "0.4.14"
rayon = "1.5.1"
serde_json = "1.0.79"
serde_yaml = "0.8.23"
solana-client = { path = "../client", version = "=1.10.4" }
solana-core = { path = "../core", version = "=1.10.4" }
solana-faucet = { path = "../faucet", version = "=1.10.4" }
solana-genesis = { path = "../genesis", version = "=1.10.4" }
solana-gossip = { path = "../gossip", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-metrics = { path = "../metrics", version = "=1.10.4" }
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-streamer = { path = "../streamer", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-client = { path = "../client", version = "=1.10.6" }
solana-core = { path = "../core", version = "=1.10.6" }
solana-faucet = { path = "../faucet", version = "=1.10.6" }
solana-genesis = { path = "../genesis", version = "=1.10.6" }
solana-gossip = { path = "../gossip", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-metrics = { path = "../metrics", version = "=1.10.6" }
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-streamer = { path = "../streamer", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
[dev-dependencies]
serial_test = "0.6.0"
solana-local-cluster = { path = "../local-cluster", version = "=1.10.4" }
solana-local-cluster = { path = "../local-cluster", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bloom"
version = "1.10.4"
version = "1.10.6"
description = "Solana bloom filter"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -17,9 +17,9 @@ rand = "0.7.0"
rayon = "1.5.1"
serde = { version = "1.0.136", features = ["rc"] }
serde_derive = "1.0.103"
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
[lib]
crate-type = ["lib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bucket-map"
version = "1.10.4"
version = "1.10.6"
description = "solana-bucket-map"
homepage = "https://solana.com/"
documentation = "https://docs.rs/solana-bucket-map"
@@ -15,14 +15,14 @@ log = { version = "0.4.11" }
memmap2 = "0.5.3"
modular-bitfield = "0.11.2"
rand = "0.7.0"
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
tempfile = "3.3.0"
[dev-dependencies]
fs_extra = "1.2.0"
rayon = "1.5.0"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[lib]
crate-type = ["lib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-clap-utils"
version = "1.10.4"
version = "1.10.6"
description = "Solana utilities for the clap"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -13,9 +13,9 @@ edition = "2021"
chrono = "0.4"
clap = "2.33.0"
rpassword = "6.0"
solana-perf = { path = "../perf", version = "=1.10.4" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.4", default-features = false }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-perf = { path = "../perf", version = "=1.10.6" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.6", default-features = false }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
thiserror = "1.0.30"
tiny-bip39 = "0.8.2"
uriparse = "0.6.3"

View File

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

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-cli-output"
description = "Blockchain, Rebuilt for Scale"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -19,12 +19,12 @@ humantime = "2.0.1"
indicatif = "0.16.2"
serde = "1.0.136"
serde_json = "1.0.79"
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
solana-client = { path = "../client", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
solana-client = { path = "../client", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
[dev-dependencies]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-cli"
description = "Blockchain, Rebuilt for Scale"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -27,29 +27,29 @@ semver = "1.0.6"
serde = "1.0.136"
serde_derive = "1.0.103"
serde_json = "1.0.79"
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.4" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
solana-cli-output = { path = "../cli-output", version = "=1.10.4" }
solana-client = { path = "../client", version = "=1.10.4" }
solana-config-program = { path = "../programs/config", version = "=1.10.4" }
solana-faucet = { path = "../faucet", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.6" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
solana-cli-config = { path = "../cli-config", version = "=1.10.6" }
solana-cli-output = { path = "../cli-output", version = "=1.10.6" }
solana-client = { path = "../client", version = "=1.10.6" }
solana-config-program = { path = "../programs/config", version = "=1.10.6" }
solana-faucet = { path = "../faucet", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
solana_rbpf = "=0.2.24"
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
thiserror = "1.0.30"
tiny-bip39 = "0.8.2"
[dev-dependencies]
solana-streamer = { path = "../streamer", version = "=1.10.4" }
solana-test-validator = { path = "../test-validator", version = "=1.10.4" }
solana-streamer = { path = "../streamer", version = "=1.10.6" }
solana-test-validator = { path = "../test-validator", version = "=1.10.6" }
tempfile = "3.3.0"
[[bin]]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-client-test"
version = "1.10.4"
version = "1.10.6"
description = "Solana RPC Test"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -14,25 +14,25 @@ publish = false
futures-util = "0.3.21"
serde_json = "1.0.79"
serial_test = "0.6.0"
solana-client = { path = "../client", version = "=1.10.4" }
solana-ledger = { path = "../ledger", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.4" }
solana-metrics = { path = "../metrics", version = "=1.10.4" }
solana-perf = { path = "../perf", version = "=1.10.4" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
solana-rpc = { path = "../rpc", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-streamer = { path = "../streamer", version = "=1.10.4" }
solana-test-validator = { path = "../test-validator", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-client = { path = "../client", version = "=1.10.6" }
solana-ledger = { path = "../ledger", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.6" }
solana-metrics = { path = "../metrics", version = "=1.10.6" }
solana-perf = { path = "../perf", version = "=1.10.6" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
solana-rpc = { path = "../rpc", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-streamer = { path = "../streamer", version = "=1.10.6" }
solana-test-validator = { path = "../test-validator", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
systemstat = "0.1.10"
tokio = { version = "1", features = ["full"] }
[dev-dependencies]
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-client"
version = "1.10.4"
version = "1.10.6"
description = "Solana Client"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -35,16 +35,16 @@ semver = "1.0.6"
serde = "1.0.136"
serde_derive = "1.0.103"
serde_json = "1.0.79"
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
solana-faucet = { path = "../faucet", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-streamer = { path = "../streamer", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
solana-faucet = { path = "../faucet", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-streamer = { path = "../streamer", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio-stream = "0.1.8"
@@ -55,7 +55,7 @@ url = "2.2.2"
[dev-dependencies]
assert_matches = "1.5.0"
jsonrpc-http-server = "18.0.0"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,7 +1,7 @@
[package]
name = "solana-core"
description = "Blockchain, Rebuilt for Scale"
version = "1.10.4"
version = "1.10.6"
homepage = "https://solana.com/"
documentation = "https://docs.rs/solana-core"
readme = "../README.md"
@@ -33,30 +33,30 @@ rayon = "1.5.1"
retain_mut = "0.1.7"
serde = "1.0.136"
serde_derive = "1.0.103"
solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.4" }
solana-bloom = { path = "../bloom", version = "=1.10.4" }
solana-client = { path = "../client", version = "=1.10.4" }
solana-entry = { path = "../entry", version = "=1.10.4" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.10.4" }
solana-gossip = { path = "../gossip", version = "=1.10.4" }
solana-ledger = { path = "../ledger", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-metrics = { path = "../metrics", version = "=1.10.4" }
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
solana-perf = { path = "../perf", version = "=1.10.4" }
solana-poh = { path = "../poh", version = "=1.10.4" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
solana-replica-lib = { path = "../replica-lib", version = "=1.10.4" }
solana-rpc = { path = "../rpc", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.4" }
solana-streamer = { path = "../streamer", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.6" }
solana-bloom = { path = "../bloom", version = "=1.10.6" }
solana-client = { path = "../client", version = "=1.10.6" }
solana-entry = { path = "../entry", version = "=1.10.6" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
solana-geyser-plugin-manager = { path = "../geyser-plugin-manager", version = "=1.10.6" }
solana-gossip = { path = "../gossip", version = "=1.10.6" }
solana-ledger = { path = "../ledger", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-metrics = { path = "../metrics", version = "=1.10.6" }
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
solana-perf = { path = "../perf", version = "=1.10.6" }
solana-poh = { path = "../poh", version = "=1.10.6" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
solana-replica-lib = { path = "../replica-lib", version = "=1.10.6" }
solana-rpc = { path = "../rpc", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.6" }
solana-streamer = { path = "../streamer", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
sys-info = "0.9.1"
tempfile = "3.3.0"
thiserror = "1.0"
@@ -69,10 +69,10 @@ raptorq = "1.6.5"
reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
serde_json = "1.0.79"
serial_test = "0.6.0"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
static_assertions = "1.1.0"
systemstat = "0.1.10"

View File

@@ -14,6 +14,7 @@ use {
histogram::Histogram,
itertools::Itertools,
retain_mut::RetainMut,
solana_client::connection_cache::send_wire_transaction_batch,
solana_entry::entry::hash_transactions,
solana_gossip::{cluster_info::ClusterInfo, contact_info::ContactInfo},
solana_ledger::blockstore_processor::TransactionStatusSender,
@@ -51,8 +52,8 @@ use {
transaction::{
self, AddressLoader, SanitizedTransaction, TransactionError, VersionedTransaction,
},
transport::TransportError,
},
solana_streamer::sendmmsg::{batch_send, SendPktsError},
solana_transaction_status::token_balances::{
collect_token_balances, TransactionTokenBalancesSet,
},
@@ -60,7 +61,7 @@ use {
cmp,
collections::HashMap,
env,
net::{SocketAddr, UdpSocket},
net::SocketAddr,
sync::{
atomic::{AtomicU64, AtomicUsize, Ordering},
Arc, Mutex, RwLock,
@@ -482,11 +483,10 @@ impl BankingStage {
/// Forwards all valid, unprocessed packets in the buffer, up to a rate limit. Returns
/// the number of successfully forwarded packets in second part of tuple
fn forward_buffered_packets(
socket: &std::net::UdpSocket,
tpu_forwards: &std::net::SocketAddr,
packets: Vec<&Packet>,
data_budget: &DataBudget,
) -> (std::io::Result<()>, usize) {
) -> (std::result::Result<(), TransportError>, usize) {
const INTERVAL_MS: u64 = 100;
const MAX_BYTES_PER_SECOND: usize = 10_000 * 1200;
const MAX_BYTES_PER_INTERVAL: usize = MAX_BYTES_PER_SECOND * INTERVAL_MS as usize / 1000;
@@ -502,18 +502,35 @@ impl BankingStage {
.iter()
.filter_map(|p| {
if !p.meta.forwarded() && data_budget.take(p.meta.size) {
Some((&p.data[..p.meta.size], tpu_forwards))
Some(&p.data[..p.meta.size])
} else {
None
}
})
.collect();
// TODO: see https://github.com/solana-labs/solana/issues/23819
// fix this so returns the correct number of succeeded packets
// when there's an error sending the batch. This was left as-is for now
// in favor of shipping Quic support, which was considered higher-priority
if !packet_vec.is_empty() {
inc_new_counter_info!("banking_stage-forwarded_packets", packet_vec.len());
if let Err(SendPktsError::IoError(ioerr, num_failed)) = batch_send(socket, &packet_vec)
{
return (Err(ioerr), packet_vec.len().saturating_sub(num_failed));
let mut measure = Measure::start("banking_stage-forward-us");
let res = send_wire_transaction_batch(&packet_vec, tpu_forwards);
measure.stop();
inc_new_counter_info!(
"banking_stage-forward-us",
measure.as_us() as usize,
1000,
1000
);
if let Err(err) = res {
inc_new_counter_info!("banking_stage-forward_packets-failed-batches", 1);
return (Err(err), 0);
}
}
@@ -766,7 +783,6 @@ impl BankingStage {
#[allow(clippy::too_many_arguments)]
fn process_buffered_packets(
my_pubkey: &Pubkey,
socket: &std::net::UdpSocket,
poh_recorder: &Arc<Mutex<PohRecorder>>,
cluster_info: &ClusterInfo,
buffered_packet_batches: &mut UnprocessedPacketBatches,
@@ -846,7 +862,6 @@ impl BankingStage {
cluster_info,
buffered_packet_batches,
poh_recorder,
socket,
false,
data_budget,
slot_metrics_tracker,
@@ -865,7 +880,6 @@ impl BankingStage {
cluster_info,
buffered_packet_batches,
poh_recorder,
socket,
true,
data_budget,
slot_metrics_tracker,
@@ -887,7 +901,6 @@ impl BankingStage {
cluster_info: &ClusterInfo,
buffered_packet_batches: &mut UnprocessedPacketBatches,
poh_recorder: &Arc<Mutex<PohRecorder>>,
socket: &UdpSocket,
hold: bool,
data_budget: &DataBudget,
slot_metrics_tracker: &mut LeaderSlotMetricsTracker,
@@ -913,7 +926,7 @@ impl BankingStage {
Self::filter_valid_packets_for_forwarding(buffered_packet_batches.iter());
let forwardable_packets_len = forwardable_packets.len();
let (_forward_result, sucessful_forwarded_packets_count) =
Self::forward_buffered_packets(socket, &addr, forwardable_packets, data_budget);
Self::forward_buffered_packets(&addr, forwardable_packets, data_budget);
let failed_forwarded_packets_count =
forwardable_packets_len.saturating_sub(sucessful_forwarded_packets_count);
@@ -958,7 +971,6 @@ impl BankingStage {
cost_model: Arc<RwLock<CostModel>>,
) {
let recorder = poh_recorder.lock().unwrap().recorder();
let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let mut buffered_packet_batches = UnprocessedPacketBatches::with_capacity(batch_limit);
let mut banking_stage_stats = BankingStageStats::new(id);
let qos_service = QosService::new(cost_model, id);
@@ -970,7 +982,6 @@ impl BankingStage {
|_| {
Self::process_buffered_packets(
&my_pubkey,
&socket,
poh_recorder,
cluster_info,
&mut buffered_packet_batches,
@@ -3835,7 +3846,6 @@ mod tests {
let local_node = Node::new_localhost_with_pubkey(validator_pubkey);
let cluster_info = new_test_cluster_info(local_node.info);
let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let recv_socket = &local_node.sockets.tpu_forwards[0];
let test_cases = vec![
@@ -3857,7 +3867,6 @@ mod tests {
&cluster_info,
&mut unprocessed_packet_batches,
&poh_recorder,
&send_socket,
true,
&data_budget,
&mut LeaderSlotMetricsTracker::new(0),
@@ -3935,7 +3944,6 @@ mod tests {
let local_node = Node::new_localhost_with_pubkey(validator_pubkey);
let cluster_info = new_test_cluster_info(local_node.info);
let send_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let recv_socket = &local_node.sockets.tpu_forwards[0];
let test_cases = vec![
@@ -3969,7 +3977,6 @@ mod tests {
&cluster_info,
&mut unprocessed_packet_batches,
&poh_recorder,
&send_socket,
hold,
&DataBudget::default(),
&mut LeaderSlotMetricsTracker::new(0),

View File

@@ -326,7 +326,7 @@ pub fn new_cluster_nodes<T: 'static>(
.collect();
let broadcast = TypeId::of::<T>() == TypeId::of::<BroadcastStage>();
let stakes: Vec<u64> = nodes.iter().map(|node| node.stake).collect();
let mut weighted_shuffle = WeightedShuffle::new(&stakes).unwrap();
let mut weighted_shuffle = WeightedShuffle::new("cluster-nodes", &stakes);
if broadcast {
weighted_shuffle.remove_index(index[&self_pubkey]);
}

View File

@@ -1298,6 +1298,7 @@ fn load_blockstore(
BlockstoreOptions {
recovery_mode: config.wal_recovery_mode.clone(),
column_options: config.ledger_column_options.clone(),
enforce_ulimit_nofile: config.enforce_ulimit_nofile,
..BlockstoreOptions::default()
},
)

View File

@@ -1,7 +1,6 @@
use {
crate::tower_storage::{SavedTowerVersions, TowerStorage},
crossbeam_channel::Receiver,
solana_client::connection_cache,
solana_gossip::cluster_info::ClusterInfo,
solana_measure::measure::Measure,
solana_poh::poh_recorder::PohRecorder,
@@ -87,13 +86,7 @@ impl VotingService {
} else {
crate::banking_stage::next_leader_tpu(cluster_info, poh_recorder)
};
let mut measure = Measure::start("vote_tx_send-ms");
let target_address = target_address.unwrap_or_else(|| cluster_info.my_contact_info().tpu);
let wire_vote_tx = bincode::serialize(vote_op.tx()).expect("vote serialization failure");
let _ = connection_cache::send_wire_transaction(&wire_vote_tx, &target_address);
measure.stop();
inc_new_counter_info!("vote_tx_send-ms", measure.as_ms() as usize);
let _ = cluster_info.send_transaction(vote_op.tx(), target_address);
match vote_op {
VoteOp::PushVote {

View File

@@ -3059,7 +3059,7 @@ curl http://localhost:8899 -X POST -H "Content-Type: application/json" -d '
Result:
```json
{ "jsonrpc": "2.0", "result": { "solana-core": "1.10.4" }, "id": 1 }
{ "jsonrpc": "2.0", "result": { "solana-core": "1.10.6" }, "id": 1 }
```
### getVoteAccounts

View File

@@ -95,7 +95,7 @@ solana-validator ... \
```
Note that once running your validator *will terminate* if it's not able to write
its tower into etcd before submitting a vote transactioin, so it's essential
its tower into etcd before submitting a vote transaction, so it's essential
that your etcd endpoint remain accessible at all times.
### Secondary Validator

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-dos"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -15,18 +15,18 @@ clap = {version = "3.1.5", features = ["derive", "cargo"]}
log = "0.4.14"
rand = "0.7.0"
serde = "1.0.136"
solana-client = { path = "../client", version = "=1.10.4" }
solana-core = { path = "../core", version = "=1.10.4" }
solana-gossip = { path = "../gossip", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-net-utils = { path = "../net-utils", version = "=1.10.4" }
solana-perf = { path = "../perf", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-streamer = { path = "../streamer", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-client = { path = "../client", version = "=1.10.6" }
solana-core = { path = "../core", version = "=1.10.6" }
solana-gossip = { path = "../gossip", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-net-utils = { path = "../net-utils", version = "=1.10.6" }
solana-perf = { path = "../perf", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-streamer = { path = "../streamer", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
[dev-dependencies]
solana-local-cluster = { path = "../local-cluster", version = "=1.10.4" }
solana-local-cluster = { path = "../local-cluster", version = "=1.10.6" }

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-download-utils"
version = "1.10.4"
version = "1.10.6"
description = "Solana Download Utils"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -14,8 +14,8 @@ console = "0.15.0"
indicatif = "0.16.2"
log = "0.4.14"
reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
[lib]
crate-type = ["lib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-entry"
version = "1.10.4"
version = "1.10.6"
description = "Solana Entry"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -18,16 +18,16 @@ log = "0.4.11"
rand = "0.7.0"
rayon = "1.5.1"
serde = "1.0.136"
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.4" }
solana-metrics = { path = "../metrics", version = "=1.10.4" }
solana-perf = { path = "../perf", version = "=1.10.4" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-merkle-tree = { path = "../merkle-tree", version = "=1.10.6" }
solana-metrics = { path = "../metrics", version = "=1.10.6" }
solana-perf = { path = "../perf", version = "=1.10.6" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
[dev-dependencies]
matches = "0.1.9"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[lib]
crate-type = ["lib"]

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-frozen-abi"
version = "1.10.4"
version = "1.10.6"
description = "Solana Frozen ABI"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -18,7 +18,7 @@ serde = "1.0.136"
serde_derive = "1.0.103"
serde_bytes = "0.11"
sha2 = "0.10.2"
solana-frozen-abi-macro = { path = "macro", version = "=1.10.4" }
solana-frozen-abi-macro = { path = "macro", version = "=1.10.6" }
thiserror = "1.0"
[target.'cfg(not(target_arch = "bpf"))'.dependencies]
@@ -27,7 +27,7 @@ im = { version = "15.0.0", features = ["rayon", "serde"] }
memmap2 = "0.5.3"
[target.'cfg(not(target_arch = "bpf"))'.dev-dependencies]
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[build-dependencies]
rustc_version = "0.4"

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-genesis-utils"
version = "1.10.4"
version = "1.10.6"
description = "Solana Genesis Utils"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,9 +10,9 @@ documentation = "https://docs.rs/solana-download-utils"
edition = "2021"
[dependencies]
solana-download-utils = { path = "../download-utils", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-download-utils = { path = "../download-utils", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
[lib]
crate-type = ["lib"]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-genesis"
description = "Blockchain, Rebuilt for Scale"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -15,16 +15,16 @@ clap = "2.33.1"
serde = "1.0.136"
serde_json = "1.0.79"
serde_yaml = "0.8.23"
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
solana-cli-config = { path = "../cli-config", version = "=1.10.4" }
solana-entry = { path = "../entry", version = "=1.10.4" }
solana-ledger = { path = "../ledger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
solana-cli-config = { path = "../cli-config", version = "=1.10.6" }
solana-entry = { path = "../entry", version = "=1.10.6" }
solana-ledger = { path = "../ledger", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
tempfile = "3.3.0"
[[bin]]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-geyser-plugin-interface"
description = "The Solana Geyser plugin interface."
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -11,8 +11,8 @@ documentation = "https://docs.rs/solana-geyser-plugin-interface"
[dependencies]
log = "0.4.11"
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
thiserror = "1.0.30"
[package.metadata.docs.rs]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-geyser-plugin-manager"
description = "The Solana Geyser plugin manager."
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -16,13 +16,13 @@ json5 = "0.4.1"
libloading = "0.7.3"
log = "0.4.11"
serde_json = "1.0.79"
solana-geyser-plugin-interface = { path = "../geyser-plugin-interface", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-metrics = { path = "../metrics", version = "=1.10.4" }
solana-rpc = { path = "../rpc", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-geyser-plugin-interface = { path = "../geyser-plugin-interface", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-metrics = { path = "../metrics", version = "=1.10.6" }
solana-rpc = { path = "../rpc", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
thiserror = "1.0.30"
[package.metadata.docs.rs]

View File

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

View File

@@ -32,8 +32,7 @@ fn bench_weighted_shuffle_new(bencher: &mut Bencher) {
let weights = make_weights(&mut rng);
bencher.iter(|| {
rng.fill(&mut seed[..]);
let shuffle = WeightedShuffle::new(&weights).unwrap();
shuffle
WeightedShuffle::new("", &weights)
.shuffle(&mut ChaChaRng::from_seed(seed))
.collect::<Vec<_>>()
});

View File

@@ -635,6 +635,10 @@ impl ClusterInfo {
self.my_contact_info.write().unwrap().id = id;
self.insert_self();
self.push_message(CrdsValue::new_signed(
CrdsData::Version(Version::new(self.id())),
&self.keypair(),
));
self.push_self(&HashMap::new(), None);
}
@@ -2011,7 +2015,7 @@ impl ClusterInfo {
return packet_batch;
}
let mut rng = rand::thread_rng();
let shuffle = WeightedShuffle::new(&scores).unwrap().shuffle(&mut rng);
let shuffle = WeightedShuffle::new("handle-pull-requests", &scores).shuffle(&mut rng);
let mut total_bytes = 0;
let mut sent = 0;
for (addr, response) in shuffle.map(|i| &responses[i]) {

View File

@@ -246,8 +246,7 @@ impl CrdsGossipPull {
return Err(CrdsGossipError::NoPeers);
}
let mut rng = rand::thread_rng();
let mut peers = WeightedShuffle::new(&weights)
.unwrap()
let mut peers = WeightedShuffle::new("pull-options", &weights)
.shuffle(&mut rng)
.map(|i| peers[i]);
let peer = {

View File

@@ -169,8 +169,7 @@ impl CrdsGossipPush {
.filter(|(_, stake)| *stake > 0)
.collect();
let weights: Vec<_> = peers.iter().map(|(_, stake)| *stake).collect();
WeightedShuffle::new(&weights)
.unwrap()
WeightedShuffle::new("prune-received-cache", &weights)
.shuffle(&mut rng)
.map(move |i| peers[i])
};
@@ -370,7 +369,7 @@ impl CrdsGossipPush {
return;
}
let num_bloom_items = MIN_NUM_BLOOM_ITEMS.max(network_size);
let shuffle = WeightedShuffle::new(&weights).unwrap().shuffle(&mut rng);
let shuffle = WeightedShuffle::new("push-options", &weights).shuffle(&mut rng);
let mut active_set = self.active_set.write().unwrap();
let need = Self::compute_need(self.num_active, active_set.len(), ratio);
for peer in shuffle.map(|i| peers[i]) {

View File

@@ -15,12 +15,6 @@ use {
},
};
#[derive(Debug)]
pub enum WeightedShuffleError<T> {
NegativeWeight(T),
SumOverflow,
}
/// Implements an iterator where indices are shuffled according to their
/// weights:
/// - Returned indices are unique in the range [0, weights.len()).
@@ -43,34 +37,48 @@ impl<T> WeightedShuffle<T>
where
T: Copy + Default + PartialOrd + AddAssign + CheckedAdd,
{
/// Returns error if:
/// - any of the weights are negative.
/// - sum of weights overflows.
pub fn new(weights: &[T]) -> Result<Self, WeightedShuffleError<T>> {
/// If weights are negative or overflow the total sum
/// they are treated as zero.
pub fn new(name: &'static str, weights: &[T]) -> Self {
let size = weights.len() + 1;
let zero = <T as Default>::default();
let mut arr = vec![zero; size];
let mut sum = zero;
let mut zeros = Vec::default();
let mut num_negative = 0;
let mut num_overflow = 0;
for (mut k, &weight) in (1usize..).zip(weights) {
#[allow(clippy::neg_cmp_op_on_partial_ord)]
// weight < zero does not work for NaNs.
if !(weight >= zero) {
return Err(WeightedShuffleError::NegativeWeight(weight));
zeros.push(k - 1);
num_negative += 1;
continue;
}
if weight == zero {
zeros.push(k - 1);
continue;
}
sum = sum
.checked_add(&weight)
.ok_or(WeightedShuffleError::SumOverflow)?;
sum = match sum.checked_add(&weight) {
Some(val) => val,
None => {
zeros.push(k - 1);
num_overflow += 1;
continue;
}
};
while k < size {
arr[k] += weight;
k += k & k.wrapping_neg();
}
}
Ok(Self { arr, sum, zeros })
if num_negative > 0 {
datapoint_error!("weighted-shuffle-negative", (name, num_negative, i64));
}
if num_overflow > 0 {
datapoint_error!("weighted-shuffle-overflow", (name, num_overflow, i64));
}
Self { arr, sum, zeros }
}
}
@@ -343,7 +351,7 @@ mod tests {
fn test_weighted_shuffle_empty_weights() {
let weights = Vec::<u64>::new();
let mut rng = rand::thread_rng();
let shuffle = WeightedShuffle::new(&weights).unwrap();
let shuffle = WeightedShuffle::new("", &weights);
assert!(shuffle.clone().shuffle(&mut rng).next().is_none());
assert!(shuffle.first(&mut rng).is_none());
}
@@ -354,7 +362,7 @@ mod tests {
let weights = vec![0u64; 5];
let seed = [37u8; 32];
let mut rng = ChaChaRng::from_seed(seed);
let shuffle = WeightedShuffle::new(&weights).unwrap();
let shuffle = WeightedShuffle::new("", &weights);
assert_eq!(
shuffle.clone().shuffle(&mut rng).collect::<Vec<_>>(),
[1, 4, 2, 3, 0]
@@ -372,14 +380,14 @@ mod tests {
let weights = [1, 0, 1000, 0, 0, 10, 100, 0];
let mut counts = [0; 8];
for _ in 0..100000 {
let mut shuffle = WeightedShuffle::new(&weights).unwrap().shuffle(&mut rng);
let mut shuffle = WeightedShuffle::new("", &weights).shuffle(&mut rng);
counts[shuffle.next().unwrap()] += 1;
let _ = shuffle.count(); // consume the rest.
}
assert_eq!(counts, [95, 0, 90069, 0, 0, 908, 8928, 0]);
let mut counts = [0; 8];
for _ in 0..100000 {
let mut shuffle = WeightedShuffle::new(&weights).unwrap();
let mut shuffle = WeightedShuffle::new("", &weights);
shuffle.remove_index(5);
shuffle.remove_index(3);
shuffle.remove_index(1);
@@ -390,6 +398,26 @@ mod tests {
assert_eq!(counts, [97, 0, 90862, 0, 0, 0, 9041, 0]);
}
#[test]
fn test_weighted_shuffle_negative_overflow() {
const SEED: [u8; 32] = [48u8; 32];
let weights = [19i64, 23, 7, 0, 0, 23, 3, 0, 5, 0, 19, 29];
let mut rng = ChaChaRng::from_seed(SEED);
let shuffle = WeightedShuffle::new("", &weights);
assert_eq!(
shuffle.shuffle(&mut rng).collect::<Vec<_>>(),
[8, 1, 5, 10, 11, 0, 2, 6, 9, 4, 3, 7]
);
// Negative weights and overflowing ones are treated as zero.
let weights = [19, 23, 7, -57, i64::MAX, 23, 3, i64::MAX, 5, -79, 19, 29];
let mut rng = ChaChaRng::from_seed(SEED);
let shuffle = WeightedShuffle::new("", &weights);
assert_eq!(
shuffle.shuffle(&mut rng).collect::<Vec<_>>(),
[8, 1, 5, 10, 11, 0, 2, 6, 9, 4, 3, 7]
);
}
#[test]
fn test_weighted_shuffle_hard_coded() {
let weights = [
@@ -397,7 +425,7 @@ mod tests {
];
let seed = [48u8; 32];
let mut rng = ChaChaRng::from_seed(seed);
let mut shuffle = WeightedShuffle::new(&weights).unwrap();
let mut shuffle = WeightedShuffle::new("", &weights);
assert_eq!(
shuffle.clone().shuffle(&mut rng).collect::<Vec<_>>(),
[2, 12, 18, 0, 14, 15, 17, 10, 1, 9, 7, 6, 13, 20, 4, 19, 3, 8, 11, 16, 5]
@@ -417,7 +445,7 @@ mod tests {
assert_eq!(shuffle.first(&mut rng), Some(4));
let seed = [37u8; 32];
let mut rng = ChaChaRng::from_seed(seed);
let mut shuffle = WeightedShuffle::new(&weights).unwrap();
let mut shuffle = WeightedShuffle::new("", &weights);
assert_eq!(
shuffle.clone().shuffle(&mut rng).collect::<Vec<_>>(),
[19, 3, 15, 14, 6, 10, 17, 18, 9, 2, 4, 1, 0, 7, 8, 20, 12, 13, 16, 5, 11]
@@ -447,13 +475,13 @@ mod tests {
let mut seed = [0u8; 32];
rng.fill(&mut seed[..]);
let mut rng = ChaChaRng::from_seed(seed);
let shuffle = WeightedShuffle::new(&weights).unwrap();
let shuffle = WeightedShuffle::new("", &weights);
let shuffle: Vec<_> = shuffle.shuffle(&mut rng).collect();
let mut rng = ChaChaRng::from_seed(seed);
let shuffle_slow = weighted_shuffle_slow(&mut rng, weights.clone());
assert_eq!(shuffle, shuffle_slow);
let mut rng = ChaChaRng::from_seed(seed);
let shuffle = WeightedShuffle::new(&weights).unwrap();
let shuffle = WeightedShuffle::new("", &weights);
assert_eq!(shuffle.first(&mut rng), Some(shuffle_slow[0]));
}
}

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-install"
description = "The solana cluster software installer"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -26,12 +26,12 @@ reqwest = { version = "0.11.10", default-features = false, features = ["blocking
semver = "1.0.6"
serde = { version = "1.0.136", features = ["derive"] }
serde_yaml = "0.8.23"
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
solana-client = { path = "../client", version = "=1.10.4" }
solana-config-program = { path = "../programs/config", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
solana-client = { path = "../client", version = "=1.10.6" }
solana-config-program = { path = "../programs/config", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
tar = "0.4.38"
tempfile = "3.3.0"
url = "2.2.2"

View File

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

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-ledger-tool"
description = "Blockchain, Rebuilt for Scale"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -21,20 +21,20 @@ log = { version = "0.4.14" }
regex = "1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.79"
solana-clap-utils = { path = "../clap-utils", version = "=1.10.4" }
solana-cli-output = { path = "../cli-output", version = "=1.10.4" }
solana-core = { path = "../core", version = "=1.10.4" }
solana-entry = { path = "../entry", version = "=1.10.4" }
solana-ledger = { path = "../ledger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.6" }
solana-cli-output = { path = "../cli-output", version = "=1.10.6" }
solana-core = { path = "../core", version = "=1.10.6" }
solana-entry = { path = "../entry", version = "=1.10.6" }
solana-ledger = { path = "../ledger", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.6" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
tokio = { version = "1", features = ["full"] }
[target.'cfg(not(target_env = "msvc"))'.dependencies]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-ledger"
version = "1.10.4"
version = "1.10.6"
description = "Solana ledger"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -11,6 +11,7 @@ edition = "2021"
[dependencies]
bincode = "1.3.3"
bitflags = "1.3.1"
byteorder = "1.4.3"
chrono = { version = "0.4.11", features = ["serde"] }
chrono-humanize = "0.2.1"
@@ -21,6 +22,7 @@ itertools = "0.10.3"
lazy_static = "1.4.0"
libc = "0.2.120"
log = { version = "0.4.14" }
lru = "0.7.3"
num-derive = "0.3"
num-traits = "0.2"
num_cpus = "1.13.1"
@@ -32,21 +34,21 @@ reed-solomon-erasure = { version = "5.0.1", features = ["simd-accel"] }
serde = "1.0.136"
serde_bytes = "0.11.5"
sha2 = "0.10.2"
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.4" }
solana-entry = { path = "../entry", version = "=1.10.4" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-metrics = { path = "../metrics", version = "=1.10.4" }
solana-perf = { path = "../perf", version = "=1.10.4" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.4" }
solana-storage-proto = { path = "../storage-proto", version = "=1.10.4" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.6" }
solana-entry = { path = "../entry", version = "=1.10.6" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-metrics = { path = "../metrics", version = "=1.10.6" }
solana-perf = { path = "../perf", version = "=1.10.6" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.6" }
solana-storage-proto = { path = "../storage-proto", version = "=1.10.6" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
tempfile = "3.3.0"
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
@@ -63,8 +65,8 @@ features = ["lz4"]
[dev-dependencies]
assert_matches = "1.5.0"
matches = "0.1.9"
solana-account-decoder = { path = "../account-decoder", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-account-decoder = { path = "../account-decoder", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[build-dependencies]
rustc_version = "0.4"

View File

@@ -16,6 +16,7 @@ use {
max_ticks_per_n_shreds, ErasureSetId, Result as ShredResult, Shred, ShredId, ShredType,
Shredder, SHRED_PAYLOAD_SIZE,
},
slot_stats::{ShredSource, SlotsStats},
},
bincode::deserialize,
crossbeam_channel::{bounded, Receiver, Sender, TrySendError},
@@ -50,7 +51,7 @@ use {
borrow::Cow,
cell::RefCell,
cmp,
collections::{hash_map::Entry as HashMapEntry, BTreeMap, BTreeSet, HashMap, HashSet},
collections::{hash_map::Entry as HashMapEntry, BTreeSet, HashMap, HashSet},
convert::TryInto,
fs,
io::{Error as IoError, ErrorKind},
@@ -60,7 +61,6 @@ use {
atomic::{AtomicBool, Ordering},
Arc, Mutex, RwLock, RwLockWriteGuard,
},
time::Instant,
},
tempfile::{Builder, TempDir},
thiserror::Error,
@@ -181,26 +181,6 @@ pub struct Blockstore {
column_options: LedgerColumnOptions,
}
struct SlotsStats {
last_cleanup_ts: Instant,
stats: BTreeMap<Slot, SlotStats>,
}
impl Default for SlotsStats {
fn default() -> Self {
SlotsStats {
last_cleanup_ts: Instant::now(),
stats: BTreeMap::new(),
}
}
}
#[derive(Default)]
struct SlotStats {
num_repaired: usize,
num_recovered: usize,
}
pub struct IndexMetaWorkingSetEntry {
index: Index,
// true only if at least one shred for this Index was inserted since the time this
@@ -223,13 +203,6 @@ pub struct SlotMetaWorkingSetEntry {
did_insert_occur: bool,
}
#[derive(PartialEq, Debug, Clone)]
enum ShredSource {
Turbine,
Repaired,
Recovered,
}
#[derive(Default)]
pub struct BlockstoreInsertionMetrics {
pub num_shreds: usize,
@@ -1250,13 +1223,13 @@ impl Blockstore {
let mut newly_completed_data_sets: Vec<CompletedDataSetInfo> = vec![];
let mut inserted_indices = Vec::new();
for (i, (shred, is_repaired)) in shreds.into_iter().zip(is_repaired).enumerate() {
let shred_source = if is_repaired {
ShredSource::Repaired
} else {
ShredSource::Turbine
};
match shred.shred_type() {
ShredType::Data => {
let shred_source = if is_repaired {
ShredSource::Repaired
} else {
ShredSource::Turbine
};
match self.check_insert_data_shred(
shred,
&mut erasure_metas,
@@ -1295,7 +1268,7 @@ impl Blockstore {
&mut index_meta_time,
handle_duplicate,
is_trusted,
is_repaired,
shred_source,
metrics,
);
}
@@ -1464,10 +1437,9 @@ impl Blockstore {
}
fn erasure_mismatch(shred1: &Shred, shred2: &Shred) -> bool {
// TODO should also compare first-coding-index once position field is
// populated across cluster.
shred1.coding_header.num_coding_shreds != shred2.coding_header.num_coding_shreds
|| shred1.coding_header.num_data_shreds != shred2.coding_header.num_data_shreds
|| shred1.first_coding_index() != shred2.first_coding_index()
}
#[allow(clippy::too_many_arguments)]
@@ -1481,7 +1453,7 @@ impl Blockstore {
index_meta_time: &mut u64,
handle_duplicate: &F,
is_trusted: bool,
is_repaired: bool,
shred_source: ShredSource,
metrics: &mut BlockstoreInsertionMetrics,
) -> bool
where
@@ -1548,13 +1520,10 @@ impl Blockstore {
return false;
}
if is_repaired {
let mut slots_stats = self.slots_stats.lock().unwrap();
let mut e = slots_stats.stats.entry(slot).or_default();
e.num_repaired += 1;
}
self.slots_stats
.lock()
.unwrap()
.add_shred(slot, shred_source);
// insert coding shred into rocks
let result = self
.insert_coding_shred(index_meta, &shred, write_batch)
@@ -1700,7 +1669,7 @@ impl Blockstore {
just_inserted_shreds,
&self.last_root,
leader_schedule,
shred_source.clone(),
shred_source,
) {
return Err(InsertDataShredError::InvalidShred);
}
@@ -1972,49 +1941,12 @@ impl Blockstore {
end_index,
})
.collect();
if shred_source == ShredSource::Repaired || shred_source == ShredSource::Recovered {
{
let mut slots_stats = self.slots_stats.lock().unwrap();
let mut e = slots_stats.stats.entry(slot_meta.slot).or_default();
if shred_source == ShredSource::Repaired {
e.num_repaired += 1;
slots_stats.add_shred(slot_meta.slot, shred_source);
if slot_meta.is_full() {
slots_stats.set_full(slot_meta);
}
if shred_source == ShredSource::Recovered {
e.num_recovered += 1;
}
}
if slot_meta.is_full() {
let (num_repaired, num_recovered) = {
let mut slots_stats = self.slots_stats.lock().unwrap();
if let Some(e) = slots_stats.stats.remove(&slot_meta.slot) {
if slots_stats.last_cleanup_ts.elapsed().as_secs() > 30 {
let root = self.last_root();
slots_stats.stats = slots_stats.stats.split_off(&root);
slots_stats.last_cleanup_ts = Instant::now();
}
(e.num_repaired, e.num_recovered)
} else {
(0, 0)
}
};
datapoint_info!(
"shred_insert_is_full",
(
"total_time_ms",
solana_sdk::timing::timestamp() - slot_meta.first_shred_timestamp,
i64
),
("slot", slot_meta.slot, i64),
(
"last_index",
slot_meta
.last_index
.and_then(|ix| i64::try_from(ix).ok())
.unwrap_or(-1),
i64
),
("num_repaired", num_repaired, i64),
("num_recovered", num_recovered, i64),
);
}
trace!("inserted shred into slot {:?} and index {:?}", slot, index);
Ok(newly_completed_data_sets)
@@ -6355,7 +6287,7 @@ pub mod tests {
panic!("no dupes");
},
false,
false,
ShredSource::Turbine,
&mut BlockstoreInsertionMetrics::default(),
));
@@ -6373,7 +6305,7 @@ pub mod tests {
counter.fetch_add(1, Ordering::Relaxed);
},
false,
false,
ShredSource::Turbine,
&mut BlockstoreInsertionMetrics::default(),
));
assert_eq!(counter.load(Ordering::Relaxed), 1);
@@ -6487,7 +6419,7 @@ pub mod tests {
);
coding_shred.common_header.fec_set_index = std::u32::MAX - 1;
coding_shred.coding_header.num_data_shreds = 2;
coding_shred.coding_header.num_coding_shreds = 3;
coding_shred.coding_header.num_coding_shreds = 4;
coding_shred.coding_header.position = 1;
coding_shred.common_header.index = std::u32::MAX - 1;
assert!(!Blockstore::should_insert_coding_shred(

View File

@@ -257,10 +257,6 @@ impl ErasureMeta {
None => return false,
};
other.__unused_size = self.__unused_size;
// Ignore first_coding_index field for now to be backward compatible.
// TODO remove this once cluster is upgraded to always populate
// first_coding_index field.
other.first_coding_index = self.first_coding_index;
self == &other
}
@@ -275,16 +271,7 @@ impl ErasureMeta {
pub(crate) fn coding_shreds_indices(&self) -> Range<u64> {
let num_coding = self.config.num_coding() as u64;
// first_coding_index == 0 may imply that the field is not populated.
// self.set_index to be backward compatible.
// TODO remove this once cluster is upgraded to always populate
// first_coding_index field.
let first_coding_index = if self.first_coding_index == 0 {
self.set_index
} else {
self.first_coding_index
};
first_coding_index..first_coding_index + num_coding
self.first_coding_index..self.first_coding_index + num_coding
}
pub(crate) fn status(&self, index: &Index) -> ErasureMetaStatus {

View File

@@ -8,6 +8,7 @@ pub mod bigtable_delete;
pub mod bigtable_upload;
pub mod bigtable_upload_service;
pub mod block_error;
mod slot_stats;
#[macro_use]
pub mod blockstore;
pub mod ancestor_iterator;

View File

@@ -504,9 +504,10 @@ impl Shred {
pub(crate) fn first_coding_index(&self) -> Option<u32> {
match self.shred_type() {
ShredType::Data => None,
// TODO should be: self.index() - self.coding_header.position
// once position field is populated.
ShredType::Code => Some(self.fec_set_index()),
ShredType::Code => {
let position = u32::from(self.coding_header.position);
self.index().checked_sub(position)
}
}
}
@@ -536,25 +537,25 @@ impl Shred {
// Returns the block index within the erasure coding set.
fn erasure_block_index(&self) -> Option<usize> {
let index = self.index().checked_sub(self.fec_set_index())?;
let index = usize::try_from(index).ok()?;
match self.shred_type() {
ShredType::Data => Some(index),
ShredType::Data => {
let index = self.index().checked_sub(self.fec_set_index())?;
usize::try_from(index).ok()
}
ShredType::Code => {
// TODO should use first_coding_index once position field is
// populated.
// Assert that the last shred index in the erasure set does not
// overshoot u32.
self.fec_set_index().checked_add(u32::from(
self.coding_header
.num_data_shreds
.max(self.coding_header.num_coding_shreds)
.checked_sub(1)?,
self.coding_header.num_data_shreds.checked_sub(1)?,
))?;
self.first_coding_index()?.checked_add(u32::from(
self.coding_header.num_coding_shreds.checked_sub(1)?,
))?;
let num_data_shreds = usize::from(self.coding_header.num_data_shreds);
let num_coding_shreds = usize::from(self.coding_header.num_coding_shreds);
let position = usize::from(self.coding_header.position);
let fec_set_size = num_data_shreds.checked_add(num_coding_shreds)?;
let index = index.checked_add(num_data_shreds)?;
let index = position.checked_add(num_data_shreds)?;
(index < fec_set_size).then(|| index)
}
}

90
ledger/src/slot_stats.rs Normal file
View File

@@ -0,0 +1,90 @@
use {
crate::blockstore_meta::SlotMeta, bitflags::bitflags, lru::LruCache, solana_sdk::clock::Slot,
};
const SLOTS_STATS_CACHE_CAPACITY: usize = 300;
macro_rules! get_mut_entry (
($cache:expr, $key:expr) => (
match $cache.get_mut(&$key) {
Some(entry) => entry,
None => {
$cache.put($key, SlotStats::default());
$cache.get_mut(&$key).unwrap()
}
}
);
);
#[derive(Copy, Clone, Debug)]
pub(crate) enum ShredSource {
Turbine,
Repaired,
Recovered,
}
bitflags! {
#[derive(Default)]
struct SlotFlags: u8 {
const DEAD = 0b00000001;
const FULL = 0b00000010;
const ROOTED = 0b00000100;
}
}
#[derive(Default)]
struct SlotStats {
flags: SlotFlags,
num_repaired: usize,
num_recovered: usize,
}
pub(crate) struct SlotsStats(LruCache<Slot, SlotStats>);
impl Default for SlotsStats {
fn default() -> Self {
// LruCache::unbounded because capacity is enforced manually.
Self(LruCache::unbounded())
}
}
impl SlotsStats {
pub(crate) fn add_shred(&mut self, slot: Slot, source: ShredSource) {
let entry = get_mut_entry!(self.0, slot);
match source {
ShredSource::Turbine => (),
ShredSource::Repaired => entry.num_repaired += 1,
ShredSource::Recovered => entry.num_recovered += 1,
}
self.maybe_evict_cache();
}
pub(crate) fn set_full(&mut self, slot_meta: &SlotMeta) {
let total_time_ms =
solana_sdk::timing::timestamp().saturating_sub(slot_meta.first_shred_timestamp);
let last_index = slot_meta
.last_index
.and_then(|ix| i64::try_from(ix).ok())
.unwrap_or(-1);
let entry = get_mut_entry!(self.0, slot_meta.slot);
if !entry.flags.contains(SlotFlags::FULL) {
datapoint_info!(
"shred_insert_is_full",
("total_time_ms", total_time_ms, i64),
("slot", slot_meta.slot, i64),
("last_index", last_index, i64),
("num_repaired", entry.num_repaired, i64),
("num_recovered", entry.num_recovered, i64),
);
}
entry.flags |= SlotFlags::FULL;
self.maybe_evict_cache();
}
fn maybe_evict_cache(&mut self) {
while self.0.len() > SLOTS_STATS_CACHE_CAPACITY {
let (_slot, _entry) = self.0.pop_lru().unwrap();
// TODO: submit metrics for (slot, entry).
}
}
}

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-local-cluster"
description = "Blockchain, Rebuilt for Scale"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -16,25 +16,25 @@ itertools = "0.10.3"
log = "0.4.14"
rand = "0.7.0"
rayon = "1.5.1"
solana-client = { path = "../client", version = "=1.10.4" }
solana-config-program = { path = "../programs/config", version = "=1.10.4" }
solana-core = { path = "../core", version = "=1.10.4" }
solana-entry = { path = "../entry", version = "=1.10.4" }
solana-gossip = { path = "../gossip", version = "=1.10.4" }
solana-ledger = { path = "../ledger", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.4" }
solana-streamer = { path = "../streamer", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-client = { path = "../client", version = "=1.10.6" }
solana-config-program = { path = "../programs/config", version = "=1.10.6" }
solana-core = { path = "../core", version = "=1.10.6" }
solana-entry = { path = "../entry", version = "=1.10.6" }
solana-gossip = { path = "../gossip", version = "=1.10.6" }
solana-ledger = { path = "../ledger", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.6" }
solana-streamer = { path = "../streamer", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
tempfile = "3.3.0"
[dev-dependencies]
assert_matches = "1.5.0"
gag = "1.0.0"
serial_test = "0.6.0"
solana-download-utils = { path = "../download-utils", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-download-utils = { path = "../download-utils", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2021"
name = "solana-log-analyzer"
description = "The solana cluster network analysis tool"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -14,8 +14,8 @@ byte-unit = "4.0.14"
clap = "2.33.1"
serde = "1.0.136"
serde_json = "1.0.79"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
[[bin]]
name = "solana-log-analyzer"

View File

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

View File

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

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-merkle-root-bench"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -11,11 +11,11 @@ publish = false
[dependencies]
clap = "2.33.1"
log = "0.4.14"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-metrics"
version = "1.10.4"
version = "1.10.6"
description = "Solana Metrics"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -15,7 +15,7 @@ gethostname = "0.2.3"
lazy_static = "1.4.0"
log = "0.4.14"
reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
[dev-dependencies]
env_logger = "0.9.0"

View File

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-net-shaper"
description = "The solana cluster network shaping tool"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -14,7 +14,7 @@ clap = "2.33.1"
rand = "0.7.0"
serde = "1.0.136"
serde_json = "1.0.79"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[[bin]]
name = "solana-net-shaper"

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-net-utils"
version = "1.10.4"
version = "1.10.6"
description = "Solana Network Utilities"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -19,9 +19,9 @@ rand = "0.7.0"
serde = "1.0.136"
serde_derive = "1.0.103"
socket2 = "0.4.4"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
tokio = { version = "1", features = ["full"] }
url = "2.2.2"

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-perf"
version = "1.10.4"
version = "1.10.6"
description = "Solana Performance APIs"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -22,10 +22,10 @@ log = "0.4.14"
rand = "0.7.0"
rayon = "1.5.1"
serde = "1.0.136"
solana-metrics = { path = "../metrics", version = "=1.10.4" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-metrics = { path = "../metrics", version = "=1.10.6" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
[target."cfg(target_os = \"linux\")".dependencies]
caps = "0.5.3"
@@ -37,7 +37,7 @@ name = "solana_perf"
[dev-dependencies]
matches = "0.1.9"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[[bench]]
name = "sigverify"

View File

@@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
edition = "2021"
name = "solana-poh-bench"
version = "1.10.4"
version = "1.10.6"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
@@ -14,12 +14,12 @@ clap = "2.33.1"
log = "0.4.14"
rand = "0.7.0"
rayon = "1.5.1"
solana-entry = { path = "../entry", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-perf = { path = "../perf", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-version = { path = "../version", version = "=1.10.4" }
solana-entry = { path = "../entry", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-perf = { path = "../perf", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-version = { path = "../version", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-poh"
version = "1.10.4"
version = "1.10.6"
description = "Solana PoH"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -13,21 +13,21 @@ edition = "2021"
core_affinity = "0.5.10"
crossbeam-channel = "0.5"
log = "0.4.14"
solana-entry = { path = "../entry", version = "=1.10.4" }
solana-ledger = { path = "../ledger", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-metrics = { path = "../metrics", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-sys-tuner = { path = "../sys-tuner", version = "=1.10.4" }
solana-entry = { path = "../entry", version = "=1.10.6" }
solana-ledger = { path = "../ledger", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-metrics = { path = "../metrics", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-sys-tuner = { path = "../sys-tuner", version = "=1.10.6" }
thiserror = "1.0"
[dev-dependencies]
bincode = "1.3.3"
matches = "0.1.9"
rand = "0.7.0"
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-perf = { path = "../perf", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-perf = { path = "../perf", version = "=1.10.6" }
[lib]
crate-type = ["lib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-program-runtime"
version = "1.10.4"
version = "1.10.6"
description = "Solana program runtime"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -19,15 +19,15 @@ log = "0.4.14"
num-derive = { version = "0.3" }
num-traits = { version = "0.2" }
serde = { version = "1.0.129", features = ["derive", "rc"] }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.4" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.4" }
solana-measure = { path = "../measure", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.6" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.6" }
solana-measure = { path = "../measure", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
thiserror = "1.0"
enum-iterator = "0.7.0"
[dev-dependencies]
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.6" }
[lib]
crate-type = ["lib"]

View File

@@ -5,7 +5,7 @@ edition = "2021"
license = "Apache-2.0"
name = "solana-program-test"
repository = "https://github.com/solana-labs/solana"
version = "1.10.4"
version = "1.10.6"
[dependencies]
async-trait = "0.1.52"
@@ -14,13 +14,13 @@ bincode = "1.3.3"
chrono-humanize = "0.2.1"
log = "0.4.14"
serde = "1.0.136"
solana-banks-client = { path = "../banks-client", version = "=1.10.4" }
solana-banks-server = { path = "../banks-server", version = "=1.10.4" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.4" }
solana-logger = { path = "../logger", version = "=1.10.4" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.4" }
solana-runtime = { path = "../runtime", version = "=1.10.4" }
solana-sdk = { path = "../sdk", version = "=1.10.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.4" }
solana-banks-client = { path = "../banks-client", version = "=1.10.6" }
solana-banks-server = { path = "../banks-server", version = "=1.10.6" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.6" }
solana-logger = { path = "../logger", version = "=1.10.6" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.6" }
solana-runtime = { path = "../runtime", version = "=1.10.6" }
solana-sdk = { path = "../sdk", version = "=1.10.6" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.6" }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }

View File

@@ -3,7 +3,7 @@
[package]
name = "solana-address-lookup-table-program-tests"
version = "1.10.4"
version = "1.10.6"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
@@ -14,9 +14,9 @@ publish = false
[dev-dependencies]
assert_matches = "1.5.0"
bincode = "1.3.3"
solana-address-lookup-table-program = { path = "../address-lookup-table", version = "=1.10.4" }
solana-program-test = { path = "../../program-test", version = "=1.10.4" }
solana-sdk = { path = "../../sdk", version = "=1.10.4" }
solana-address-lookup-table-program = { path = "../address-lookup-table", version = "=1.10.6" }
solana-program-test = { path = "../../program-test", version = "=1.10.6" }
solana-sdk = { path = "../../sdk", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-address-lookup-table-program"
version = "1.10.4"
version = "1.10.6"
description = "Solana address lookup table program"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -16,14 +16,14 @@ log = "0.4.14"
num-derive = "0.3"
num-traits = "0.2"
serde = { version = "1.0.136", features = ["derive"] }
solana-frozen-abi = { path = "../../frozen-abi", version = "=1.10.4" }
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.10.4" }
solana-program = { path = "../../sdk/program", version = "=1.10.4" }
solana-frozen-abi = { path = "../../frozen-abi", version = "=1.10.6" }
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.10.6" }
solana-program = { path = "../../sdk/program", version = "=1.10.6" }
thiserror = "1.0"
[target.'cfg(not(target_arch = "bpf"))'.dependencies]
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.4" }
solana-sdk = { path = "../../sdk", version = "=1.10.4" }
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.6" }
solana-sdk = { path = "../../sdk", version = "=1.10.6" }
[build-dependencies]
rustc_version = "0.4"

308
programs/bpf/Cargo.lock generated
View File

@@ -2799,7 +2799,7 @@ dependencies = [
[[package]]
name = "solana-account-decoder"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"Inflector",
"base64 0.13.0",
@@ -2820,7 +2820,7 @@ dependencies = [
[[package]]
name = "solana-address-lookup-table-program"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"bytemuck",
@@ -2829,9 +2829,9 @@ dependencies = [
"num-traits",
"rustc_version 0.4.0",
"serde",
"solana-frozen-abi 1.10.4",
"solana-frozen-abi-macro 1.10.4",
"solana-program 1.10.4",
"solana-frozen-abi 1.10.6",
"solana-frozen-abi-macro 1.10.6",
"solana-program 1.10.6",
"solana-program-runtime",
"solana-sdk",
"thiserror",
@@ -2839,12 +2839,12 @@ dependencies = [
[[package]]
name = "solana-banks-client"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"borsh",
"futures",
"solana-banks-interface",
"solana-program 1.10.4",
"solana-program 1.10.6",
"solana-sdk",
"tarpc",
"thiserror",
@@ -2854,7 +2854,7 @@ dependencies = [
[[package]]
name = "solana-banks-interface"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"serde",
"solana-sdk",
@@ -2863,7 +2863,7 @@ dependencies = [
[[package]]
name = "solana-banks-server"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"crossbeam-channel",
@@ -2880,7 +2880,7 @@ dependencies = [
[[package]]
name = "solana-bpf-loader-program"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"byteorder 1.4.3",
@@ -2897,7 +2897,7 @@ dependencies = [
[[package]]
name = "solana-bpf-programs"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"byteorder 1.4.3",
@@ -2912,7 +2912,7 @@ dependencies = [
"solana-bpf-rust-realloc",
"solana-bpf-rust-realloc-invoke",
"solana-cli-output",
"solana-logger 1.10.4",
"solana-logger 1.10.6",
"solana-measure",
"solana-program-runtime",
"solana-runtime",
@@ -2924,171 +2924,171 @@ dependencies = [
[[package]]
name = "solana-bpf-rust-128bit"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-bpf-rust-128bit-dep",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-128bit-dep"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-alloc"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-call-depth"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-caller-access"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-custom-heap"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-dep-crate"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"byteorder 1.4.3",
"solana-address-lookup-table-program",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-deprecated-loader"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-dup-accounts"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-error-handling"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"num-derive",
"num-traits",
"solana-program 1.10.4",
"solana-program 1.10.6",
"thiserror",
]
[[package]]
name = "solana-bpf-rust-external-spend"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-finalize"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-instruction-introspection"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-invoke"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-bpf-rust-invoked",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-invoke-and-error"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-invoke-and-ok"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-invoke-and-return"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-invoked"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-iter"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-log-data"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-many-args"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-bpf-rust-many-args-dep",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-many-args-dep"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-mem"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
"solana-program-runtime",
"solana-program-test",
"solana-sdk",
@@ -3096,84 +3096,84 @@ dependencies = [
[[package]]
name = "solana-bpf-rust-membuiltins"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-bpf-rust-mem",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-noop"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-panic"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-param-passing"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-bpf-rust-param-passing-dep",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-param-passing-dep"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-rand"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"getrandom 0.1.14",
"rand 0.7.3",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-realloc"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-realloc-invoke"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-bpf-rust-realloc",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-ro-account_modify"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-ro-modify"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-sanity"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
"solana-program-runtime",
"solana-program-test",
"solana-sdk",
@@ -3181,52 +3181,52 @@ dependencies = [
[[package]]
name = "solana-bpf-rust-secp256k1-recover"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-sha"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"blake3 1.3.1",
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-sibling-instructions"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-sibling_inner-instructions"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-spoof1"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-spoof1-system"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-sysvar"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
"solana-program-runtime",
"solana-program-test",
"solana-sdk",
@@ -3234,29 +3234,29 @@ dependencies = [
[[package]]
name = "solana-bpf-rust-upgradeable"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-upgraded"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
]
[[package]]
name = "solana-bpf-rust-zk_token_elgamal"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program 1.10.4",
"solana-program 1.10.6",
"solana-zk-token-sdk",
]
[[package]]
name = "solana-bucket-map"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"log",
"memmap2 0.5.3",
@@ -3269,7 +3269,7 @@ dependencies = [
[[package]]
name = "solana-clap-utils"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"chrono",
"clap",
@@ -3285,7 +3285,7 @@ dependencies = [
[[package]]
name = "solana-cli-config"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"dirs-next",
"lazy_static",
@@ -3297,7 +3297,7 @@ dependencies = [
[[package]]
name = "solana-cli-output"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"Inflector",
"base64 0.13.0",
@@ -3319,7 +3319,7 @@ dependencies = [
[[package]]
name = "solana-client"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"async-mutex",
"async-trait",
@@ -3366,7 +3366,7 @@ dependencies = [
[[package]]
name = "solana-compute-budget-program"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"solana-program-runtime",
"solana-sdk",
@@ -3374,7 +3374,7 @@ dependencies = [
[[package]]
name = "solana-config-program"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"chrono",
@@ -3386,7 +3386,7 @@ dependencies = [
[[package]]
name = "solana-faucet"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"byteorder 1.4.3",
@@ -3397,7 +3397,7 @@ dependencies = [
"serde_derive",
"solana-clap-utils",
"solana-cli-config",
"solana-logger 1.10.4",
"solana-logger 1.10.6",
"solana-metrics",
"solana-sdk",
"solana-version",
@@ -3428,7 +3428,7 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bs58 0.4.0",
"bv",
@@ -3442,7 +3442,7 @@ dependencies = [
"serde_bytes",
"serde_derive",
"sha2 0.10.2",
"solana-frozen-abi-macro 1.10.4",
"solana-frozen-abi-macro 1.10.6",
"thiserror",
]
@@ -3460,7 +3460,7 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.6",
@@ -3481,7 +3481,7 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"env_logger 0.9.0",
"lazy_static",
@@ -3490,7 +3490,7 @@ dependencies = [
[[package]]
name = "solana-measure"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"log",
"solana-sdk",
@@ -3498,7 +3498,7 @@ dependencies = [
[[package]]
name = "solana-metrics"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"crossbeam-channel",
"gethostname",
@@ -3510,7 +3510,7 @@ dependencies = [
[[package]]
name = "solana-net-utils"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"clap",
@@ -3521,7 +3521,7 @@ dependencies = [
"serde",
"serde_derive",
"socket2",
"solana-logger 1.10.4",
"solana-logger 1.10.6",
"solana-sdk",
"solana-version",
"tokio",
@@ -3530,7 +3530,7 @@ dependencies = [
[[package]]
name = "solana-perf"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"ahash",
"bincode",
@@ -3590,7 +3590,7 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"base64 0.13.0",
"bincode",
@@ -3621,16 +3621,16 @@ dependencies = [
"serde_derive",
"sha2 0.10.2",
"sha3 0.10.1",
"solana-frozen-abi 1.10.4",
"solana-frozen-abi-macro 1.10.4",
"solana-sdk-macro 1.10.4",
"solana-frozen-abi 1.10.6",
"solana-frozen-abi-macro 1.10.6",
"solana-sdk-macro 1.10.6",
"thiserror",
"wasm-bindgen",
]
[[package]]
name = "solana-program-runtime"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"base64 0.13.0",
"bincode",
@@ -3643,8 +3643,8 @@ dependencies = [
"num-traits",
"rustc_version 0.4.0",
"serde",
"solana-frozen-abi 1.10.4",
"solana-frozen-abi-macro 1.10.4",
"solana-frozen-abi 1.10.6",
"solana-frozen-abi-macro 1.10.6",
"solana-measure",
"solana-sdk",
"thiserror",
@@ -3652,7 +3652,7 @@ dependencies = [
[[package]]
name = "solana-program-test"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"async-trait",
"base64 0.13.0",
@@ -3663,7 +3663,7 @@ dependencies = [
"solana-banks-client",
"solana-banks-server",
"solana-bpf-loader-program",
"solana-logger 1.10.4",
"solana-logger 1.10.6",
"solana-program-runtime",
"solana-runtime",
"solana-sdk",
@@ -3674,7 +3674,7 @@ dependencies = [
[[package]]
name = "solana-rayon-threadlimit"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"lazy_static",
"num_cpus",
@@ -3682,7 +3682,7 @@ dependencies = [
[[package]]
name = "solana-remote-wallet"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"console",
"dialoguer",
@@ -3699,7 +3699,7 @@ dependencies = [
[[package]]
name = "solana-runtime"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"arrayref",
"bincode",
@@ -3733,8 +3733,8 @@ dependencies = [
"solana-bucket-map",
"solana-compute-budget-program",
"solana-config-program",
"solana-frozen-abi 1.10.4",
"solana-frozen-abi-macro 1.10.4",
"solana-frozen-abi 1.10.6",
"solana-frozen-abi-macro 1.10.6",
"solana-measure",
"solana-metrics",
"solana-program-runtime",
@@ -3753,7 +3753,7 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"assert_matches",
"base64 0.13.0",
@@ -3790,11 +3790,11 @@ dependencies = [
"serde_json",
"sha2 0.10.2",
"sha3 0.10.1",
"solana-frozen-abi 1.10.4",
"solana-frozen-abi-macro 1.10.4",
"solana-logger 1.10.4",
"solana-program 1.10.4",
"solana-sdk-macro 1.10.4",
"solana-frozen-abi 1.10.6",
"solana-frozen-abi-macro 1.10.6",
"solana-logger 1.10.6",
"solana-program 1.10.6",
"solana-sdk-macro 1.10.6",
"thiserror",
"uriparse",
"wasm-bindgen",
@@ -3815,7 +3815,7 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bs58 0.4.0",
"proc-macro2 1.0.24",
@@ -3826,7 +3826,7 @@ dependencies = [
[[package]]
name = "solana-send-transaction-service"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"crossbeam-channel",
"log",
@@ -3839,7 +3839,7 @@ dependencies = [
[[package]]
name = "solana-stake-program"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"log",
@@ -3849,8 +3849,8 @@ dependencies = [
"serde",
"serde_derive",
"solana-config-program",
"solana-frozen-abi 1.10.4",
"solana-frozen-abi-macro 1.10.4",
"solana-frozen-abi 1.10.6",
"solana-frozen-abi-macro 1.10.6",
"solana-metrics",
"solana-program-runtime",
"solana-sdk",
@@ -3860,7 +3860,7 @@ dependencies = [
[[package]]
name = "solana-streamer"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"crossbeam-channel",
"futures-util",
@@ -3884,7 +3884,7 @@ dependencies = [
[[package]]
name = "solana-transaction-status"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"Inflector",
"base64 0.13.0",
@@ -3909,20 +3909,20 @@ dependencies = [
[[package]]
name = "solana-version"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"log",
"rustc_version 0.4.0",
"serde",
"serde_derive",
"solana-frozen-abi 1.10.4",
"solana-frozen-abi-macro 1.10.4",
"solana-frozen-abi 1.10.6",
"solana-frozen-abi-macro 1.10.6",
"solana-sdk",
]
[[package]]
name = "solana-vote-program"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bincode",
"log",
@@ -3931,8 +3931,8 @@ dependencies = [
"rustc_version 0.4.0",
"serde",
"serde_derive",
"solana-frozen-abi 1.10.4",
"solana-frozen-abi-macro 1.10.4",
"solana-frozen-abi 1.10.6",
"solana-frozen-abi-macro 1.10.6",
"solana-metrics",
"solana-program-runtime",
"solana-sdk",
@@ -3941,7 +3941,7 @@ dependencies = [
[[package]]
name = "solana-zk-token-proof-program"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"bytemuck",
"getrandom 0.1.14",
@@ -3954,7 +3954,7 @@ dependencies = [
[[package]]
name = "solana-zk-token-sdk"
version = "1.10.4"
version = "1.10.6"
dependencies = [
"aes-gcm-siv",
"arrayref",
@@ -3973,7 +3973,7 @@ dependencies = [
"serde",
"serde_json",
"sha3 0.9.1",
"solana-program 1.10.4",
"solana-program 1.10.6",
"solana-sdk",
"subtle",
"thiserror",

View File

@@ -1,7 +1,7 @@
[package]
name = "solana-bpf-programs"
description = "Blockchain, Rebuilt for Scale"
version = "1.10.4"
version = "1.10.6"
documentation = "https://docs.rs/solana"
homepage = "https://solana.com/"
readme = "README.md"
@@ -26,19 +26,19 @@ itertools = "0.10.1"
log = "0.4.11"
miow = "0.3.6"
net2 = "0.2.37"
solana-bpf-rust-invoke = { path = "rust/invoke", version = "=1.10.4"}
solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.10.4"}
solana-bpf-rust-realloc = { path = "rust/realloc", version = "=1.10.4"}
solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.10.4"}
solana-cli-output = { path = "../../cli-output", version = "=1.10.4" }
solana-logger = { path = "../../logger", version = "=1.10.4" }
solana-measure = { path = "../../measure", version = "=1.10.4" }
solana-bpf-rust-invoke = { path = "rust/invoke", version = "=1.10.6"}
solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.10.6"}
solana-bpf-rust-realloc = { path = "rust/realloc", version = "=1.10.6"}
solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.10.6"}
solana-cli-output = { path = "../../cli-output", version = "=1.10.6" }
solana-logger = { path = "../../logger", version = "=1.10.6" }
solana-measure = { path = "../../measure", version = "=1.10.6" }
solana_rbpf = "=0.2.24"
solana-runtime = { path = "../../runtime", version = "=1.10.4" }
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.4" }
solana-sdk = { path = "../../sdk", version = "=1.10.4" }
solana-transaction-status = { path = "../../transaction-status", version = "=1.10.4" }
solana-account-decoder = { path = "../../account-decoder", version = "=1.10.4" }
solana-runtime = { path = "../../runtime", version = "=1.10.6" }
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.6" }
solana-sdk = { path = "../../sdk", version = "=1.10.6" }
solana-transaction-status = { path = "../../transaction-status", version = "=1.10.6" }
solana-account-decoder = { path = "../../account-decoder", version = "=1.10.6" }
[[bench]]
name = "bpf_loader"

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-128bit"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-128bit"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-128bit-dep"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-128bit-dep"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-alloc"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-alloc"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-call-depth"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-call-depth"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-caller-access"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-caller-access"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-custom-heap"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-custom-heap"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[features]
default = ["custom-heap"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-dep-crate"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -11,9 +11,9 @@ edition = "2021"
[dependencies]
byteorder = { version = "1", default-features = false }
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
# list of crates which must be buildable for bpf programs
solana-address-lookup-table-program = { path = "../../../../programs/address-lookup-table", version = "=1.10.4" }
solana-address-lookup-table-program = { path = "../../../../programs/address-lookup-table", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-deprecated-loader"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-deprecated-loader"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-dup-accounts"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-dup-accounts"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-error-handling"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2021"
[dependencies]
num-derive = "0.3"
num-traits = "0.2"
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
thiserror = "1.0"
[lib]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-external-spend"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-external-spend"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-finalize"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-finalize"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-instruction-introspection"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-instruction-introspection"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-invoke-and-error"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-error"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-invoke-and-ok"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-ok"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-invoke-and-return"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-invoke-and-return"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-iter"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-iter"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-log-data"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-log-data"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[features]
default = ["program"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-many-args"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-many-args"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-many-args-dep"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-many-args-dep"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-membuiltins"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-mem"
edition = "2021"
[dependencies]
solana-bpf-rust-mem = { path = "../mem", version = "=1.10.4", features = [ "no-entrypoint" ] }
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-bpf-rust-mem = { path = "../mem", version = "=1.10.6", features = [ "no-entrypoint" ] }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-noop"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-noop"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-panic"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-panic"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[features]
default = ["custom-panic"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-param-passing"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-bpf-rust-param-passing"
edition = "2021"
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

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

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-rand"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ edition = "2021"
[dependencies]
getrandom = { version = "0.1.14", features = ["dummy"] }
rand = "0.7"
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["cdylib"]

View File

@@ -1,6 +1,6 @@
[package]
name = "solana-bpf-rust-realloc"
version = "1.10.4"
version = "1.10.6"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@@ -14,7 +14,7 @@ default = ["program"]
program = []
[dependencies]
solana-program = { path = "../../../../sdk/program", version = "=1.10.4" }
solana-program = { path = "../../../../sdk/program", version = "=1.10.6" }
[lib]
crate-type = ["lib", "cdylib"]

View File

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

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