Skip to content

Commit

Permalink
Update solana dependency version to allow 2.0.0 (solana-labs#6182)
Browse files Browse the repository at this point in the history 
* Update solana dependency version to allow 2.0.0

* Fix version number in solana-version.sh

* Fix version numbers

* Revert solana-version.sh with note

* Revert Anchor version change

* Relax dependency version upper bound to 2
  • Loading branch information
@willhickey
willhickey authored Jan 26, 2024
1 parent d74ba01 commit 8938033
Show file tree
Hide file tree
Showing 60 changed files with 190 additions and 187 deletions.
2 changes: 1 addition & 1 deletion account-compression/programs/noop/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ cpi = ["no-entrypoint"]
default = []

[dependencies]
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
6 changes: 3 additions & 3 deletions associated-token-account/program-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ version = "0.0.1"
test-sbf = []

[dev-dependencies]
solana-program = "1.17.13"
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program = ">=1.17.13,<=2"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"
spl-associated-token-account = { version = "2", path = "../program", features = ["no-entrypoint"] }
spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] }
spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
2 changes: 1 addition & 1 deletion associated-token-account/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ assert_matches = "1.5.0"
borsh = "0.10"
num-derive = "0.4"
num-traits = "0.2"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] }
spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
thiserror = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion binary-option/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ no-entrypoint = []
test-sbf = []

[dependencies]
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
thiserror = "1.0"
spl-token = {version = "4.0", path = "../../token/program", features = ["no-entrypoint"]}
arrayref = "0.3.7"
Expand Down
6 changes: 3 additions & 3 deletions binary-oracle-pair/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ test-sbf = []
[dependencies]
num-derive = "0.4"
num-traits = "0.2"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] }
thiserror = "1.0"
uint = "0.9"
borsh = "0.10"

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
3 changes: 3 additions & 0 deletions ci/solana-version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
if [[ -n $SOLANA_VERSION ]]; then
solana_version="$SOLANA_VERSION"
else
# This file is now out of sync with the versions in Cargo.toml.
# https://github.com/solana-labs/solana-program-library/pull/6182
# This will require some manual cleanup the next time the version is updated.
solana_version=v1.17.13
fi

Expand Down
6 changes: 3 additions & 3 deletions examples/rust/cross-program-invocation/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ no-entrypoint = []
test-sbf = []

[dependencies]
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
6 changes: 3 additions & 3 deletions examples/rust/custom-heap/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ no-entrypoint = []
test-sbf = []

[dependencies]
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
6 changes: 3 additions & 3 deletions examples/rust/logging/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ no-entrypoint = []
test-sbf = []

[dependencies]
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
6 changes: 3 additions & 3 deletions examples/rust/sysvar/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ no-entrypoint = []
test-sbf = []

[dependencies]
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
6 changes: 3 additions & 3 deletions examples/rust/transfer-lamports/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ no-entrypoint = []
test-sbf = []

[dependencies]
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
6 changes: 3 additions & 3 deletions examples/rust/transfer-tokens/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ no-entrypoint = []
test-sbf = []

[dependencies]
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../../token/program", features = [ "no-entrypoint" ] }

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
6 changes: 3 additions & 3 deletions feature-gate/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ test-sbf = []

[dependencies]
num_enum = "0.7.2"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-program-error = { version = "0.3.0", path = "../../libraries/program-error" }

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
10 changes: 5 additions & 5 deletions feature-proposal/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ edition = "2021"
[dependencies]
chrono = "0.4.33"
clap = "2.33.3"
solana-clap-utils = "1.17.13"
solana-cli-config = "1.17.13"
solana-client = "1.17.13"
solana-logger = "1.17.13"
solana-sdk = "1.17.13"
solana-clap-utils = ">=1.17.13,<=2"
solana-cli-config = ">=1.17.13,<=2"
solana-client = ">=1.17.13,<=2"
solana-logger = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"
spl-feature-proposal = { version = "1.0", path = "../program", features = ["no-entrypoint"] }

[[bin]]
Expand Down
6 changes: 3 additions & 3 deletions feature-proposal/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ test-sbf = []

[dependencies]
borsh = "0.10"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] }

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
2 changes: 1 addition & 1 deletion governance/addin-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ edition = "2021"
[dependencies]
borsh = "0.10"
spl-governance-tools = { version = "0.1.4", path = "../tools" }
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
6 changes: 3 additions & 3 deletions governance/addin-mock/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ num-derive = "0.4"
num-traits = "0.2"
serde = "1.0.195"
serde_derive = "1.0.103"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../../token/program", features = [
"no-entrypoint",
] }
Expand All @@ -31,8 +31,8 @@ thiserror = "1.0"
[dev-dependencies]
assert_matches = "1.5.0"
proptest = "1.4"
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"
spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" }


Expand Down
6 changes: 3 additions & 3 deletions governance/chat/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ num-derive = "0.4"
num-traits = "0.2"
serde = "1.0.195"
serde_derive = "1.0.103"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../../token/program", features = [
"no-entrypoint",
] }
Expand All @@ -34,8 +34,8 @@ thiserror = "1.0"
[dev-dependencies]
assert_matches = "1.5.0"
proptest = "1.4"
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"
spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" }
spl-governance-addin-mock = { version = "0.1.4", path = "../../addin-mock/program" }

Expand Down
6 changes: 3 additions & 3 deletions governance/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ num-derive = "0.4"
num-traits = "0.2"
serde = "1.0.195"
serde_derive = "1.0.103"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../token/program", features = [
"no-entrypoint",
] }
Expand All @@ -31,8 +31,8 @@ thiserror = "1.0"
assert_matches = "1.5.0"
base64 = "0.21"
proptest = "1.4"
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"
spl-governance-test-sdk = { version = "0.1.4", path = "../test-sdk" }
spl-governance-addin-mock = { version = "0.1.4", path = "../addin-mock/program" }

Expand Down
6 changes: 3 additions & 3 deletions governance/test-sdk/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ num-derive = "0.4"
num-traits = "0.2"
serde = "1.0.195"
serde_derive = "1.0.103"
solana-program = "1.17.13"
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program = ">=1.17.13,<=2"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../token/program", features = [
"no-entrypoint",
] }
Expand Down
2 changes: 1 addition & 1 deletion governance/tools/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ num-derive = "0.4"
num-traits = "0.2"
serde = "1.0.195"
serde_derive = "1.0.103"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-token = { version = "4.0", path = "../../token/program", features = [
"no-entrypoint",
] }
Expand Down
6 changes: 3 additions & 3 deletions instruction-padding/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ test-sbf = []

[dependencies]
num_enum = "0.7.2"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"

[dev-dependencies]
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
2 changes: 1 addition & 1 deletion libraries/discriminator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ borsh = ["dep:borsh"]
[dependencies]
borsh = { version = "0.10", optional = true }
bytemuck = { version = "1.14.1", features = ["derive"] }
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-discriminator-derive = { version = "0.1.0", path = "./derive" }

[lib]
Expand Down
6 changes: 3 additions & 3 deletions libraries/math/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ test-sbf = []
borsh = "0.10"
num-derive = "0.4"
num-traits = "0.2"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
thiserror = "1.0"
uint = "0.9"

[dev-dependencies]
proptest = "1.4.0"
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"
libm = "0.2.8"

[lib]
Expand Down
4 changes: 2 additions & 2 deletions libraries/pod/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ base64 = { version = "0.21.7", optional = true }
borsh = { version = "0.10", optional = true }
bytemuck = { version = "1.14.1" }
serde = { version = "1.0.195", optional = true }
solana-program = "1.17.13"
solana-zk-token-sdk = "1.17.13"
solana-program = ">=1.17.13,<=2"
solana-zk-token-sdk = ">=1.17.13,<=2"
spl-program-error = { version = "0.3", path = "../program-error" }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions libraries/program-error/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ edition = "2021"
[dependencies]
num-derive = "0.4"
num-traits = "0.2"
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-program-error-derive = { version = "0.3.1", path = "./derive" }
thiserror = "1.0"

[dev-dependencies]
lazy_static = "1.4"
serial_test = "3.0"
solana-sdk = "1.17.13"
solana-sdk = ">=1.17.13,<=2"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
8 changes: 4 additions & 4 deletions libraries/tlv-account-resolution/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test-sbf = []
[dependencies]
bytemuck = { version = "1.14.1", features = ["derive"] }
serde = { version = "1.0.195", optional = true }
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-discriminator = { version = "0.1", path = "../discriminator" }
spl-program-error = { version = "0.3", path = "../program-error" }
spl-type-length-value = { version = "0.3", path = "../type-length-value" }
Expand All @@ -23,9 +23,9 @@ spl-pod = { version = "0.1", path = "../pod" }
[dev-dependencies]
futures = "0.3.30"
futures-util = "0.3"
solana-client = "1.17.13"
solana-program-test = "1.17.13"
solana-sdk = "1.17.13"
solana-client = ">=1.17.13,<=2"
solana-program-test = ">=1.17.13,<=2"
solana-sdk = ">=1.17.13,<=2"
spl-discriminator = { version = "0.1", path = "../discriminator" }

[lib]
Expand Down
2 changes: 1 addition & 1 deletion libraries/type-length-value/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ derive = ["dep:spl-type-length-value-derive"]

[dependencies]
bytemuck = { version = "1.14.1", features = ["derive"] }
solana-program = "1.17.13"
solana-program = ">=1.17.13,<=2"
spl-discriminator = { version = "0.1", path = "../discriminator" }
spl-program-error = { version = "0.3", path = "../program-error" }
spl-type-length-value-derive = { version = "0.1", path = "./derive", optional = true }
Expand Down
Loading

0 comments on commit 8938033

Please sign in to comment.