Skip to content

feat: restore InitializeAccount3 instruction #10

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: restore InitializeAccount3 instruction #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions program/src/token2022/initialize_account_3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ use pinocchio::{
ProgramResult,
};

use crate::{constants::TOKEN_2022_PROGRAM_ID, utils::{write_bytes, UNINIT_BYTE}};
use crate::{
token2022::constants::TOKEN_2022_PROGRAM_ID,
utils::{write_bytes, UNINIT_BYTE},
};

/// Initialize a new Token Account.
///
Expand All @@ -30,7 +33,12 @@ impl InitializeAccount3<'_> {
self.invoke_signed(&[])
}

const DISCRIMINATOR_OFFSET: usize = 0;
const OWNER_OFFSET: usize = Self::DISCRIMINATOR_OFFSET + size_of::<u8>();

pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
const DISCRIMINATOR: u8 = 0x12;

// account metadata
let account_metas: [AccountMeta; 2] = [
AccountMeta::writable(self.account.key()),
Expand All @@ -43,14 +51,17 @@ impl InitializeAccount3<'_> {
let mut instruction_data = [UNINIT_BYTE; 33];

// Set discriminator as u8 at offset [0]
write_bytes(&mut instruction_data, &[18]);
write_bytes(
&mut instruction_data[Self::DISCRIMINATOR_OFFSET..],
&[DISCRIMINATOR],
);
// Set owner as [u8; 32] at offset [1..33]
write_bytes(&mut instruction_data[1..], self.owner);
write_bytes(&mut instruction_data[Self::OWNER_OFFSET..], self.owner);

let instruction = Instruction {
program_id: &TOKEN_2022_PROGRAM_ID,
accounts: &account_metas,
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, 33) },
data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, instruction_data.len()) },
};

invoke_signed(&instruction, &[self.account, self.mint], signers)
Expand Down
3 changes: 3 additions & 0 deletions program/src/token2022/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
pub mod initialize_account_3;
pub use initialize_account_3::*;

pub mod initialize_mint_close_authority;
pub use initialize_mint_close_authority::*;

Expand Down