Restore rent sysvar to create_associated_token_account

CriesofCarrots · Jan 24, 2022 · c309e10 · c309e10
1 parent 533f767
commit c309e10
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spl-associated-token-account"
-version = "1.0.4"
+version = "1.0.5"
 description = "Solana Program Library Associated Token Account"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"

diff --git a/associated-token-account/program/src/lib.rs b/associated-token-account/program/src/lib.rs
@@ -9,7 +9,12 @@ pub mod tools;
 
 // Export current SDK types for downstream users building with a different SDK version
 pub use solana_program;
-use solana_program::{instruction::Instruction, program_pack::Pack, pubkey::Pubkey};
+use solana_program::{
+    instruction::{AccountMeta, Instruction},
+    program_pack::Pack,
+    pubkey::Pubkey,
+    sysvar,
+};
 
 solana_program::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
 
@@ -62,17 +67,28 @@ fn get_associated_token_address_and_bump_seed_internal(
 ///   5. `[]` SPL Token program
 ///
 #[deprecated(
-    since = "1.0.4",
+    since = "1.0.5",
     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 {
-    instruction::create_associated_token_account(
-        funding_address,
-        wallet_address,
-        spl_token_mint_address,
-    )
+    let associated_account_address =
+        get_associated_token_address(wallet_address, spl_token_mint_address);
+
+    Instruction {
+        program_id: id(),
+        accounts: vec![
+            AccountMeta::new(*funding_address, true),
+            AccountMeta::new(associated_account_address, false),
+            AccountMeta::new_readonly(*wallet_address, false),
+            AccountMeta::new_readonly(*spl_token_mint_address, false),
+            AccountMeta::new_readonly(solana_program::system_program::id(), false),
+            AccountMeta::new_readonly(spl_token::id(), false),
+            AccountMeta::new_readonly(sysvar::rent::id(), false),
+        ],
+        data: vec![],
+    }
 }