associated-token-account: Bump dependent token version to 3.3 (#2766)

* associated-token-account: Bump dependent token version to 3.3

* Fix uses of deprecated instruction

Author: joncinque

Cargo.lock

@@ -14,7 +14,7 @@ test-bpf = []
 [dependencies]
 borsh = "0.9.1"
 solana-program = "1.9.2"
-spl-token = { version = "0.1", path = "../../token/program-2022", features = ["no-entrypoint"], package = "spl-token-2022" }
+spl-token = { version = "3.3", path = "../../token/program", features = ["no-entrypoint"] }
 
 [dev-dependencies]
 solana-program-test = "1.9.2"

associated-token-account/program/Cargo.toml

@@ -9,12 +9,7 @@ pub mod tools;
 
 // Export current SDK types for downstream users building with a different SDK version
 pub use solana_program;
-use solana_program::{
-    instruction::{AccountMeta, Instruction},
-    program_pack::Pack,
-    pubkey::Pubkey,
-    sysvar,
-};
+use solana_program::{instruction::Instruction, program_pack::Pack, pubkey::Pubkey};
 
 solana_program::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
 
@@ -65,28 +60,19 @@ fn get_associated_token_address_and_bump_seed_internal(
 ///   3. `[]` The token mint for the new associated token account
 ///   4. `[]` System program
 ///   5. `[]` SPL Token program
-///   6. `[]` Rent sysvar
 ///
-// TODO: Uncomment after 1.0.4 is released
-// #[deprecated(
-//     since = "1.0.4",
-//     note = "please use `instruction::create_associated_token_account` instead"
-// )]
+#[deprecated(
+    since = "1.0.4",
+    note = "please use `instruction::create_associated_token_account` instead"
+)]
 pub fn create_associated_token_account(
     funding_address: &Pubkey,
     wallet_address: &Pubkey,
     spl_token_mint_address: &Pubkey,
 ) -> Instruction {
-    let mut instruction = instruction::create_associated_token_account(
+    instruction::create_associated_token_account(
         funding_address,
         wallet_address,
         spl_token_mint_address,
-    );
-
-    // TODO: Remove after ATA 1.0.4 and Token  >3.2.0 are released (Token::InitializeAccount3 is required if rent account is not provided)
-    instruction
-        .accounts
-        .push(AccountMeta::new_readonly(sysvar::rent::id(), false));
-
-    instruction
+    )
 }

associated-token-account/program/src/lib.rs

@@ -51,10 +51,7 @@ pub fn process_create_associated_token_account(
     let spl_token_program_info = next_account_info(account_info_iter)?;
     let spl_token_program_id = spl_token_program_info.key;
 
-    // TODO: Remove after ATA 1.0.4 and Token >3.2.0 are released and just use Rent::get()
-    let (rent_sysvar_info, rent) = next_account_info(account_info_iter)
-        .map(|info| (Some(info), Rent::from_account_info(info).unwrap()))
-        .unwrap_or((None, Rent::get().unwrap()));
+    let rent = Rent::get()?;
 
     let (associated_token_address, bump_seed) = get_associated_token_address_and_bump_seed_internal(
         wallet_account_info.key,
@@ -85,38 +82,18 @@ pub fn process_create_associated_token_account(
     )?;
 
     msg!("Initialize the associated token account");
-
-    if let Some(rent_sysvar_info) = rent_sysvar_info {
-        invoke(
-            &spl_token::instruction::initialize_account(
-                spl_token_program_id,
-                associated_token_account_info.key,
-                spl_token_mint_info.key,
-                wallet_account_info.key,
-            )?,
-            &[
-                associated_token_account_info.clone(),
-                spl_token_mint_info.clone(),
-                wallet_account_info.clone(),
-                rent_sysvar_info.clone(),
-                spl_token_program_info.clone(),
-            ],
-        )
-    } else {
-        // Use InitializeAccount3 when Rent account is not provided
-        invoke(
-            &spl_token::instruction::initialize_account3(
-                spl_token_program_id,
-                associated_token_account_info.key,
-                spl_token_mint_info.key,
-                wallet_account_info.key,
-            )?,
-            &[
-                associated_token_account_info.clone(),
-                spl_token_mint_info.clone(),
-                wallet_account_info.clone(),
-                spl_token_program_info.clone(),
-            ],
-        )
-    }
+    invoke(
+        &spl_token::instruction::initialize_account3(
+            spl_token_program_id,
+            associated_token_account_info.key,
+            spl_token_mint_info.key,
+            wallet_account_info.key,
+        )?,
+        &[
+            associated_token_account_info.clone(),
+            spl_token_mint_info.clone(),
+            wallet_account_info.clone(),
+            spl_token_program_info.clone(),
+        ],
+    )
 }

associated-token-account/program/src/processor.rs

@@ -300,6 +300,7 @@ async fn test_create_associated_token_account_using_deprecated_instruction_creat
     );
 
     // Use legacy instruction creator
+    #[allow(deprecated)]
     let create_associated_token_account_ix = deprecated_create_associated_token_account(
         &payer.pubkey(),
         &wallet_address,

associated-token-account/program/tests/process_create_associated_token_account.rs

@@ -12,7 +12,7 @@ pub fn program_test(token_mint_address: Pubkey, use_latest_spl_token: bool) -> P
     );
 
     if use_latest_spl_token {
-        // TODO: Remove after Token >3.2.0 is released
+        // TODO: Remove after Token >3.2.0 is available by default in program-test
         pc.add_program(
             "spl_token",
             spl_token::id(),

associated-token-account/program/tests/program_test.rs

@@ -37,7 +37,9 @@ use {
         system_instruction,
         transaction::Transaction,
     },
-    spl_associated_token_account::{create_associated_token_account, get_associated_token_address},
+    spl_associated_token_account::{
+        get_associated_token_address, instruction::create_associated_token_account,
+    },
     spl_stake_pool::state::ValidatorStakeInfo,
     spl_stake_pool::{
         self, find_stake_program_address, find_transient_stake_program_address,

stake-pool/cli/src/main.rs

@@ -14,7 +14,7 @@ test-bpf = []
 borsh = "0.9.1"
 solana-program = "1.9.2"
 spl-token = { version = "3.3", path = "../../token/program", features = ["no-entrypoint"] }
-spl-associated-token-account = {version = "1.0.3", features = ["no-entrypoint"]}
+spl-associated-token-account = {version = "1.0", path = "../../associated-token-account/program", features = ["no-entrypoint"]}
 metaplex-token-metadata = { version = "0.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
 

stateless-asks/program/Cargo.toml

@@ -41,7 +41,9 @@ use solana_sdk::{
     system_instruction, system_program,
     transaction::Transaction,
 };
-use spl_associated_token_account::*;
+use spl_associated_token_account::{
+    get_associated_token_address, instruction::create_associated_token_account,
+};
 use spl_token::{
     self,
     instruction::*,

token/cli/src/main.rs

@@ -17,6 +17,6 @@ async-trait = "0.1"
 solana-client = "=1.9.2"
 solana-program-test = "=1.9.2"
 solana-sdk = "=1.9.2"
-spl-associated-token-account = { version = "1.0", features = ["no-entrypoint"] }
+spl-associated-token-account = { version = "1.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "0.1", path="../program-2022" }
 thiserror = "1.0"