Use the new package everywhere

joncinque · joncinque · commit 53b5574ffa74 · 2024-08-26T23:57:42.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/associated-token-account/client/src/instruction.rs b/associated-token-account/client/src/instruction.rs
@@ -1,9 +1,10 @@
 //! Instruction creators for the program
 use {
-    crate::{id, address::get_associated_token_address_with_program_id},
+    crate::{address::get_associated_token_address_with_program_id, id},
     solana_program::{
         instruction::{AccountMeta, Instruction},
-        pubkey::Pubkey, system_program,
+        pubkey::Pubkey,
+        system_program,
     },
 };
 
diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml
@@ -15,5 +15,6 @@ solana-program = "2.0.3"
 solana-program-test = "2.0.3"
 solana-sdk = "2.0.3"
 spl-associated-token-account = { version = "4.0.0", path = "../program", features = ["no-entrypoint"] }
+spl-associated-token-account-client = { version = "1.0.0", path = "../client" }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
diff --git a/associated-token-account/program-test/tests/create_idempotent.rs b/associated-token-account/program-test/tests/create_idempotent.rs
@@ -21,7 +21,7 @@ use {
             create_associated_token_account, create_associated_token_account_idempotent,
         },
     },
-    spl_associated_token_address::get_associated_token_address_with_program_id,
+    spl_associated_token_account_client::address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::ExtensionType,
         instruction::initialize_account,
diff --git a/associated-token-account/program-test/tests/extended_mint.rs b/associated-token-account/program-test/tests/extended_mint.rs
@@ -14,7 +14,7 @@ use {
         transaction::{Transaction, TransactionError},
     },
     spl_associated_token_account::instruction::create_associated_token_account,
-    spl_associated_token_address::get_associated_token_address_with_program_id,
+    spl_associated_token_account_client::address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         error::TokenError,
         extension::{
diff --git a/associated-token-account/program-test/tests/process_create_associated_token_account.rs b/associated-token-account/program-test/tests/process_create_associated_token_account.rs
@@ -13,7 +13,7 @@ use {
         transaction::{Transaction, TransactionError},
     },
     spl_associated_token_account::instruction::create_associated_token_account,
-    spl_associated_token_address::get_associated_token_address_with_program_id,
+    spl_associated_token_account_client::address::get_associated_token_address_with_program_id,
     spl_token_2022::{extension::ExtensionType, state::Account},
 };
 
diff --git a/associated-token-account/program-test/tests/recover_nested.rs b/associated-token-account/program-test/tests/recover_nested.rs
@@ -15,7 +15,7 @@ use {
         transaction::{Transaction, TransactionError},
     },
     spl_associated_token_account::instruction,
-    spl_associated_token_address::get_associated_token_address_with_program_id,
+    spl_associated_token_account_client::address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::{ExtensionType, StateWithExtensionsOwned},
         state::{Account, Mint},
diff --git a/associated-token-account/program-test/tests/spl_token_create.rs b/associated-token-account/program-test/tests/spl_token_create.rs
@@ -12,7 +12,7 @@ use {
     solana_program_test::*,
     solana_sdk::{program_pack::Pack, signature::Signer, transaction::Transaction},
     spl_associated_token_account::instruction::create_associated_token_account,
-    spl_associated_token_address::get_associated_token_address,
+    spl_associated_token_account_client::address::get_associated_token_address,
     spl_token::state::Account,
 };
 
diff --git a/associated-token-account/program/src/instruction.rs b/associated-token-account/program/src/instruction.rs
@@ -1,10 +1,9 @@
 //! Program instructions
 
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
-pub use spl_associated_token_account_client::intruction::*;
+pub use spl_associated_token_account_client::instruction::*;
 
 /// Instructions supported by the AssociatedTokenAccount program
-#[deprecated(since = "4.1.0", note = "Use instructions in `spl-associated-token-account-client` crate instead.")]
 #[derive(Clone, Debug, PartialEq, BorshDeserialize, BorshSerialize, BorshSchema)]
 pub enum AssociatedTokenAccountInstruction {
     /// Creates an associated token account for the given wallet address and
diff --git a/associated-token-account/program/src/lib.rs b/associated-token-account/program/src/lib.rs
@@ -16,12 +16,16 @@ use solana_program::{
     pubkey::Pubkey,
     sysvar,
 };
-
+#[deprecated(
+    since = "4.1.0",
+    note = "Use `spl-associated-token-account-client` crate instead."
+)]
+pub use spl_associated_token_account_client::address::{
+    get_associated_token_address, get_associated_token_address_with_program_id,
+};
 // Export current SDK types for downstream users building with a different SDK
 // version
-pub use {solana_program, spl_associated_token_account_client::{id, ID, check_id}};
-#[deprecated(since = "4.1.0", note = "Use `spl-associated-token-account-client` crate instead.")]
-pub use spl_associated_token_account_client::{get_associated_token_address, get_associated_token_address_with_program_id};
+pub use spl_associated_token_account_client::{check_id, id, ID};
 
 /// Create an associated token account for the given wallet address and token
 /// mint
diff --git a/associated-token-account/program/src/processor.rs b/associated-token-account/program/src/processor.rs
@@ -18,7 +18,7 @@ use {
         system_program,
         sysvar::Sysvar,
     },
-    spl_associated_token_address::get_associated_token_address_and_bump_seed_internal,
+    spl_associated_token_account_client::address::get_associated_token_address_and_bump_seed_internal,
     spl_token_2022::{
         extension::{ExtensionType, StateWithExtensions},
         state::{Account, Mint},
diff --git a/managed-token/program/Cargo.toml b/managed-token/program/Cargo.toml
@@ -28,7 +28,7 @@ solana-program = "2.0.3"
 spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [
   "no-entrypoint",
 ] }
-spl-associated-token-address = { version = "1.0.0", path = "../../associated-token-address" }
+spl-associated-token-account-client = { version = "1.0.0", path = "../../associated-token-account/client" }
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
diff --git a/managed-token/program/src/accounts.rs b/managed-token/program/src/accounts.rs
@@ -5,7 +5,6 @@ use {
         program_error::ProgramError,
         system_program,
     },
-    spl_associated_token_address::ASSOCIATED_TOKEN_PROGRAM_ID,
 };
 
 pub struct InitializeMint<'a, 'info> {
@@ -117,7 +116,7 @@ impl<'a, 'info> InitializeAccount<'a, 'info> {
             "Invalid key supplied for System Program",
         )?;
         assert_with_msg(
-            ctx.associated_token_program.key == &ASSOCIATED_TOKEN_PROGRAM_ID,
+            ctx.associated_token_program.key == &spl_associated_token_account_client::id(),
             ProgramError::InvalidInstructionData,
             "Invalid key supplied for Associataed Token Program",
         )?;
diff --git a/managed-token/program/src/instruction.rs b/managed-token/program/src/instruction.rs
@@ -8,7 +8,7 @@ use {
         pubkey::Pubkey,
         system_program,
     },
-    spl_associated_token_address::{get_associated_token_address, ASSOCIATED_TOKEN_PROGRAM_ID},
+    spl_associated_token_account_client::address::get_associated_token_address,
 };
 
 #[derive(Debug, Clone, ShankInstruction, BorshSerialize, BorshDeserialize)]
@@ -127,7 +127,7 @@ pub fn create_initialize_account_instruction(
             AccountMeta::new_readonly(freeze_authority, false),
             AccountMeta::new_readonly(*mint, false),
             AccountMeta::new_readonly(system_program::id(), false),
-            AccountMeta::new_readonly(ASSOCIATED_TOKEN_PROGRAM_ID, false),
+            AccountMeta::new_readonly(spl_associated_token_account_client::id(), false),
             AccountMeta::new_readonly(spl_token::id(), false),
         ],
         data: borsh::to_vec(&ManagedTokenInstruction::InitializeAccount)?,
diff --git a/managed-token/program/tests/test.rs b/managed-token/program/tests/test.rs
@@ -11,7 +11,7 @@ use {
         transaction::Transaction,
     },
     spl_associated_token_account::instruction::create_associated_token_account,
-    spl_associated_token_address::get_associated_token_address,
+    spl_associated_token_account_client::address::get_associated_token_address,
     spl_managed_token::instruction::*,
     spl_token::state::Account as TokenAccount,
 };
diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml
@@ -31,7 +31,7 @@ solana-vote-program = "2.0.3"
 spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [
   "no-entrypoint",
 ] }
-spl-associated-token-address = { version = "1.0.0", path = "../../associated-token-address" }
+spl-associated-token-account-client = { version = "1.0.0", path = "../../associated-token-account/client" }
 test-case = "3.3"
 bincode = "1.3.1"
 rand = "0.8.5"
diff --git a/single-pool/program/tests/deposit.rs b/single-pool/program/tests/deposit.rs
@@ -12,7 +12,7 @@ use {
         stake::state::{Authorized, Lockup},
         transaction::Transaction,
     },
-    spl_associated_token_address as atoken,
+    spl_associated_token_account_client::address as atoken,
     spl_single_pool::{
         error::SinglePoolError, find_default_deposit_account_address, id, instruction,
     },
diff --git a/single-pool/program/tests/helpers/mod.rs b/single-pool/program/tests/helpers/mod.rs
@@ -17,7 +17,7 @@ use {
         self, vote_instruction,
         vote_state::{VoteInit, VoteState},
     },
-    spl_associated_token_address as atoken,
+    spl_associated_token_account_client::address as atoken,
     spl_single_pool::{
         find_pool_address, find_pool_mint_address, find_pool_mint_authority_address,
         find_pool_mpl_authority_address, find_pool_stake_address,
diff --git a/stake-pool/cli/Cargo.toml b/stake-pool/cli/Cargo.toml
@@ -26,7 +26,7 @@ solana-sdk = "2.0.3"
 spl-associated-token-account = { version = "=4.0.0", path = "../../associated-token-account/program", features = [
   "no-entrypoint",
 ] }
-spl-associated-token-address = { version = "=1.0.0", path = "../../associated-token-address" }
+spl-associated-token-account-client = { version = "=1.0.0", path = "../../associated-token-account/client" }
 spl-stake-pool = { version = "=2.0.0", path = "../program", features = [
   "no-entrypoint",
 ] }
diff --git a/stake-pool/cli/src/main.rs b/stake-pool/cli/src/main.rs
@@ -44,7 +44,7 @@ use {
         transaction::Transaction,
     },
     spl_associated_token_account::instruction::create_associated_token_account,
-    spl_associated_token_address::get_associated_token_address,
+    spl_associated_token_account_client::address::get_associated_token_address,
     spl_stake_pool::{
         self, find_stake_program_address, find_transient_stake_program_address,
         find_withdraw_authority_program_address,
diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml
@@ -16,7 +16,7 @@ solana-program = "2.0.3"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
-spl-associated-token-address = { version = "1.0.0", path = "../../associated-token-address" }
+spl-associated-token-account-client = { version = "1.0.0", path = "../../associated-token-account/client" }
 thiserror = "1.0"
 
 [dev-dependencies]
diff --git a/stateless-asks/program/src/validation_utils.rs b/stateless-asks/program/src/validation_utils.rs
@@ -7,7 +7,7 @@ use {
         program_pack::{IsInitialized, Pack},
         pubkey::Pubkey,
     },
-    spl_associated_token_address::get_associated_token_address,
+    spl_associated_token_account_client::address::get_associated_token_address,
     spl_token::{self, state::Account},
 };
 
diff --git a/token-upgrade/cli/Cargo.toml b/token-upgrade/cli/Cargo.toml
@@ -20,7 +20,7 @@ solana-logger = "2.0.3"
 solana-remote-wallet = "2.0.3"
 solana-sdk = "2.0.3"
 spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] }
-spl-associated-token-address = { version = "1.0.0", path = "../../associated-token-address" }
+spl-associated-token-account-client = { version = "1.0.0", path = "../../associated-token-account/client" }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
 spl-token-client = { version = "0.11.0", path = "../../token/client" }
diff --git a/token-upgrade/cli/src/main.rs b/token-upgrade/cli/src/main.rs
@@ -18,7 +18,7 @@ use {
         signature::{Signature, Signer},
         transaction::Transaction,
     },
-    spl_associated_token_address::get_associated_token_address_with_program_id,
+    spl_associated_token_account_client::address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::StateWithExtensions,
         state::{Account, Mint},
diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml
@@ -38,7 +38,7 @@ spl-token-client = { version = "0.11.0", path = "../client" }
 spl-token-confidential-transfer-proof-generation = { version = "0.1.0", path = "../confidential-transfer/proof-generation" }
 spl-token-metadata-interface = { version = "0.4.0", path = "../../token-metadata/interface" }
 spl-token-group-interface = { version = "0.3.0", path = "../../token-group/interface" }
-spl-associated-token-address = { version = "1.0.0", path = "../../associated-token-address" }
+spl-associated-token-account-client = { version = "1.0.0", path = "../../associated-token-account/client" }
 spl-memo = { version = "5.0", path = "../../memo/program", features = [
   "no-entrypoint",
 ] }
diff --git a/token/cli/src/bench.rs b/token/cli/src/bench.rs
@@ -12,7 +12,7 @@ use {
         message::Message, native_token::lamports_to_sol, native_token::Sol, program_pack::Pack,
         pubkey::Pubkey, signature::Signer, system_instruction,
     },
-    spl_associated_token_address::get_associated_token_address_with_program_id,
+    spl_associated_token_account_client::address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::StateWithExtensions,
         instruction,
diff --git a/token/cli/src/command.rs b/token/cli/src/command.rs
@@ -34,7 +34,7 @@ use {
         signature::{Keypair, Signer},
         system_program,
     },
-    spl_associated_token_address::get_associated_token_address_with_program_id,
+    spl_associated_token_account_client::address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::{
             confidential_transfer::{
diff --git a/token/cli/src/config.rs b/token/cli/src/config.rs
@@ -15,7 +15,7 @@ use {
         account::Account as RawAccount, commitment_config::CommitmentConfig, hash::Hash,
         pubkey::Pubkey, signature::Signer,
     },
-    spl_associated_token_address::get_associated_token_address_with_program_id,
+    spl_associated_token_account_client::address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::StateWithExtensionsOwned,
         state::{Account, Mint},
diff --git a/token/cli/src/sort.rs b/token/cli/src/sort.rs
diff --git a/token/cli/tests/command.rs b/token/cli/tests/command.rs
diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml
diff --git a/token/client/src/token.rs b/token/client/src/token.rs
