Restore rent sysvar to create_associated_token_account
This commit is contained in:
parent
533f767563
commit
c309e10b84
|
@ -3524,7 +3524,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "spl-associated-token-account"
|
name = "spl-associated-token-account"
|
||||||
version = "1.0.4"
|
version = "1.0.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"borsh",
|
"borsh",
|
||||||
"solana-program",
|
"solana-program",
|
||||||
|
@ -3839,7 +3839,7 @@ dependencies = [
|
||||||
"solana-program",
|
"solana-program",
|
||||||
"solana-remote-wallet",
|
"solana-remote-wallet",
|
||||||
"solana-sdk",
|
"solana-sdk",
|
||||||
"spl-associated-token-account 1.0.4",
|
"spl-associated-token-account 1.0.5",
|
||||||
"spl-stake-pool",
|
"spl-stake-pool",
|
||||||
"spl-token 3.3.0",
|
"spl-token 3.3.0",
|
||||||
]
|
]
|
||||||
|
@ -3909,7 +3909,7 @@ dependencies = [
|
||||||
"solana-remote-wallet",
|
"solana-remote-wallet",
|
||||||
"solana-sdk",
|
"solana-sdk",
|
||||||
"solana-transaction-status",
|
"solana-transaction-status",
|
||||||
"spl-associated-token-account 1.0.4",
|
"spl-associated-token-account 1.0.5",
|
||||||
"spl-memo 3.0.1",
|
"spl-memo 3.0.1",
|
||||||
"spl-token 3.3.0",
|
"spl-token 3.3.0",
|
||||||
]
|
]
|
||||||
|
@ -3922,7 +3922,7 @@ dependencies = [
|
||||||
"solana-client",
|
"solana-client",
|
||||||
"solana-program-test",
|
"solana-program-test",
|
||||||
"solana-sdk",
|
"solana-sdk",
|
||||||
"spl-associated-token-account 1.0.4",
|
"spl-associated-token-account 1.0.5",
|
||||||
"spl-token-2022",
|
"spl-token-2022",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
]
|
]
|
||||||
|
@ -4010,7 +4010,7 @@ dependencies = [
|
||||||
"solana-program",
|
"solana-program",
|
||||||
"solana-program-test",
|
"solana-program-test",
|
||||||
"solana-sdk",
|
"solana-sdk",
|
||||||
"spl-associated-token-account 1.0.4",
|
"spl-associated-token-account 1.0.5",
|
||||||
"spl-token 3.3.0",
|
"spl-token 3.3.0",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "spl-associated-token-account"
|
name = "spl-associated-token-account"
|
||||||
version = "1.0.4"
|
version = "1.0.5"
|
||||||
description = "Solana Program Library Associated Token Account"
|
description = "Solana Program Library Associated Token Account"
|
||||||
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||||
repository = "https://github.com/solana-labs/solana-program-library"
|
repository = "https://github.com/solana-labs/solana-program-library"
|
||||||
|
|
|
@ -9,7 +9,12 @@ pub mod tools;
|
||||||
|
|
||||||
// Export current SDK types for downstream users building with a different SDK version
|
// Export current SDK types for downstream users building with a different SDK version
|
||||||
pub use solana_program;
|
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");
|
solana_program::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
|
||||||
|
|
||||||
|
@ -62,7 +67,7 @@ fn get_associated_token_address_and_bump_seed_internal(
|
||||||
/// 5. `[]` SPL Token program
|
/// 5. `[]` SPL Token program
|
||||||
///
|
///
|
||||||
#[deprecated(
|
#[deprecated(
|
||||||
since = "1.0.4",
|
since = "1.0.5",
|
||||||
note = "please use `instruction::create_associated_token_account` instead"
|
note = "please use `instruction::create_associated_token_account` instead"
|
||||||
)]
|
)]
|
||||||
pub fn create_associated_token_account(
|
pub fn create_associated_token_account(
|
||||||
|
@ -70,9 +75,20 @@ pub fn create_associated_token_account(
|
||||||
wallet_address: &Pubkey,
|
wallet_address: &Pubkey,
|
||||||
spl_token_mint_address: &Pubkey,
|
spl_token_mint_address: &Pubkey,
|
||||||
) -> Instruction {
|
) -> Instruction {
|
||||||
instruction::create_associated_token_account(
|
let associated_account_address =
|
||||||
funding_address,
|
get_associated_token_address(wallet_address, spl_token_mint_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![],
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue