Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v1.10' into v1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@buffalu
buffalu committed Oct 4, 2022
2 parents 890808f + 583a53e commit a10ddce
Show file tree
Hide file tree
Showing 153 changed files with 9,215 additions and 1,352 deletions.
895 changes: 447 additions & 448 deletions Cargo.lock
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions account-decoder/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-account-decoder"
version = "1.10.40"
version = "1.10.41"
description = "Solana account decoder"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -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.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.40" }
solana-config-program = { path = "../programs/config", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.41" }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] }
thiserror = "1.0"
Expand Down
12 changes: 6 additions & 6 deletions accounts-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-accounts-bench"
version = "1.10.40"
version = "1.10.41"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -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.40" }
solana-measure = { path = "../measure", version = "=1.10.40" }
solana-runtime = { path = "../runtime", version = "=1.10.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-version = { path = "../version", version = "=1.10.40" }
solana-logger = { path = "../logger", version = "=1.10.41" }
solana-measure = { path = "../measure", version = "=1.10.41" }
solana-runtime = { path = "../runtime", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
solana-version = { path = "../version", version = "=1.10.41" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
34 changes: 17 additions & 17 deletions accounts-cluster-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-accounts-cluster-bench"
version = "1.10.40"
version = "1.10.41"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -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.40" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.40" }
solana-client = { path = "../client", version = "=1.10.40" }
solana-faucet = { path = "../faucet", version = "=1.10.40" }
solana-gossip = { path = "../gossip", version = "=1.10.40" }
solana-logger = { path = "../logger", version = "=1.10.40" }
solana-measure = { path = "../measure", version = "=1.10.40" }
solana-net-utils = { path = "../net-utils", version = "=1.10.40" }
solana-runtime = { path = "../runtime", version = "=1.10.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-streamer = { path = "../streamer", version = "=1.10.40" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.40" }
solana-version = { path = "../version", version = "=1.10.40" }
solana-account-decoder = { path = "../account-decoder", version = "=1.10.41" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.41" }
solana-client = { path = "../client", version = "=1.10.41" }
solana-faucet = { path = "../faucet", version = "=1.10.41" }
solana-gossip = { path = "../gossip", version = "=1.10.41" }
solana-logger = { path = "../logger", version = "=1.10.41" }
solana-measure = { path = "../measure", version = "=1.10.41" }
solana-net-utils = { path = "../net-utils", version = "=1.10.41" }
solana-runtime = { path = "../runtime", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
solana-streamer = { path = "../streamer", version = "=1.10.41" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.41" }
solana-version = { path = "../version", version = "=1.10.41" }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }

[dev-dependencies]
solana-core = { path = "../core", version = "=1.10.40" }
solana-local-cluster = { path = "../local-cluster", version = "=1.10.40" }
solana-test-validator = { path = "../test-validator", version = "=1.10.40" }
solana-core = { path = "../core", version = "=1.10.41" }
solana-local-cluster = { path = "../local-cluster", version = "=1.10.41" }
solana-test-validator = { path = "../test-validator", version = "=1.10.41" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
26 changes: 13 additions & 13 deletions banking-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-banking-bench"
version = "1.10.40"
version = "1.10.41"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -14,18 +14,18 @@ crossbeam-channel = "0.5"
log = "0.4.14"
rand = "0.7.0"
rayon = "1.5.1"
solana-client = { path = "../client", version = "=1.10.40" }
solana-core = { path = "../core", version = "=1.10.40" }
solana-gossip = { path = "../gossip", version = "=1.10.40" }
solana-ledger = { path = "../ledger", version = "=1.10.40" }
solana-logger = { path = "../logger", version = "=1.10.40" }
solana-measure = { path = "../measure", version = "=1.10.40" }
solana-perf = { path = "../perf", version = "=1.10.40" }
solana-poh = { path = "../poh", version = "=1.10.40" }
solana-runtime = { path = "../runtime", version = "=1.10.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-streamer = { path = "../streamer", version = "=1.10.40" }
solana-version = { path = "../version", version = "=1.10.40" }
solana-client = { path = "../client", version = "=1.10.41" }
solana-core = { path = "../core", version = "=1.10.41" }
solana-gossip = { path = "../gossip", version = "=1.10.41" }
solana-ledger = { path = "../ledger", version = "=1.10.41" }
solana-logger = { path = "../logger", version = "=1.10.41" }
solana-measure = { path = "../measure", version = "=1.10.41" }
solana-perf = { path = "../perf", version = "=1.10.41" }
solana-poh = { path = "../poh", version = "=1.10.41" }
solana-runtime = { path = "../runtime", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
solana-streamer = { path = "../streamer", version = "=1.10.41" }
solana-version = { path = "../version", version = "=1.10.41" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
12 changes: 6 additions & 6 deletions banks-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-banks-client"
version = "1.10.40"
version = "1.10.41"
description = "Solana banks client"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -12,17 +12,17 @@ edition = "2021"
[dependencies]
borsh = "0.9.3"
futures = "0.3"
solana-banks-interface = { path = "../banks-interface", version = "=1.10.40" }
solana-program = { path = "../sdk/program", version = "=1.10.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-banks-interface = { path = "../banks-interface", version = "=1.10.41" }
solana-program = { path = "../sdk/program", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
tarpc = { version = "0.27.2", features = ["full"] }
thiserror = "1.0"
tokio = { version = "~1.14.1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }

[dev-dependencies]
solana-banks-server = { path = "../banks-server", version = "=1.10.40" }
solana-runtime = { path = "../runtime", version = "=1.10.40" }
solana-banks-server = { path = "../banks-server", version = "=1.10.41" }
solana-runtime = { path = "../runtime", version = "=1.10.41" }

[lib]
crate-type = ["lib"]
Expand Down
4 changes: 2 additions & 2 deletions banks-interface/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-banks-interface"
version = "1.10.40"
version = "1.10.41"
description = "Solana banks RPC interface"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -11,7 +11,7 @@ edition = "2021"

[dependencies]
serde = { version = "1.0.136", features = ["derive"] }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
tarpc = { version = "0.27.2", features = ["full"] }

[lib]
Expand Down
16 changes: 8 additions & 8 deletions banks-server/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-banks-server"
version = "1.10.40"
version = "1.10.41"
description = "Solana banks server"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -13,19 +13,19 @@ edition = "2021"
bincode = "1.3.3"
crossbeam-channel = "0.5"
futures = "0.3"
solana-banks-interface = { path = "../banks-interface", version = "=1.10.40" }
solana-client = { path = "../client", version = "=1.10.40" }
solana-gossip = { path = "../gossip", version = "=1.10.40" }
solana-runtime = { path = "../runtime", version = "=1.10.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.40" }
solana-banks-interface = { path = "../banks-interface", version = "=1.10.41" }
solana-client = { path = "../client", version = "=1.10.41" }
solana-gossip = { path = "../gossip", version = "=1.10.41" }
solana-runtime = { path = "../runtime", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.41" }
tarpc = { version = "0.27.2", features = ["full"] }
tokio = { version = "1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }
tokio-stream = "0.1"

[dev-dependencies]
solana-streamer = { path = "../streamer", version = "=1.10.40" }
solana-streamer = { path = "../streamer", version = "=1.10.41" }

[lib]
crate-type = ["lib"]
Expand Down
8 changes: 4 additions & 4 deletions bench-streamer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-bench-streamer"
version = "1.10.40"
version = "1.10.41"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -11,9 +11,9 @@ publish = false
[dependencies]
clap = "2.33.1"
crossbeam-channel = "0.5"
solana-net-utils = { path = "../net-utils", version = "=1.10.40" }
solana-streamer = { path = "../streamer", version = "=1.10.40" }
solana-version = { path = "../version", version = "=1.10.40" }
solana-net-utils = { path = "../net-utils", version = "=1.10.41" }
solana-streamer = { path = "../streamer", version = "=1.10.41" }
solana-version = { path = "../version", version = "=1.10.41" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
38 changes: 19 additions & 19 deletions bench-tps/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-bench-tps"
version = "1.10.40"
version = "1.10.41"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -15,28 +15,28 @@ log = "0.4.14"
rayon = "1.5.1"
serde_json = "1.0.79"
serde_yaml = "0.8.23"
solana-clap-utils = { path = "../clap-utils", version = "=1.10.40" }
solana-cli-config = { path = "../cli-config", version = "=1.10.40" }
solana-client = { path = "../client", version = "=1.10.40" }
solana-core = { path = "../core", version = "=1.10.40" }
solana-faucet = { path = "../faucet", version = "=1.10.40" }
solana-genesis = { path = "../genesis", version = "=1.10.40" }
solana-gossip = { path = "../gossip", version = "=1.10.40" }
solana-logger = { path = "../logger", version = "=1.10.40" }
solana-measure = { path = "../measure", version = "=1.10.40" }
solana-metrics = { path = "../metrics", version = "=1.10.40" }
solana-net-utils = { path = "../net-utils", version = "=1.10.40" }
solana-rpc = { path = "../rpc", version = "=1.10.40" }
solana-runtime = { path = "../runtime", version = "=1.10.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-streamer = { path = "../streamer", version = "=1.10.40" }
solana-version = { path = "../version", version = "=1.10.40" }
solana-clap-utils = { path = "../clap-utils", version = "=1.10.41" }
solana-cli-config = { path = "../cli-config", version = "=1.10.41" }
solana-client = { path = "../client", version = "=1.10.41" }
solana-core = { path = "../core", version = "=1.10.41" }
solana-faucet = { path = "../faucet", version = "=1.10.41" }
solana-genesis = { path = "../genesis", version = "=1.10.41" }
solana-gossip = { path = "../gossip", version = "=1.10.41" }
solana-logger = { path = "../logger", version = "=1.10.41" }
solana-measure = { path = "../measure", version = "=1.10.41" }
solana-metrics = { path = "../metrics", version = "=1.10.41" }
solana-net-utils = { path = "../net-utils", version = "=1.10.41" }
solana-rpc = { path = "../rpc", version = "=1.10.41" }
solana-runtime = { path = "../runtime", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
solana-streamer = { path = "../streamer", version = "=1.10.41" }
solana-version = { path = "../version", version = "=1.10.41" }
thiserror = "1.0"

[dev-dependencies]
serial_test = "0.6.0"
solana-local-cluster = { path = "../local-cluster", version = "=1.10.40" }
solana-test-validator = { path = "../test-validator", version = "=1.10.40" }
solana-local-cluster = { path = "../local-cluster", version = "=1.10.41" }
solana-test-validator = { path = "../test-validator", version = "=1.10.41" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
8 changes: 4 additions & 4 deletions bloom/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-bloom"
version = "1.10.40"
version = "1.10.41"
description = "Solana bloom filter"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -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.40" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.41" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }

[lib]
crate-type = ["lib"]
Expand Down
8 changes: 4 additions & 4 deletions bucket_map/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-bucket-map"
version = "1.10.40"
version = "1.10.41"
description = "solana-bucket-map"
homepage = "https://solana.com/"
documentation = "https://docs.rs/solana-bucket-map"
Expand All @@ -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.40" }
solana-sdk = { path = "../sdk", version = "=1.10.40" }
solana-measure = { path = "../measure", version = "=1.10.41" }
solana-sdk = { path = "../sdk", version = "=1.10.41" }
tempfile = "3.3.0"

[dev-dependencies]
fs_extra = "1.2.0"
rayon = "1.5.0"
solana-logger = { path = "../logger", version = "=1.10.40" }
solana-logger = { path = "../logger", version = "=1.10.41" }

[lib]
crate-type = ["lib"]
Expand Down
27 changes: 27 additions & 0 deletions ci/check-channel-version.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Ensure the current channel version is not equal ("greater") than
# the version of the latest tag
if [[ -z $CI_TAG ]]; then
echo "--- channel version check"
(
eval "$(ci/channel-info.sh)"

if [[ -n $CHANNEL_LATEST_TAG ]]; then
source scripts/read-cargo-variable.sh

version=$(readCargoVariable version "version/Cargo.toml")
echo "latest channel tag: $CHANNEL_LATEST_TAG"
echo "current version: v$version"

if [[ $CHANNEL_LATEST_TAG = v$version ]]; then
echo -e "\033[31mError:\033[0m A release has been tagged since your feature branch was last rebased. <current version> must be greater than <latest channel tag>..
Possible solutions (in the order they should be tried):
1. rebase your feature branch on the base branch
2. merge the PR: \"Bump Version to ...\" once it has passed ci/checks, then rebase
3. ask for help in #devops on discord"
exit 1
fi
else
echo "Skipped. CHANNEL_LATEST_TAG (CHANNEL=$CHANNEL) unset"
fi
)
fi
Loading

0 comments on commit a10ddce

Please sign in to comment.