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

Commit 1588c17

Browse files
joncinquemergify-bot
joncinque
authored and
mergify-bot
committed
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 (cherry picked from commit c43afe2) # Conflicts: # account-decoder/Cargo.toml # accounts-cluster-bench/Cargo.toml # rpc/Cargo.toml # tokens/Cargo.toml # transaction-status/Cargo.toml
1 parent 4df54b5 commit 1588c17

17 files changed

+416
-49
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

+8
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,19 @@ lazy_static = "1.4.0"
1919
serde = "1.0.136"
2020
serde_derive = "1.0.103"
2121
serde_json = "1.0.79"
22+
<<<<<<< HEAD
2223
solana-config-program = { path = "../programs/config", version = "=1.10.10" }
2324
solana-sdk = { path = "../sdk", version = "=1.10.10" }
2425
solana-vote-program = { path = "../programs/vote", version = "=1.10.10" }
2526
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
2627
spl-token-2022 = { version = "=0.1.0", features = ["no-entrypoint"] }
28+
=======
29+
solana-config-program = { path = "../programs/config", version = "=1.11.0" }
30+
solana-sdk = { path = "../sdk", version = "=1.11.0" }
31+
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
32+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
33+
spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
34+
>>>>>>> c43afe2d7 (spl: Bump token to v3.3.0 and ATA to v1.0.5 (#22649))
2735
thiserror = "1.0"
2836
zstd = "0.11.1"
2937

‎accounts-cluster-bench/Cargo.toml

+18
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ publish = false
1212
clap = "2.33.1"
1313
log = "0.4.14"
1414
rand = "0.7.0"
15+
<<<<<<< HEAD
1516
rayon = "1.5.1"
1617
solana-account-decoder = { path = "../account-decoder", version = "=1.10.10" }
1718
solana-clap-utils = { path = "../clap-utils", version = "=1.10.10" }
@@ -27,6 +28,23 @@ solana-streamer = { path = "../streamer", version = "=1.10.10" }
2728
solana-transaction-status = { path = "../transaction-status", version = "=1.10.10" }
2829
solana-version = { path = "../version", version = "=1.10.10" }
2930
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
31+
=======
32+
rayon = "1.5.2"
33+
solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
34+
solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
35+
solana-client = { path = "../client", version = "=1.11.0" }
36+
solana-faucet = { path = "../faucet", version = "=1.11.0" }
37+
solana-gossip = { path = "../gossip", version = "=1.11.0" }
38+
solana-logger = { path = "../logger", version = "=1.11.0" }
39+
solana-measure = { path = "../measure", version = "=1.11.0" }
40+
solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
41+
solana-runtime = { path = "../runtime", version = "=1.11.0" }
42+
solana-sdk = { path = "../sdk", version = "=1.11.0" }
43+
solana-streamer = { path = "../streamer", version = "=1.11.0" }
44+
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
45+
solana-version = { path = "../version", version = "=1.11.0" }
46+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
47+
>>>>>>> c43afe2d7 (spl: Bump token to v3.3.0 and ATA to v1.0.5 (#22649))
3048

3149
[dev-dependencies]
3250
solana-core = { path = "../core", version = "=1.10.10" }

‎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

+23
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ serde = "1.0.136"
2929
serde_derive = "1.0.103"
3030
serde_json = "1.0.79"
3131
soketto = "0.7"
32+
<<<<<<< HEAD
3233
solana-account-decoder = { path = "../account-decoder", version = "=1.10.10" }
3334
solana-client = { path = "../client", version = "=1.10.10" }
3435
solana-entry = { path = "../entry", version = "=1.10.10" }
@@ -49,6 +50,28 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.10.1
4950
solana-version = { path = "../version", version = "=1.10.10" }
5051
solana-vote-program = { path = "../programs/vote", version = "=1.10.10" }
5152
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
53+
=======
54+
solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
55+
solana-client = { path = "../client", version = "=1.11.0" }
56+
solana-entry = { path = "../entry", version = "=1.11.0" }
57+
solana-faucet = { path = "../faucet", version = "=1.11.0" }
58+
solana-gossip = { path = "../gossip", version = "=1.11.0" }
59+
solana-ledger = { path = "../ledger", version = "=1.11.0" }
60+
solana-measure = { path = "../measure", version = "=1.11.0" }
61+
solana-metrics = { path = "../metrics", version = "=1.11.0" }
62+
solana-perf = { path = "../perf", version = "=1.11.0" }
63+
solana-poh = { path = "../poh", version = "=1.11.0" }
64+
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.11.0" }
65+
solana-runtime = { path = "../runtime", version = "=1.11.0" }
66+
solana-sdk = { path = "../sdk", version = "=1.11.0" }
67+
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.11.0" }
68+
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.11.0" }
69+
solana-streamer = { path = "../streamer", version = "=1.11.0" }
70+
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
71+
solana-version = { path = "../version", version = "=1.11.0" }
72+
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
73+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
74+
>>>>>>> c43afe2d7 (spl: Bump token to v3.3.0 and ATA to v1.0.5 (#22649))
5275
stream-cancel = "0.8.1"
5376
thiserror = "1.0"
5477
tokio = { version = "1", features = ["full"] }

‎tokens/Cargo.toml

+13
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ indexmap = "1.8.0"
1919
indicatif = "0.16.2"
2020
pickledb = "0.4.1"
2121
serde = { version = "1.0", features = ["derive"] }
22+
<<<<<<< HEAD
2223
solana-account-decoder = { path = "../account-decoder", version = "=1.10.10" }
2324
solana-clap-utils = { path = "../clap-utils", version = "=1.10.10" }
2425
solana-cli-config = { path = "../cli-config", version = "=1.10.10" }
@@ -29,6 +30,18 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.10.1
2930
solana-version = { path = "../version", version = "=1.10.10" }
3031
spl-associated-token-account = { version = "=1.0.3" }
3132
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
33+
=======
34+
solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
35+
solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
36+
solana-cli-config = { path = "../cli-config", version = "=1.11.0" }
37+
solana-client = { path = "../client", version = "=1.11.0" }
38+
solana-remote-wallet = { path = "../remote-wallet", version = "=1.11.0" }
39+
solana-sdk = { path = "../sdk", version = "=1.11.0" }
40+
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
41+
solana-version = { path = "../version", version = "=1.11.0" }
42+
spl-associated-token-account = { version = "=1.0.5" }
43+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
44+
>>>>>>> c43afe2d7 (spl: Bump token to v3.3.0 and ATA to v1.0.5 (#22649))
3245
tempfile = "3.3.0"
3346
thiserror = "1.0"
3447

‎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

+13-2
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,33 @@ 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"
1920
serde = "1.0.136"
2021
serde_derive = "1.0.103"
2122
serde_json = "1.0.79"
23+
<<<<<<< HEAD
2224
solana-account-decoder = { path = "../account-decoder", version = "=1.10.10" }
2325
solana-measure = { path = "../measure", version = "=1.10.10" }
2426
solana-metrics = { path = "../metrics", version = "=1.10.10" }
2527
solana-runtime = { path = "../runtime", version = "=1.10.10" }
2628
solana-sdk = { path = "../sdk", version = "=1.10.10" }
2729
solana-vote-program = { path = "../programs/vote", version = "=1.10.10" }
2830
spl-associated-token-account = { version = "=1.0.3", features = ["no-entrypoint"] }
31+
=======
32+
solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
33+
solana-measure = { path = "../measure", version = "=1.11.0" }
34+
solana-metrics = { path = "../metrics", version = "=1.11.0" }
35+
solana-runtime = { path = "../runtime", version = "=1.11.0" }
36+
solana-sdk = { path = "../sdk", version = "=1.11.0" }
37+
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
38+
spl-associated-token-account = { version = "=1.0.5", features = ["no-entrypoint"] }
39+
>>>>>>> c43afe2d7 (spl: Bump token to v3.3.0 and ATA to v1.0.5 (#22649))
2940
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"] }
41+
spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
42+
spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
3243
thiserror = "1.0"
3344

3445
[package.metadata.docs.rs]

0 commit comments

Comments
 (0)