Skip to content

Fix init_mint caller macros (replicate unpacking errors) #157

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

Merged
jberthold merged 3 commits into from
Jan 24, 2026
Merged

Fix init_mint caller macros (replicate unpacking errors) #157

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
002558f
Add unpacking error case to `call_process_initialize_mint` macro
jberthold Jan 23, 2026
7dae463
Add unpacking error case to `call_process_initialize_mint_no_freeze` …
jberthold Jan 23, 2026
041dea6
init_mint2_*: replicate changes made to init_mint calling macro
jberthold Jan 23, 2026
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
58 changes: 44 additions & 14 deletions specs/prelude-spl-token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,41 +314,71 @@ macro_rules! call_process_initialize_mint2 {
let data = $instruction_data;
let decimals = data[0];
let mint_authority = Pubkey::new_from_array(data[1..33].try_into().unwrap());
let freeze_authority = if data[33] == 1 {
solana_program_option::COption::Some(Pubkey::new_from_array(data[34..66].try_into().unwrap()))
} else {
solana_program_option::COption::None
};
Processor::process_initialize_mint2($accounts, decimals, mint_authority, freeze_authority)
match data[33] {
// see TokenInstruction::unpack_pubkey_option, used in TokenInstruction::unpack()
0 =>
Processor::process_initialize_mint2(
$accounts,
decimals,
mint_authority,
solana_program_option::COption::None
),
1 => {
let freeze_authority =
solana_program_option::COption::Some(Pubkey::new_from_array(data[34..66].try_into().unwrap()));
Processor::process_initialize_mint2($accounts, decimals, mint_authority, freeze_authority)
},
_ => Err(TokenError::InvalidInstruction.into()),
}
}};
}
macro_rules! call_process_initialize_mint2_no_freeze {
($accounts:expr, $instruction_data:expr) => {{
let data = $instruction_data;
let decimals = data[0];
let mint_authority = Pubkey::new_from_array(data[1..33].try_into().unwrap());
Processor::process_initialize_mint2($accounts, decimals, mint_authority, solana_program_option::COption::None)
assert!(data.len() == 34);
if data[33] != 0 {
Err(TokenError::InvalidInstruction.into())
} else {
Processor::process_initialize_mint2($accounts, decimals, mint_authority, solana_program_option::COption::None)
}
}};
}
macro_rules! call_process_initialize_mint {
($accounts:expr, $instruction_data:expr) => {{
let data = $instruction_data;
let decimals = data[0];
let mint_authority = Pubkey::new_from_array(data[1..33].try_into().unwrap());
let freeze_authority = if data[33] == 1 {
solana_program_option::COption::Some(Pubkey::new_from_array(data[34..66].try_into().unwrap()))
} else {
solana_program_option::COption::None
};
Processor::process_initialize_mint($accounts, decimals, mint_authority, freeze_authority)
match data[33] {
// see TokenInstruction::unpack_pubkey_option, used in TokenInstruction::unpack()
0 =>
Processor::process_initialize_mint(
$accounts,
decimals,
mint_authority,
solana_program_option::COption::None
),
1 => {
let freeze_authority =
solana_program_option::COption::Some(Pubkey::new_from_array(data[34..66].try_into().unwrap()));
Processor::process_initialize_mint($accounts, decimals, mint_authority, freeze_authority)
},
_ => Err(TokenError::InvalidInstruction.into()),
}
}};
}
macro_rules! call_process_initialize_mint_no_freeze {
($accounts:expr, $instruction_data:expr) => {{
let data = $instruction_data;
let decimals = data[0];
let mint_authority = Pubkey::new_from_array(data[1..33].try_into().unwrap());
Processor::process_initialize_mint($accounts, decimals, mint_authority, solana_program_option::COption::None)
assert!(data.len() == 34);
if data[33] != 0 {
Err(TokenError::InvalidInstruction.into())
} else {
Processor::process_initialize_mint($accounts, decimals, mint_authority, solana_program_option::COption::None)
}
}};
}
macro_rules! call_process_initialize_multisig {
Expand Down