Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require spl-token accounts to be rent-exempt #62

Closed
wants to merge 3 commits into from
Closed

Require spl-token accounts to be rent-exempt #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12e7235
native-iface
mvines Jun 30, 2020
26d806c
Revert "native-iface"
mvines Jun 30, 2020
f712777
Require spl-token accounts to be rent-exempt
mvines Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions token/src/instruction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use solana_sdk::{
instruction::{AccountMeta, Instruction},
program_error::ProgramError,
pubkey::Pubkey,
sysvar,
};
use std::mem::size_of;

Expand All @@ -27,20 +28,22 @@ pub enum TokenInstruction {
/// # Accounts expected by this instruction:
///
/// 0. `[writable, signer]` New token to create.
/// 1.
/// 1. `[]` Rent sysvar
/// 2.
/// * If supply is non-zero: `[writable]` Account to hold all the newly minted tokens.
/// * If supply is zero: `[]` Owner of the token.
/// 2. Optional: `[]` Owner of the token if supply is non-zero, if present then the token allows further minting of tokens.
/// 3. Optional: `[]` Owner of the token if supply is non-zero, if present then the token allows further minting of tokens.
NewToken(TokenInfo),
/// Creates a new account. The new account can either hold tokens or be a delegate
/// for another account.
///
/// # Accounts expected by this instruction:
///
/// 0. `[writable, signer]` New account being created.
/// 1. `[]` Owner of the new account.
/// 2. `[]` Token this account will be associated with.
/// 3. Optional: `[]` Source account that this account will be a delegate for.
/// 1. `[]` Rent sysvar
/// 2. `[]` Owner of the new account.
/// 3. `[]` Token this account will be associated with.
/// 4. Optional: `[]` Source account that this account will be a delegate for.
NewAccount,
/// Transfers tokens from one account to another either directly or via a delegate.
///
Expand Down Expand Up @@ -75,6 +78,7 @@ pub enum TokenInstruction {
/// 0. `[signer]` Owner of the token.
/// 1. `[writable]` Token to mint.
/// 2. `[writable]` Account to mint tokens to.
/// 3. `[]` Rent sysvar
MintTo(u64),
/// Burns tokens by removing them from an account and the total supply.
///
Expand Down Expand Up @@ -190,7 +194,10 @@ pub fn new_token(
) -> Result<Instruction, ProgramError> {
let data = TokenInstruction::NewToken(token_info).serialize()?;

let mut accounts = vec![AccountMeta::new(*token_pubkey, true)];
let mut accounts = vec![
AccountMeta::new(*token_pubkey, true),
AccountMeta::new_readonly(sysvar::rent::id(), false),
];
if token_info.supply != 0 {
match account_pubkey {
Some(pubkey) => accounts.push(AccountMeta::new(*pubkey, false)),
Expand Down Expand Up @@ -227,6 +234,7 @@ pub fn new_account(

let mut accounts = vec![
AccountMeta::new(*account_pubkey, true),
AccountMeta::new_readonly(sysvar::rent::id(), false),
AccountMeta::new_readonly(*owner_pubkey, false),
AccountMeta::new_readonly(*token_pubkey, false),
];
Expand Down Expand Up @@ -329,6 +337,7 @@ pub fn mint_to(

let accounts = vec![
AccountMeta::new_readonly(*owner_pubkey, true),
AccountMeta::new_readonly(sysvar::rent::id(), false),
AccountMeta::new(*token_pubkey, false),
AccountMeta::new(*account_pubkey, false),
];
Expand Down
Loading