Skip to content

Commit 9439496

Browse files
authored
deps: Bump to Solana v2.2 (#44)
* deps: Bump to Solana v2.2 #### Problem The repo is still on v2.1 Solana #### Summary of changes Bump everything to v2.2 * Appease clippy * Enable borsh feature on type-length-value with derive * Update borsh deps and clippy lints
1 parent 795b84c commit 9439496

11 files changed

Lines changed: 1672 additions & 830 deletions

File tree

Cargo.lock

Lines changed: 1638 additions & 796 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ members = [
1010
]
1111

1212
[workspace.metadata.cli]
13-
solana = "2.1.0"
13+
solana = "2.2.0"
1414

1515
# Specify Rust toolchains for rustfmt, clippy, and build.
1616
# Any unprovided toolchains default to stable.
1717
[workspace.metadata.toolchains]
18-
format = "nightly-2024-08-08"
19-
lint = "nightly-2024-08-08"
18+
format = "nightly-2024-11-22"
19+
lint = "nightly-2024-11-22"
2020

2121
[workspace.metadata.spellcheck]
2222
config = "scripts/spellcheck.toml"

discriminator/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ borsh = ["dep:borsh"]
1313
[dependencies]
1414
borsh = { version = "1", optional = true, features = ["derive"] }
1515
bytemuck = { version = "1.22.0", features = ["derive"] }
16-
solana-program-error = "2.1.0"
17-
solana-sha256-hasher = "2.1.0"
16+
solana-program-error = "2.2.1"
17+
solana-sha256-hasher = "2.2.1"
1818
spl-discriminator-derive = { version = "0.2.0", path = "./derive" }
1919

2020
[dev-dependencies]

pod/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ edition = "2021"
99

1010
[features]
1111
serde-traits = ["dep:serde"]
12-
borsh = ["dep:borsh"]
12+
borsh = ["dep:borsh", "solana-pubkey/borsh"]
1313

1414
[dependencies]
15-
borsh = { version = "1.5.5", optional = true }
15+
borsh = { version = "1.5.5", features = ["derive", "unstable__schema"], optional = true }
1616
bytemuck = { version = "1.22.0" }
1717
bytemuck_derive = { version = "1.8.1" }
1818
num-derive = "0.4"
1919
num-traits = "0.2"
2020
serde = { version = "1.0.218", optional = true }
21-
solana-decode-error = "2.1.0"
22-
solana-msg = "2.1.0"
23-
solana-program-error = "2.1.0"
24-
solana-program-option = "2.1.0"
25-
solana-pubkey = "2.1.0"
26-
solana-zk-sdk = "2.1.0"
21+
solana-decode-error = "2.2.1"
22+
solana-msg = "2.2.1"
23+
solana-program-error = "2.2.1"
24+
solana-program-option = "2.2.1"
25+
solana-pubkey = "2.2.1"
26+
solana-zk-sdk = "2.2.0"
2727
thiserror = "2.0"
2828

2929
[dev-dependencies]

pod/src/optional_keys.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl Serialize for OptionalNonZeroPubkey {
9292
struct OptionalNonZeroPubkeyVisitor;
9393

9494
#[cfg(feature = "serde-traits")]
95-
impl<'de> Visitor<'de> for OptionalNonZeroPubkeyVisitor {
95+
impl Visitor<'_> for OptionalNonZeroPubkeyVisitor {
9696
type Value = OptionalNonZeroPubkey;
9797

9898
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -183,7 +183,7 @@ impl Serialize for OptionalNonZeroElGamalPubkey {
183183
struct OptionalNonZeroElGamalPubkeyVisitor;
184184

185185
#[cfg(feature = "serde-traits")]
186-
impl<'de> Visitor<'de> for OptionalNonZeroElGamalPubkeyVisitor {
186+
impl Visitor<'_> for OptionalNonZeroElGamalPubkeyVisitor {
187187
type Value = OptionalNonZeroElGamalPubkey;
188188

189189
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

program-error/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010
[dependencies]
1111
num-derive = "0.4"
1212
num-traits = "0.2"
13-
solana-program = "2.1.0"
13+
solana-program = "2.2.1"
1414
spl-program-error-derive = { version = "0.4.1", path = "./derive" }
1515
thiserror = "2.0"
1616

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.81.0"
2+
channel = "1.84.1"

tlv-account-resolution/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ bytemuck = { version = "1.22.0", features = ["derive"] }
1616
num-derive = "0.4"
1717
num-traits = "0.2"
1818
serde = { version = "1.0.218", optional = true }
19-
solana-account-info = "2.1.0"
20-
solana-decode-error = "2.1.0"
21-
solana-instruction = { version = "2.1.0", features = ["std"] }
22-
solana-program-error = "2.1.0"
23-
solana-msg = "2.1.0"
24-
solana-pubkey = "2.1.0"
19+
solana-account-info = "2.2.1"
20+
solana-decode-error = "2.2.1"
21+
solana-instruction = { version = "2.2.1", features = ["std"] }
22+
solana-program-error = "2.2.1"
23+
solana-msg = "2.2.1"
24+
solana-pubkey = "2.2.1"
2525
spl-discriminator = { version = "0.4.0", path = "../discriminator" }
2626
spl-program-error = { version = "0.6.0", path = "../program-error" }
2727
spl-pod = { version = "0.5.0", path = "../pod" }
@@ -31,9 +31,9 @@ thiserror = "2.0"
3131
[dev-dependencies]
3232
futures = "0.3.31"
3333
futures-util = "0.3"
34-
solana-client = "2.1.0"
35-
solana-program-test = "2.1.13"
36-
solana-sdk = "2.1.0"
34+
solana-client = "2.2.0"
35+
solana-program-test = "2.2.0"
36+
solana-sdk = "2.2.1"
3737

3838
[lib]
3939
crate-type = ["cdylib", "lib"]

type-length-value-derive-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ publish = false
1010

1111
[dev-dependencies]
1212
borsh = "1.5.5"
13-
solana-borsh = "2.1.0"
13+
solana-borsh = "2.2.1"
1414
spl-discriminator = { version = "0.4.0", path = "../discriminator" }
1515
spl-type-length-value = { version = "0.7.0", path = "../type-length-value", features = [
1616
"derive",

type-length-value/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ edition = "2021"
99
exclude = ["js/**"]
1010

1111
[features]
12-
derive = ["dep:spl-type-length-value-derive"]
12+
derive = ["dep:spl-type-length-value-derive", "solana-program-error/borsh"]
1313

1414
[dependencies]
1515
bytemuck = { version = "1.22.0", features = ["derive"] }
1616
num-derive = "0.4"
1717
num-traits = "0.2"
18-
solana-account-info = "2.1.0"
19-
solana-decode-error = "2.1.0"
20-
solana-msg = "2.1.0"
21-
solana-program-error = "2.1.0"
18+
solana-account-info = "2.2.1"
19+
solana-decode-error = "2.2.1"
20+
solana-msg = "2.2.1"
21+
solana-program-error = "2.2.1"
2222
spl-discriminator = { version = "0.4.0", path = "../discriminator" }
2323
spl-type-length-value-derive = { version = "0.1", path = "./derive", optional = true }
2424
spl-pod = { version = "0.5.0", path = "../pod" }

0 commit comments

Comments
 (0)