Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 3 additions & 9 deletions programs/token/src/instructions/initialize_account.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use pinocchio::{
account_info::AccountInfo,
instruction::{AccountMeta, Instruction, Signer},
program::invoke_signed,
cpi::invoke,
instruction::{AccountMeta, Instruction},
ProgramResult,
};

Expand All @@ -26,11 +26,6 @@ pub struct InitializeAccount<'a> {
impl InitializeAccount<'_> {
#[inline(always)]
pub fn invoke(&self) -> ProgramResult {
self.invoke_signed(&[])
}

#[inline(always)]
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
// account metadata
let account_metas: [AccountMeta; 4] = [
AccountMeta::writable(self.account.key()),
Expand All @@ -45,10 +40,9 @@ impl InitializeAccount<'_> {
data: &[1],
};

invoke_signed(
invoke(
&instruction,
&[self.account, self.mint, self.owner, self.rent_sysvar],
signers,
)
}
}
15 changes: 3 additions & 12 deletions programs/token/src/instructions/initialize_account_2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use core::slice::from_raw_parts;

use pinocchio::{
account_info::AccountInfo,
instruction::{AccountMeta, Instruction, Signer},
program::invoke_signed,
cpi::invoke,
instruction::{AccountMeta, Instruction},
pubkey::Pubkey,
ProgramResult,
};
Expand All @@ -30,11 +30,6 @@ pub struct InitializeAccount2<'a> {
impl InitializeAccount2<'_> {
#[inline(always)]
pub fn invoke(&self) -> ProgramResult {
self.invoke_signed(&[])
}

#[inline(always)]
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
// account metadata
let account_metas: [AccountMeta; 3] = [
AccountMeta::writable(self.account.key()),
Expand All @@ -58,10 +53,6 @@ impl InitializeAccount2<'_> {
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, 33) },
};

invoke_signed(
&instruction,
&[self.account, self.mint, self.rent_sysvar],
signers,
)
invoke(&instruction, &[self.account, self.mint, self.rent_sysvar])
}
}
11 changes: 3 additions & 8 deletions programs/token/src/instructions/initialize_account_3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use core::slice::from_raw_parts;

use pinocchio::{
account_info::AccountInfo,
instruction::{AccountMeta, Instruction, Signer},
program::invoke_signed,
cpi::invoke,
instruction::{AccountMeta, Instruction},
pubkey::Pubkey,
ProgramResult,
};
Expand All @@ -27,11 +27,6 @@ pub struct InitializeAccount3<'a> {
impl InitializeAccount3<'_> {
#[inline(always)]
pub fn invoke(&self) -> ProgramResult {
self.invoke_signed(&[])
}

#[inline(always)]
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
// account metadata
let account_metas: [AccountMeta; 2] = [
AccountMeta::writable(self.account.key()),
Expand All @@ -54,6 +49,6 @@ impl InitializeAccount3<'_> {
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, 33) },
};

invoke_signed(&instruction, &[self.account, self.mint], signers)
invoke(&instruction, &[self.account, self.mint])
}
}
11 changes: 3 additions & 8 deletions programs/token/src/instructions/initialize_mint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use core::slice::from_raw_parts;

use pinocchio::{
account_info::AccountInfo,
instruction::{AccountMeta, Instruction, Signer},
program::invoke_signed,
cpi::invoke,
instruction::{AccountMeta, Instruction},
pubkey::Pubkey,
ProgramResult,
};
Expand Down Expand Up @@ -31,11 +31,6 @@ pub struct InitializeMint<'a> {
impl InitializeMint<'_> {
#[inline(always)]
pub fn invoke(&self) -> ProgramResult {
self.invoke_signed(&[])
}

#[inline(always)]
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
// Account metadata
let account_metas: [AccountMeta; 2] = [
AccountMeta::writable(self.mint.key()),
Expand Down Expand Up @@ -75,6 +70,6 @@ impl InitializeMint<'_> {
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, length) },
};

invoke_signed(&instruction, &[self.mint, self.rent_sysvar], signers)
invoke(&instruction, &[self.mint, self.rent_sysvar])
}
}
11 changes: 3 additions & 8 deletions programs/token/src/instructions/initialize_mint_2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use core::slice::from_raw_parts;

use pinocchio::{
account_info::AccountInfo,
instruction::{AccountMeta, Instruction, Signer},
program::invoke_signed,
cpi::invoke,
instruction::{AccountMeta, Instruction},
pubkey::Pubkey,
ProgramResult,
};
Expand All @@ -28,11 +28,6 @@ pub struct InitializeMint2<'a> {
impl InitializeMint2<'_> {
#[inline(always)]
pub fn invoke(&self) -> ProgramResult {
self.invoke_signed(&[])
}

#[inline(always)]
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
// Account metadata
let account_metas: [AccountMeta; 1] = [AccountMeta::writable(self.mint.key())];

Expand Down Expand Up @@ -69,6 +64,6 @@ impl InitializeMint2<'_> {
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, length) },
};

invoke_signed(&instruction, &[self.mint], signers)
invoke(&instruction, &[self.mint])
}
}
11 changes: 3 additions & 8 deletions programs/token/src/instructions/sync_native.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use pinocchio::{
account_info::AccountInfo,
instruction::{AccountMeta, Instruction, Signer},
program::invoke_signed,
cpi::invoke,
instruction::{AccountMeta, Instruction},
ProgramResult,
};

Expand All @@ -19,11 +19,6 @@ pub struct SyncNative<'a> {
impl SyncNative<'_> {
#[inline(always)]
pub fn invoke(&self) -> ProgramResult {
self.invoke_signed(&[])
}

#[inline(always)]
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
// account metadata
let account_metas: [AccountMeta; 1] = [AccountMeta::writable(self.native_token.key())];

Expand All @@ -33,6 +28,6 @@ impl SyncNative<'_> {
data: &[17],
};

invoke_signed(&instruction, &[self.native_token], signers)
invoke(&instruction, &[self.native_token])
}
}