diff --git a/Cargo.lock b/Cargo.lock index d6e98b61c054af..2e1cafdf3331c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1368,7 +1368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" dependencies = [ "borsh-derive 0.10.3", - "hashbrown 0.13.2", + "hashbrown 0.12.3", ] [[package]] @@ -6772,9 +6772,9 @@ dependencies = [ "solana-vote-interface", "spl-generic-token", "spl-pod", - "spl-token", "spl-token-2022-interface", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", "thiserror 2.0.12", "zstd", @@ -6849,7 +6849,7 @@ dependencies = [ "solana-transaction-status", "solana-version", "spl-generic-token", - "spl-token", + "spl-token-interface", "tikv-jemallocator", ] @@ -9997,8 +9997,8 @@ dependencies = [ "solana-vote-program", "spl-generic-token", "spl-pod", - "spl-token", "spl-token-2022-interface", + "spl-token-interface", "stream-cancel", "symlink", "test-case", @@ -10924,7 +10924,7 @@ dependencies = [ "solana-transaction-error", "solana-type-overrides", "spl-generic-token", - "spl-token", + "spl-token-interface", "test-case", "thiserror 2.0.12", ] @@ -11209,6 +11209,8 @@ dependencies = [ "solana-logger", "solana-message", "solana-native-token", + "solana-program-error", + "solana-program-pack", "solana-pubkey", "solana-remote-wallet", "solana-rpc-client", @@ -11224,7 +11226,7 @@ dependencies = [ "solana-transaction-status", "solana-version", "spl-associated-token-account-interface", - "spl-token", + "spl-token-interface", "tempfile", "thiserror 2.0.12", ] @@ -11478,10 +11480,10 @@ dependencies = [ "solana-vote-interface", "spl-associated-token-account-interface", "spl-memo-interface", - "spl-token", "spl-token-2022-interface", "spl-token-confidential-transfer-proof-extraction", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", "thiserror 2.0.12", ] @@ -12160,34 +12162,6 @@ dependencies = [ "thiserror 2.0.12", ] -[[package]] -name = "spl-token" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053067c6a82c705004f91dae058b11b4780407e9ccd6799dc9e7d0fab5f242da" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive", - "num-traits", - "num_enum", - "solana-account-info", - "solana-cpi", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", - "solana-program-error", - "solana-program-memory", - "solana-program-option", - "solana-program-pack", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-sysvar", - "thiserror 2.0.12", -] - [[package]] name = "spl-token-2022-interface" version = "1.0.0" @@ -12268,6 +12242,26 @@ dependencies = [ "thiserror 2.0.12", ] +[[package]] +name = "spl-token-interface" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e0c2d4e38ef5834cf7fb1b592b8a8c6eab8485f5ac7a04a151b502c63a0aaa" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive", + "num-traits", + "num_enum", + "solana-instruction", + "solana-program-error", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-sdk-ids", + "thiserror 2.0.12", +] + [[package]] name = "spl-token-metadata-interface" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index 9957ba4c44bd39..99b2dba4f14916 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -566,10 +566,10 @@ spl-associated-token-account-interface = "1.0.0" spl-generic-token = "1.0.1" spl-memo-interface = "1.0.0" spl-pod = "0.5.1" -spl-token = "8.0.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-interface = "1.0.0" spl-token-metadata-interface = "0.7.0" static_assertions = "1.1.0" stream-cancel = "0.8.2" diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml index 2b7b42916df510..b6ba7fd8a67dd9 100644 --- a/account-decoder/Cargo.toml +++ b/account-decoder/Cargo.toml @@ -45,9 +45,9 @@ solana-stake-interface = { workspace = true } 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-interface = { workspace = true } spl-token-group-interface = { workspace = true } +spl-token-interface = { workspace = true } spl-token-metadata-interface = { workspace = true } thiserror = { workspace = true } zstd = { workspace = true } diff --git a/account-decoder/src/parse_account_data.rs b/account-decoder/src/parse_account_data.rs index 0a94808833ccb5..807cedee64eba8 100644 --- a/account-decoder/src/parse_account_data.rs +++ b/account-decoder/src/parse_account_data.rs @@ -33,11 +33,11 @@ pub static PARSABLE_PROGRAM_IDS: std::sync::LazyLock Result<(Pubkey, SplTokenAdditionalDataV2)> { - if mint == &spl_token::native_mint::id() { + if mint == &spl_token_interface::native_mint::id() { Ok(( - spl_token::id(), - SplTokenAdditionalDataV2::with_decimals(spl_token::native_mint::DECIMALS), + spl_token_interface::id(), + SplTokenAdditionalDataV2::with_decimals(spl_token_interface::native_mint::DECIMALS), )) } else { let mint_account = bank.get_account(mint).ok_or_else(|| { diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs index e568708dc415c5..a9f13d366def4b 100644 --- a/rpc/src/rpc.rs +++ b/rpc/src/rpc.rs @@ -6255,11 +6255,11 @@ pub mod tests { // init mint let mint_rent_exempt_amount = - bank.get_minimum_balance_for_rent_exemption(spl_token::state::Mint::LEN); + bank.get_minimum_balance_for_rent_exemption(spl_token_interface::state::Mint::LEN); let mint_pubkey = Pubkey::from_str("mint111111111111111111111111111111111111111").unwrap(); - let mut mint_data = [0u8; spl_token::state::Mint::LEN]; + let mut mint_data = [0u8; spl_token_interface::state::Mint::LEN]; Pack::pack_into_slice( - &spl_token::state::Mint { + &spl_token_interface::state::Mint { mint_authority: COption::None, supply: 0, decimals: 8, @@ -6271,7 +6271,7 @@ pub mod tests { let account = AccountSharedData::create( mint_rent_exempt_amount, mint_data.into(), - spl_token::id(), + spl_token_interface::id(), false, 0, ); @@ -6279,17 +6279,17 @@ pub mod tests { // init token account let token_account_rent_exempt_amount = - bank.get_minimum_balance_for_rent_exemption(spl_token::state::Account::LEN); + bank.get_minimum_balance_for_rent_exemption(spl_token_interface::state::Account::LEN); let token_account_pubkey = Pubkey::new_unique(); let owner_pubkey = Pubkey::from_str("owner11111111111111111111111111111111111111").unwrap(); - let mut token_account_data = [0u8; spl_token::state::Account::LEN]; + let mut token_account_data = [0u8; spl_token_interface::state::Account::LEN]; Pack::pack_into_slice( - &spl_token::state::Account { + &spl_token_interface::state::Account { mint: mint_pubkey, owner: owner_pubkey, amount: 1, delegate: COption::None, - state: spl_token::state::AccountState::Initialized, + state: spl_token_interface::state::AccountState::Initialized, is_native: COption::None, delegated_amount: 0, close_authority: COption::None, @@ -6299,7 +6299,7 @@ pub mod tests { let account = AccountSharedData::create( token_account_rent_exempt_amount, token_account_data.into(), - spl_token::id(), + spl_token_interface::id(), false, 0, ); @@ -6366,9 +6366,9 @@ pub mod tests { }, "executable": false, "lamports": (token_account_rent_exempt_amount + 1), - "owner": bs58::encode(spl_token::id()).into_string(), + "owner": bs58::encode(spl_token_interface::id()).into_string(), "rentEpoch": u64::MAX, - "space": spl_token::state::Account::LEN + "space": spl_token_interface::state::Account::LEN }, ], "err": null, @@ -8296,7 +8296,7 @@ pub mod tests { } } - #[test_case(spl_token::id(), None, None; "spl_token")] + #[test_case(spl_token_interface::id(), None, None; "spl_token")] #[test_case(spl_token_2022_interface::id(), Some(InterestBearingConfig { pre_update_average_rate: 500.into(), current_rate: 500.into(),..Default::default() }), None; "spl_token_2022_with _interest")] #[test_case(spl_token_2022_interface::id(), None, Some(ScaledUiAmountConfig { new_multiplier: 2.0f64.into(), ..Default::default() }); "spl-token-2022 with multiplier")] fn test_token_parsing( @@ -8575,7 +8575,7 @@ pub mod tests { let owner = Pubkey::new_unique(); assert_eq!( get_spl_token_owner_filter( - &spl_token::id(), + &spl_token_interface::id(), &[ RpcFilterType::Memcmp(Memcmp::new_raw_bytes(32, owner.to_bytes().to_vec())), RpcFilterType::DataSize(165) diff --git a/svm/Cargo.toml b/svm/Cargo.toml index 5cf40c13604599..c184db31df7d23 100644 --- a/svm/Cargo.toml +++ b/svm/Cargo.toml @@ -122,7 +122,7 @@ solana-system-transaction = { workspace = true } solana-sysvar = { workspace = true } solana-transaction = { workspace = true, features = ["dev-context-only-utils"] } solana-transaction-context = { workspace = true, features = ["dev-context-only-utils"] } -spl-token = { workspace = true } +spl-token-interface = { workspace = true } test-case = { workspace = true } [lints] diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index df10f970422b49..0ecca6a9ff4c23 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -5298,9 +5298,9 @@ dependencies = [ "solana-sysvar", "solana-vote-interface", "spl-generic-token", - "spl-token", "spl-token-2022-interface", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", "thiserror 2.0.12", "zstd", @@ -7514,8 +7514,8 @@ dependencies = [ "solana-vote", "solana-vote-program", "spl-generic-token", - "spl-token", "spl-token-2022-interface", + "spl-token-interface", "stream-cancel", "thiserror 2.0.12", "tokio", @@ -8265,7 +8265,7 @@ dependencies = [ "solana-transaction", "solana-transaction-error", "spl-associated-token-account-interface", - "spl-token", + "spl-token-interface", "termcolor", ] @@ -8649,9 +8649,9 @@ dependencies = [ "solana-vote-interface", "spl-associated-token-account-interface", "spl-memo-interface", - "spl-token", "spl-token-2022-interface", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", "thiserror 2.0.12", ] @@ -9160,34 +9160,6 @@ dependencies = [ "thiserror 2.0.12", ] -[[package]] -name = "spl-token" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053067c6a82c705004f91dae058b11b4780407e9ccd6799dc9e7d0fab5f242da" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive", - "num-traits", - "num_enum", - "solana-account-info", - "solana-cpi", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", - "solana-program-error", - "solana-program-memory", - "solana-program-option", - "solana-program-pack", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-sysvar", - "thiserror 2.0.12", -] - [[package]] name = "spl-token-2022-interface" version = "1.0.0" @@ -9268,6 +9240,26 @@ dependencies = [ "thiserror 2.0.12", ] +[[package]] +name = "spl-token-interface" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e0c2d4e38ef5834cf7fb1b592b8a8c6eab8485f5ac7a04a151b502c63a0aaa" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive", + "num-traits", + "num_enum", + "solana-instruction", + "solana-program-error", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-sdk-ids", + "thiserror 2.0.12", +] + [[package]] name = "spl-token-metadata-interface" version = "0.7.0" diff --git a/svm/examples/Cargo.toml b/svm/examples/Cargo.toml index 7e5e114359f9aa..98bbc84b86d407 100644 --- a/svm/examples/Cargo.toml +++ b/svm/examples/Cargo.toml @@ -69,8 +69,8 @@ solana-transaction-status = { path = "../../transaction-status" } solana-validator-exit = "2.2.1" solana-version = { path = "../../version" } spl-associated-token-account-interface = "1.0.0" -spl-token = "8.0.0" spl-token-2022-interface = "1.0.0" +spl-token-interface = "1.0.0" termcolor = "1.4.1" thiserror = "1.0.68" tokio = "1.29.1" diff --git a/svm/examples/paytube/Cargo.toml b/svm/examples/paytube/Cargo.toml index b7def3734e8469..7b093a4c8414e8 100644 --- a/svm/examples/paytube/Cargo.toml +++ b/svm/examples/paytube/Cargo.toml @@ -38,7 +38,7 @@ solana-system-program = { workspace = true } solana-transaction = { workspace = true, features = ["blake3"] } solana-transaction-error = { workspace = true } spl-associated-token-account-interface = { workspace = true } -spl-token = { workspace = true } +spl-token-interface = { workspace = true } termcolor = { workspace = true } [dev-dependencies] diff --git a/svm/examples/paytube/src/settler.rs b/svm/examples/paytube/src/settler.rs index fdaa30e8f22443..ba69bc3a916b99 100644 --- a/svm/examples/paytube/src/settler.rs +++ b/svm/examples/paytube/src/settler.rs @@ -103,8 +103,8 @@ impl Ledger { if let Some(mint) = key.mint { let source_pubkey = get_associated_token_address(&from, &mint); let destination_pubkey = get_associated_token_address(&to, &mint); - return spl_token::instruction::transfer( - &spl_token::id(), + return spl_token_interface::instruction::transfer( + &spl_token_interface::id(), &source_pubkey, &destination_pubkey, &from, diff --git a/svm/examples/paytube/src/transaction.rs b/svm/examples/paytube/src/transaction.rs index fab6f27180c510..7dbc449b8a97a0 100644 --- a/svm/examples/paytube/src/transaction.rs +++ b/svm/examples/paytube/src/transaction.rs @@ -40,8 +40,8 @@ impl From<&PayTubeTransaction> for SolanaInstruction { if let Some(mint) = mint { let source_pubkey = get_associated_token_address(from, mint); let destination_pubkey = get_associated_token_address(to, mint); - return spl_token::instruction::transfer( - &spl_token::id(), + return spl_token_interface::instruction::transfer( + &spl_token_interface::id(), &source_pubkey, &destination_pubkey, from, diff --git a/svm/examples/paytube/tests/setup.rs b/svm/examples/paytube/tests/setup.rs index 6e7a923186bc40..f4ff327b8d5052 100644 --- a/svm/examples/paytube/tests/setup.rs +++ b/svm/examples/paytube/tests/setup.rs @@ -8,7 +8,7 @@ use { solana_pubkey::Pubkey, solana_system_interface::program as system_program, solana_test_validator::{TestValidator, TestValidatorGenesis}, - spl_token::state::{Account as TokenAccount, Mint}, + spl_token_interface::state::{Account as TokenAccount, Mint}, }; const SLOTS_PER_EPOCH: u64 = 50; @@ -54,7 +54,7 @@ pub fn mint_account() -> AccountSharedData { .unwrap(); data }; - let mut account = AccountSharedData::new(100_000_000, data.len(), &spl_token::id()); + let mut account = AccountSharedData::new(100_000_000, data.len(), &spl_token_interface::id()); account.set_data_from_slice(&data); account } @@ -71,7 +71,7 @@ pub fn token_account(owner: &Pubkey, mint: &Pubkey, amount: u64) -> AccountShare mint: *mint, owner: *owner, amount, - state: spl_token::state::AccountState::Initialized, + state: spl_token_interface::state::AccountState::Initialized, ..Default::default() }, &mut data, @@ -79,7 +79,7 @@ pub fn token_account(owner: &Pubkey, mint: &Pubkey, amount: u64) -> AccountShare .unwrap(); data }; - let mut account = AccountSharedData::new(100_000_000, data.len(), &spl_token::id()); + let mut account = AccountSharedData::new(100_000_000, data.len(), &spl_token_interface::id()); account.set_data_from_slice(&data); account } diff --git a/svm/tests/integration_test.rs b/svm/tests/integration_test.rs index c79c27d642dd83..3bc42610f435bb 100644 --- a/svm/tests/integration_test.rs +++ b/svm/tests/integration_test.rs @@ -3020,7 +3020,9 @@ mod balance_collector { solana_program_pack::Pack, solana_sdk_ids::bpf_loader, spl_generic_token::token_2022, - spl_token::state::{Account as TokenAccount, AccountState as TokenAccountState, Mint}, + spl_token_interface::state::{ + Account as TokenAccount, AccountState as TokenAccountState, Mint, + }, test_case::test_case, }; @@ -3064,8 +3066,8 @@ mod balance_collector { // we use a common account owner, the fee-payer, to conveniently reuse account state // so why do we sign? to force the sender and receiver to be in a consistent order in account keys // which means we can grab them by index in our final test instead of searching by key - let mut instruction = spl_token::instruction::transfer( - &spl_token::id(), + let mut instruction = spl_token_interface::instruction::transfer( + &spl_token_interface::id(), &self.from, &self.to, fee_payer, @@ -3121,8 +3123,13 @@ mod balance_collector { } .pack_into_slice(&mut mint_buf); - let mint_state = - AccountSharedData::create(LAMPORTS_PER_SOL, mint_buf, spl_token::id(), false, u64::MAX); + let mint_state = AccountSharedData::create( + LAMPORTS_PER_SOL, + mint_buf, + spl_token_interface::id(), + false, + u64::MAX, + ); let token_account_for_tests = || TokenAccount { mint, @@ -3138,7 +3145,7 @@ mod balance_collector { let token_state = AccountSharedData::create( LAMPORTS_PER_SOL, token_buf, - spl_token::id(), + spl_token_interface::id(), false, u64::MAX, ); @@ -3156,7 +3163,7 @@ mod balance_collector { test_entry.add_initial_account(fee_payer, &native_state.clone()); if use_tokens { - test_entry.add_initial_account(spl_token::id(), &spl_token); + test_entry.add_initial_account(spl_token_interface::id(), &spl_token); test_entry.add_initial_account(mint, &mint_state); test_entry.add_initial_account(alice, &token_state); test_entry.add_initial_account(bob, &token_state); @@ -3273,7 +3280,7 @@ mod balance_collector { let final_token_state = AccountSharedData::create( LAMPORTS_PER_SOL, token_buf.clone(), - spl_token::id(), + spl_token_interface::id(), false, u64::MAX, ); @@ -3284,7 +3291,7 @@ mod balance_collector { let final_token_state = AccountSharedData::create( LAMPORTS_PER_SOL, token_buf.clone(), - spl_token::id(), + spl_token_interface::id(), false, u64::MAX, ); @@ -3295,7 +3302,7 @@ mod balance_collector { let final_token_state = AccountSharedData::create( LAMPORTS_PER_SOL, token_buf.clone(), - spl_token::id(), + spl_token_interface::id(), false, u64::MAX, ); diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 069e659039abb2..02cb6e6c3fb847 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -30,6 +30,8 @@ solana-instruction = { workspace = true } solana-keypair = { workspace = true } solana-message = { workspace = true } solana-native-token = { workspace = true } +solana-program-error = { workspace = true } +solana-program-pack = { workspace = true } solana-pubkey = { workspace = true, features = ["rand"] } solana-remote-wallet = { workspace = true, features = ["default"] } solana-rpc-client = { workspace = true, features = ["default"] } @@ -42,7 +44,7 @@ solana-transaction = { workspace = true } solana-transaction-status = { workspace = true } solana-version = { workspace = true } spl-associated-token-account-interface = { version = "=1.0.0" } -spl-token = { version = "=8.0.0", features = ["no-entrypoint"] } +spl-token-interface = { workspace = true } tempfile = { workspace = true } thiserror = { workspace = true } diff --git a/tokens/src/commands.rs b/tokens/src/commands.rs index 9ac6057d89308a..13ac1711b24c50 100644 --- a/tokens/src/commands.rs +++ b/tokens/src/commands.rs @@ -4,7 +4,7 @@ use { BalancesArgs, DistributeTokensArgs, SenderStakeArgs, StakeArgs, TransactionLogArgs, }, db::{self, TransactionInfo}, - spl_token::*, + spl_token::{build_spl_token_instructions, check_spl_token_balances, print_token_balances}, token_display::Token, }, chrono::prelude::*, @@ -21,6 +21,7 @@ use { solana_instruction::Instruction, solana_message::Message, solana_native_token::{lamports_to_sol, sol_to_lamports}, + solana_program_error::ProgramError, solana_rpc_client::rpc_client::RpcClient, solana_rpc_client_api::{ client_error::{Error as ClientError, Result as ClientResult}, @@ -37,7 +38,6 @@ use { solana_transaction::Transaction, solana_transaction_status::TransactionStatus, spl_associated_token_account_interface::address::get_associated_token_address, - spl_token::solana_program::program_error::ProgramError, std::{ cmp::{self}, io, diff --git a/tokens/src/spl_token.rs b/tokens/src/spl_token.rs index 35ce39fc2d98ae..fc2af66cf4fc40 100644 --- a/tokens/src/spl_token.rs +++ b/tokens/src/spl_token.rs @@ -8,14 +8,12 @@ use { solana_instruction::Instruction, solana_message::Message, solana_native_token::lamports_to_sol, + solana_program_pack::Pack, solana_rpc_client::rpc_client::RpcClient, spl_associated_token_account_interface::{ address::get_associated_token_address, instruction::create_associated_token_account, }, - spl_token::{ - solana_program::program_pack::Pack, - state::{Account as SplTokenAccount, Mint}, - }, + spl_token_interface::state::{Account as SplTokenAccount, Mint}, }; pub fn update_token_args(client: &RpcClient, args: &mut Option) -> Result<(), Error> { @@ -56,12 +54,12 @@ pub(crate) fn build_spl_token_instructions( &args.fee_payer.pubkey(), &wallet_address, &spl_token_args.mint, - &spl_token::id(), + &spl_token_interface::id(), )); } instructions.push( - spl_token::instruction::transfer_checked( - &spl_token::id(), + spl_token_interface::instruction::transfer_checked( + &spl_token_interface::id(), &spl_token_args.token_account_address, &spl_token_args.mint, &associated_token_address, diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml index 52f840831bc17d..2240b9ee35d80d 100644 --- a/transaction-status/Cargo.toml +++ b/transaction-status/Cargo.toml @@ -44,9 +44,9 @@ solana-transaction-status-client-types = { workspace = true } solana-vote-interface = { workspace = true } spl-associated-token-account-interface = { workspace = true, features = ["borsh"] } spl-memo-interface = { workspace = true } -spl-token = { workspace = true, features = ["no-entrypoint"] } spl-token-2022-interface = { workspace = true } spl-token-group-interface = { workspace = true } +spl-token-interface = { workspace = true } spl-token-metadata-interface = { workspace = true } thiserror = { workspace = true } diff --git a/transaction-status/src/parse_associated_token.rs b/transaction-status/src/parse_associated_token.rs index 4a770d5f546408..96052dff7fd1c8 100644 --- a/transaction-status/src/parse_associated_token.rs +++ b/transaction-status/src/parse_associated_token.rs @@ -105,7 +105,7 @@ mod test { let wallet_address = Pubkey::new_unique(); let mint = Pubkey::new_unique(); let associated_account_address = get_associated_token_address(&wallet_address, &mint); - let token_program_id = spl_token::id(); + let token_program_id = spl_token_interface::id(); // mimic the deprecated instruction let mut create_ix = create_associated_token_account(&funder, &wallet_address, &mint, &token_program_id); diff --git a/transaction-status/src/parse_token.rs b/transaction-status/src/parse_token.rs index 8fc766378622a5..b51cfe4065799a 100644 --- a/transaction-status/src/parse_token.rs +++ b/transaction-status/src/parse_token.rs @@ -1684,7 +1684,7 @@ mod test { let get_account_data_size_ix = get_account_data_size( program_id, &mint_pubkey, - &[], // This emulates the packed data of spl_token::instruction::get_account_data_size + &[], // This emulates the packed data of spl_token_interface::instruction::get_account_data_size ) .unwrap(); let message = Message::new(&[get_account_data_size_ix], None); @@ -1771,7 +1771,7 @@ mod test { #[test] fn test_parse_token_v3() { - test_parse_token(&spl_token::id()); + test_parse_token(&spl_token_interface::id()); } #[test] @@ -2150,7 +2150,7 @@ mod test { #[test] fn test_not_enough_keys_token_v3() { - test_token_ix_not_enough_keys(&spl_token::id()); + test_token_ix_not_enough_keys(&spl_token_interface::id()); } #[test]