Skip to content

SPL: Use token-2022-interface crate #7298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joncinque merged 1 commit into from
Aug 5, 2025
Merged

SPL: Use token-2022-interface crate #7298

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
160 changes: 15 additions & 145 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,8 @@ spl-generic-token = "1.0.1"
spl-memo = "6.0.0"
spl-pod = "0.5.1"
spl-token = "8.0.0"
spl-token-2022 = "8.0.1"
spl-token-confidential-transfer-proof-extraction = "0.3.0"
spl-token-2022-interface = "1.0.0"
spl-token-confidential-transfer-proof-extraction = "0.4.0"
spl-token-group-interface = "0.6.0"
spl-token-metadata-interface = "0.7.0"
static_assertions = "1.1.0"
Expand Down Expand Up @@ -648,7 +648,7 @@ crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d
# * spl-memo
# * spl-pod
# * spl-token
# * spl-token-2022
# * spl-token-2022-interface
# * spl-token-metadata-interface
#
# They, in turn, depend on a number of crates that we also include directly
Expand Down
2 changes: 1 addition & 1 deletion account-decoder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ solana-sysvar = { workspace = true }
solana-vote-interface = { workspace = true, features = ["bincode"] }
spl-generic-token = { workspace = true }
spl-token = { workspace = true, features = ["no-entrypoint"] }
spl-token-2022 = { workspace = true, features = ["no-entrypoint"] }
spl-token-2022-interface = { workspace = true }
spl-token-group-interface = { workspace = true }
spl-token-metadata-interface = { workspace = true }
thiserror = { workspace = true }
Expand Down
7 changes: 5 additions & 2 deletions account-decoder/src/parse_account_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use {
solana_sdk_ids::{
address_lookup_table, bpf_loader_upgradeable, config, stake, system_program, sysvar, vote,
},
spl_token_2022::extension::{
spl_token_2022_interface::extension::{
interest_bearing_mint::InterestBearingConfig, scaled_ui_amount::ScaledUiAmountConfig,
},
std::collections::HashMap,
Expand All @@ -34,7 +34,10 @@ pub static PARSABLE_PROGRAM_IDS: std::sync::LazyLock<HashMap<Pubkey, ParsableAcc
m.insert(config::id(), ParsableAccount::Config);
m.insert(system_program::id(), ParsableAccount::Nonce);
m.insert(spl_token::id(), ParsableAccount::SplToken);
m.insert(spl_token_2022::id(), ParsableAccount::SplToken2022);
m.insert(
spl_token_2022_interface::id(),
ParsableAccount::SplToken2022,
);
m.insert(stake::id(), ParsableAccount::Stake);
m.insert(sysvar::id(), ParsableAccount::Sysvar);
m.insert(vote::id(), ParsableAccount::Vote);
Expand Down
4 changes: 2 additions & 2 deletions account-decoder/src/parse_token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use {
solana_program_option::COption,
solana_program_pack::Pack,
solana_pubkey::Pubkey,
spl_token_2022::{
spl_token_2022_interface::{
extension::{BaseStateWithExtensions, StateWithExtensions},
generic_token_account::GenericTokenAccount,
state::{Account, AccountState, Mint, Multisig},
Expand Down Expand Up @@ -176,7 +176,7 @@ mod test {
crate::parse_token_extension::{UiMemoTransfer, UiMintCloseAuthority},
solana_account_decoder_client_types::token::UiExtension,
spl_pod::optional_keys::OptionalNonZeroPubkey,
spl_token_2022::extension::{
spl_token_2022_interface::extension::{
immutable_owner::ImmutableOwner, interest_bearing_mint::InterestBearingConfig,
memo_transfer::MemoTransfer, mint_close_authority::MintCloseAuthority,
scaled_ui_amount::ScaledUiAmountConfig, BaseStateWithExtensionsMut, ExtensionType,
Expand Down
7 changes: 4 additions & 3 deletions account-decoder/src/parse_token_extension.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use {
solana_clock::UnixTimestamp,
solana_program_pack::Pack,
solana_pubkey::Pubkey,
spl_token_2022::{
spl_token_2022_interface::{
extension::{self, BaseState, BaseStateWithExtensions, ExtensionType, StateWithExtensions},
solana_zk_sdk::encryption::pod::elgamal::PodElGamalPubkey,
},
Expand Down Expand Up @@ -202,8 +202,9 @@ fn convert_mint_close_authority(
fn convert_default_account_state(
default_account_state: extension::default_account_state::DefaultAccountState,
) -> UiDefaultAccountState {
let account_state = spl_token_2022::state::AccountState::try_from(default_account_state.state)
.unwrap_or_default();
let account_state =
spl_token_2022_interface::state::AccountState::try_from(default_account_state.state)
.unwrap_or_default();
UiDefaultAccountState {
account_state: convert_account_state(account_state),
}
Expand Down
Loading
Loading