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

Commit c43afe2

Browse files
joncinquejoncinque
authored
spl: Bump token to v3.3.0 and ATA to v1.0.5 (#22649)
* Bump spl-token and ATA to v3.3.0 * Add parsers for new token instructions * Update parser for modified associated-token-account instruction * Update to use 1.0.5 once it's released * Update Cargo.lock in programs/bpf
1 parent 2a770e9 commit c43afe2

17 files changed

+351
-56
lines changed

‎Cargo.lock

+13-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎account-decoder/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ serde_json = "1.0.79"
2222
solana-config-program = { path = "../programs/config", version = "=1.11.0" }
2323
solana-sdk = { path = "../sdk", version = "=1.11.0" }
2424
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
25-
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
26-
spl-token-2022 = { version = "=0.1.0", features = ["no-entrypoint"] }
25+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
26+
spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
2727
thiserror = "1.0"
2828
zstd = "0.11.1"
2929

‎accounts-cluster-bench/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ solana-sdk = { path = "../sdk", version = "=1.11.0" }
2626
solana-streamer = { path = "../streamer", version = "=1.11.0" }
2727
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
2828
solana-version = { path = "../version", version = "=1.11.0" }
29-
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
29+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
3030

3131
[dev-dependencies]
3232
solana-core = { path = "../core", version = "=1.11.0" }

‎ci/do-audit.sh

-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ cargo_audit_ignores=(
2323
# Blocked on multiple crates updating `time` to >= 0.2.23
2424
--ignore RUSTSEC-2020-0071
2525

26-
# generic-array: arr! macro erases lifetimes
27-
#
28-
# Blocked on new spl dependencies on solana-program v1.9
29-
# due to curve25519-dalek dependency
30-
--ignore RUSTSEC-2020-0146
31-
3226
# chrono: Potential segfault in `localtime_r` invocations
3327
#
3428
# Blocked due to no safe upgrade

‎fetch-spl.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ fetch_program() {
3838

3939
}
4040

41-
fetch_program token 3.2.0 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
41+
fetch_program token 3.3.0 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
4242
fetch_program memo 1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo BPFLoader1111111111111111111111111111111111
4343
fetch_program memo 3.0.0 MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr BPFLoader2111111111111111111111111111111111
44-
fetch_program associated-token-account 1.0.3 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
44+
fetch_program associated-token-account 1.0.5 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
4545
fetch_program feature-proposal 1.0.0 Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse BPFLoader2111111111111111111111111111111111
4646

4747
echo "${genesis_args[@]}" > spl-genesis-args.sh

‎program-test/src/programs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mod spl_associated_token_account {
1818
}
1919

2020
static SPL_PROGRAMS: &[(Pubkey, &[u8])] = &[
21-
(spl_token::ID, include_bytes!("programs/spl_token-3.2.0.so")),
21+
(spl_token::ID, include_bytes!("programs/spl_token-3.3.0.so")),
2222
(
2323
spl_memo_1_0::ID,
2424
include_bytes!("programs/spl_memo-1.0.0.so"),
@@ -29,7 +29,7 @@ static SPL_PROGRAMS: &[(Pubkey, &[u8])] = &[
2929
),
3030
(
3131
spl_associated_token_account::ID,
32-
include_bytes!("programs/spl_associated-token-account-1.0.3.so"),
32+
include_bytes!("programs/spl_associated_token_account-1.0.5.so"),
3333
),
3434
];
3535

‎program-test/src/programs/spl_associated-token-account-1.0.3.so

-120 KB
Binary file not shown.

‎program-test/src/programs/spl_associated_token_account-1.0.5.so

120 KB
Binary file not shown.

‎program-test/src/programs/spl_token-3.2.0.so

-153 KB
Binary file not shown.

‎program-test/src/programs/spl_token-3.3.0.so

134 KB
Binary file not shown.

‎programs/bpf/Cargo.lock

+13-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ solana-streamer = { path = "../streamer", version = "=1.11.0" }
4848
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
4949
solana-version = { path = "../version", version = "=1.11.0" }
5050
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
51-
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
51+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
5252
stream-cancel = "0.8.1"
5353
thiserror = "1.0"
5454
tokio = { version = "1", features = ["full"] }

‎tokens/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0" }
2727
solana-sdk = { path = "../sdk", version = "=1.11.0" }
2828
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
2929
solana-version = { path = "../version", version = "=1.11.0" }
30-
spl-associated-token-account = { version = "=1.0.3" }
31-
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
30+
spl-associated-token-account = { version = "=1.0.5" }
31+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
3232
tempfile = "3.3.0"
3333
thiserror = "1.0"
3434

‎tokens/src/spl_token.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ use {
1010
solana_client::rpc_client::RpcClient,
1111
solana_sdk::{instruction::Instruction, message::Message, native_token::lamports_to_sol},
1212
solana_transaction_status::parse_token::spl_token_instruction,
13-
spl_associated_token_account::{create_associated_token_account, get_associated_token_address},
13+
spl_associated_token_account::{
14+
get_associated_token_address, instruction::create_associated_token_account,
15+
},
1416
spl_token::{
1517
solana_program::program_pack::Pack,
1618
state::{Account as SplTokenAccount, Mint},

‎transaction-status/Cargo.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ edition = "2021"
1313
Inflector = "0.11.4"
1414
base64 = "0.13.0"
1515
bincode = "1.3.3"
16+
borsh = "0.9.1"
1617
bs58 = "0.4.0"
1718
lazy_static = "1.4.0"
1819
log = "0.4.14"
@@ -25,10 +26,10 @@ solana-metrics = { path = "../metrics", version = "=1.11.0" }
2526
solana-runtime = { path = "../runtime", version = "=1.11.0" }
2627
solana-sdk = { path = "../sdk", version = "=1.11.0" }
2728
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
28-
spl-associated-token-account = { version = "=1.0.3", features = ["no-entrypoint"] }
29+
spl-associated-token-account = { version = "=1.0.5", features = ["no-entrypoint"] }
2930
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
30-
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
31-
spl-token-2022 = { version = "=0.1.0", features = ["no-entrypoint"] }
31+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
32+
spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
3233
thiserror = "1.0"
3334

3435
[package.metadata.docs.rs]

0 commit comments

Comments
 (0)