Skip to content

Commit 5ab36f9

Browse files
committed
Update Solana dependencies to latest versions and fix Borsh serialization
1 parent df8576d commit 5ab36f9

File tree

2 files changed

+33
-30
lines changed

2 files changed

+33
-30
lines changed

Cargo.toml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,41 @@ license = "WTFPL"
66
publish = false
77

88
[dependencies]
9-
borsh = "0.9"
9+
borsh = "1.5.5"
1010
clap = "2.33.3"
1111
lazy_static = "1.4.0"
12-
serde = { version = "1.0.125", features = ["derive"] }
13-
serde_yaml = "0.8.17"
14-
solana-clap-utils = "1.14.*"
15-
solana-cli-config = "1.14.*"
16-
solana-client = "1.14.*"
17-
solana-logger ="1.14.*"
18-
solana-remote-wallet = { version = "1.14.*", optional = true }
19-
solana-sdk = "1.14.*"
20-
tokio = { version = "1", features = ["full"] }
21-
thiserror = "1.0"
22-
ssh2 = "0.9"
23-
tabular = "0.2"
12+
serde = { version = "1.0.219", features = ["derive"] }
13+
serde_yaml = "0.8.26"
14+
solana-clap-utils = "2.2.2"
15+
solana-cli-config = "2.2.2"
16+
solana-client = "2.2.2"
17+
solana-logger = "2.3.1"
18+
solana-remote-wallet = { version = "2.2.2", optional = true }
19+
solana-sdk = "2.2.1"
20+
tokio = { version = "1.44.0", features = ["full"] }
21+
thiserror = "2.0.12"
22+
ssh2 = "0.9.5"
23+
tabular = "0.2.0"
2424
prettytable-rs = "0.10"
2525
ratatui = "0.25.0"
2626
crossterm = "0.27.0"
27-
chrono = "0.4"
28-
tui-logger = "0.10.0"
29-
anyhow = "1.0"
30-
futures = "0.3"
31-
rand = "0.8"
32-
colored = "2.0"
33-
url = "2.4"
34-
serde_json = "1.0"
35-
dirs = "5.0"
27+
chrono = "0.4.40"
28+
tui-logger = "0.17.0"
29+
anyhow = "1.0.97"
30+
futures = "0.3.31"
31+
rand = "0.9.0"
32+
colored = "3.0.0"
33+
url = "2.5.4"
34+
serde_json = "1.0.140"
35+
dirs = "6.0.0"
3636

3737
[dev-dependencies]
38-
assert_cmd = "2.0"
39-
predicates = "3.0"
40-
tempfile = "3.8"
41-
serial_test = "2.0"
42-
mockito = "1.2"
38+
assert_cmd = "2.0.16"
39+
predicates = "3.1.3"
40+
tempfile = "3.18.0"
41+
serial_test = "3.2.0"
42+
mockito = "1.7.0"
4343

4444
[features]
4545
default = []
46-
remote-wallet = ["solana-remote-wallet"]
46+
remote-wallet = ["solana-remote-wallet"]

src/main.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,11 @@ mod test {
746746
update_authority: Some(Pubkey::default()),
747747
primary_sale_happened: Some(true),
748748
};
749-
let bout = faux.try_to_vec().unwrap();
750-
let in_faux = UpdateMetadataAccountArgs::try_from_slice(&bout).unwrap();
749+
// With borsh 1.5.5, we need to use BorshSerialize in a different way
750+
let mut bout = Vec::new();
751+
faux.serialize(&mut bout).unwrap();
752+
// With borsh 1.5.5, use the BorshDeserialize trait method
753+
let in_faux = UpdateMetadataAccountArgs::deserialize(&mut &bout[..]).unwrap();
751754

752755
// Assert that the deserialized data matches the original
753756
assert_eq!(faux, in_faux);

0 commit comments

Comments
 (0)