Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

bump solana to v1.10.26 #3274

Merged
merged 1 commit into from
Jun 20, 2022
Merged

bump solana to v1.10.26 #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
226 changes: 114 additions & 112 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ci/solana-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
if [[ -n $SOLANA_VERSION ]]; then
solana_version="$SOLANA_VERSION"
else
solana_version=v1.10.19
solana_version=v1.10.26
fi

export solana_version="$solana_version"
Expand Down
6 changes: 3 additions & 3 deletions shared-memory/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ test-bpf = []

[dependencies]
arrayref = "0.3.6"
solana-program = "=1.10.19"
solana-program = "=1.10.26"

[dev-dependencies]
solana-program-test = "=1.10.19"
solana-sdk = "=1.10.19"
solana-program-test = "=1.10.26"
solana-sdk = "=1.10.26"

[lib]
crate-type = ["cdylib", "lib"]
18 changes: 9 additions & 9 deletions stake-pool/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ clap = "2.33.3"
serde = "1.0.130"
serde_derive = "1.0.130"
serde_json = "1.0.68"
solana-account-decoder = "=1.10.19"
solana-clap-utils = "=1.10.19"
solana-cli-config = "=1.10.19"
solana-cli-output = "=1.10.19"
solana-client = "=1.10.19"
solana-logger = "=1.10.19"
solana-program = "=1.10.19"
solana-remote-wallet = "=1.10.19"
solana-sdk = "=1.10.19"
solana-account-decoder = "=1.10.26"
solana-clap-utils = "=1.10.26"
solana-cli-config = "=1.10.26"
solana-cli-output = "=1.10.26"
solana-client = "=1.10.26"
solana-logger = "=1.10.26"
solana-program = "=1.10.26"
solana-remote-wallet = "=1.10.26"
solana-sdk = "=1.10.26"
spl-associated-token-account = { version = "=1.0.5", path="../../associated-token-account/program", features = [ "no-entrypoint" ] }
spl-stake-pool = { version = "=0.6.4", path="../program", features = [ "no-entrypoint" ] }
spl-token = { version = "=3.3.0", path="../../token/program", features = [ "no-entrypoint" ] }
Expand Down
8 changes: 4 additions & 4 deletions stake-pool/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ num-traits = "0.2"
num_enum = "0.5.4"
serde = "1.0.130"
serde_derive = "1.0.103"
solana-program = "1.10.19"
solana-program = "1.10.26"
spl-math = { version = "0.1", path = "../../libraries/math", features = [ "no-entrypoint" ] }
spl-token = { version = "3.3", path = "../../token/program", features = [ "no-entrypoint" ] }
thiserror = "1.0"
bincode = "1.3.1"

[dev-dependencies]
proptest = "1.0"
solana-program-test = "1.10.19"
solana-sdk = "1.10.19"
solana-vote-program = "1.10.19"
solana-program-test = "1.10.26"
solana-sdk = "1.10.26"
solana-vote-program = "1.10.26"

[lib]
crate-type = ["cdylib", "lib"]
12 changes: 6 additions & 6 deletions token-lending/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ version = "0.2.0"

[dependencies]
clap = "2.33.3"
solana-clap-utils = "=1.10.19"
solana-cli-config = "=1.10.19"
solana-client = "=1.10.19"
solana-logger = "=1.10.19"
solana-sdk = "=1.10.19"
solana-program = "=1.10.19"
solana-clap-utils = "=1.10.26"
solana-cli-config = "=1.10.26"
solana-client = "=1.10.26"
solana-logger = "=1.10.26"
solana-sdk = "=1.10.26"
solana-program = "=1.10.26"
spl-token-lending = { version = "0.2", path="../program", features = [ "no-entrypoint" ] }
spl-token = { version = "3.3", path="../../token/program", features = [ "no-entrypoint" ] }

Expand Down
6 changes: 3 additions & 3 deletions token-lending/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ arrayref = "0.3.6"
bytemuck = "1.7.2"
num-derive = "0.3"
num-traits = "0.2"
solana-program = "1.10.19"
solana-program = "1.10.26"
spl-token = { version = "3.3", path = "../../token/program", features = [ "no-entrypoint" ] }
thiserror = "1.0"
uint = "0.9"
Expand All @@ -26,8 +26,8 @@ assert_matches = "1.5.0"
base64 = "0.13"
log = "0.4.14"
proptest = "1.0"
solana-program-test = "1.10.19"
solana-sdk = "1.10.19"
solana-program-test = "1.10.26"
solana-sdk = "1.10.26"
serde = "1.0"
serde_yaml = "0.8"

Expand Down
20 changes: 10 additions & 10 deletions token/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ indicatif = "0.16.2"
serde = "1.0.130"
serde_derive = "1.0.103"
serde_json = "1.0.68"
solana-account-decoder = "=1.10.19"
solana-clap-utils = "=1.10.19"
solana-cli-config = "=1.10.19"
solana-cli-output = "=1.10.19"
solana-client = "=1.10.19"
solana-logger = "=1.10.19"
solana-remote-wallet = "=1.10.19"
solana-sdk = "=1.10.19"
solana-transaction-status = "=1.10.19"
solana-account-decoder = "=1.10.26"
solana-clap-utils = "=1.10.26"
solana-cli-config = "=1.10.26"
solana-cli-output = "=1.10.26"
solana-client = "=1.10.26"
solana-logger = "=1.10.26"
solana-remote-wallet = "=1.10.26"
solana-sdk = "=1.10.26"
solana-transaction-status = "=1.10.26"
spl-token = { version = "3.3", path="../program", features = [ "no-entrypoint" ] }
spl-associated-token-account = { version = "1.0.5", path="../../associated-token-account/program", features = [ "no-entrypoint" ] }
spl-memo = { version = "3.0.1", path="../../memo/program", features = ["no-entrypoint"] }
strum = "0.24"
strum_macros = "0.24"

[dev-dependencies]
solana-test-validator = "=1.10.19"
solana-test-validator = "=1.10.26"
assert_cmd = "2.0.4"

[[bin]]
Expand Down
6 changes: 3 additions & 3 deletions token/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ version = "0.1.0"

[dependencies]
async-trait = "0.1"
solana-client = "=1.10.19"
solana-program-test = "=1.10.19"
solana-sdk = "=1.10.19"
solana-client = "=1.10.26"
solana-program-test = "=1.10.26"
solana-sdk = "=1.10.26"
# We never want the entrypoint for ATA, but we want the entrypoint for token when
# testing token
spl-associated-token-account = { version = "1.0.5", path = "../../associated-token-account/program", features = ["no-entrypoint"] }
Expand Down
6 changes: 3 additions & 3 deletions token/program-2022-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ walkdir = "2"

[dev-dependencies]
async-trait = "0.1"
solana-program = "=1.10.19"
solana-program-test = "=1.10.19"
solana-sdk = "=1.10.19"
solana-program = "=1.10.26"
solana-program-test = "=1.10.26"
solana-sdk = "=1.10.26"
spl-associated-token-account = { version = "1.0.5", path = "../../associated-token-account/program" }
spl-memo = { version = "3.0.1", path = "../../memo/program", features = ["no-entrypoint"] }
spl-token-2022 = { version = "0.4", path="../program-2022", features = ["no-entrypoint"] }
Expand Down
8 changes: 4 additions & 4 deletions token/program-2022/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ bytemuck = { version = "1.7.2", features = ["derive"] }
num-derive = "0.3"
num-traits = "0.2"
num_enum = "0.5.4"
solana-program = "1.10.19"
solana-zk-token-sdk = "1.10.19"
solana-program = "1.10.26"
solana-zk-token-sdk = "1.10.26"
spl-memo = { version = "3.0.1", path = "../../memo/program", features = [ "no-entrypoint" ] }
spl-token = { version = "3.3", path = "../program", features = ["no-entrypoint"] }
thiserror = "1.0"
Expand All @@ -31,8 +31,8 @@ thiserror = "1.0"
lazy_static = "1.4.0"
proptest = "1.0"
serial_test = "0.5.1"
solana-program-test = "1.10.19"
solana-sdk = "1.10.19"
solana-program-test = "1.10.26"
solana-sdk = "1.10.26"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down