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

verify cpi mint matches transfer mint in hook #65

Merged
merged 2 commits into from
Jul 1, 2024
Merged

verify cpi mint matches transfer mint in hook #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
880c1f4
verify cpi mint matches transfer mint in hook
Bhargavamacha Jul 1, 2024
2579787
fix index
Bhargavamacha Jul 1, 2024
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
2 changes: 2 additions & 0 deletions programs/asset_controller/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ pub enum AssetControllerErrors {
InvalidCpiTransferProgram,
#[msg("Invalid cpi amount in transfer")]
InvalidCpiTransferAmount,
#[msg("Invalid cpi mint in transfer")]
InvalidCpiTransferMint,
}
6 changes: 5 additions & 1 deletion programs/asset_controller/src/instructions/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ pub struct ExecuteTransferHook<'info> {
}

pub fn handler(ctx: Context<ExecuteTransferHook>, amount: u64) -> Result<()> {
verify_cpi_program_is_token22(&ctx.accounts.instructions_program.to_account_info(), amount)?;
verify_cpi_program_is_token22(
&ctx.accounts.instructions_program.to_account_info(),
amount,
ctx.accounts.asset_mint.key(),
)?;

let asset_mint = ctx.accounts.asset_mint.key();

Expand Down
11 changes: 11 additions & 0 deletions programs/asset_controller/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,12 @@ pub fn verify_pda(address: Pubkey, seeds: &[&[u8]], program_id: &Pubkey) -> Resu
Ok(())
}

pub const TRANSFER_HOOK_MINT_INDEX: usize = 1;

pub fn verify_cpi_program_is_token22(
instructions_program: &AccountInfo,
amount: u64,
mint: Pubkey,
) -> Result<()> {
let ix_relative = get_instruction_relative(0, instructions_program)?;
if ix_relative.program_id != token_2022::ID {
Expand All @@ -103,6 +106,14 @@ pub fn verify_cpi_program_is_token22(
if ix_relative.data[1..9] != amount.to_le_bytes() {
return Err(AssetControllerErrors::InvalidCpiTransferAmount.into());
}
// make sure transfer mint is same
if let Some(account) = ix_relative.accounts.get(TRANSFER_HOOK_MINT_INDEX) {
if account.pubkey != mint {
return Err(AssetControllerErrors::InvalidCpiTransferMint.into());
}
} else {
return Err(AssetControllerErrors::InvalidCpiTransferProgram.into());
}

Ok(())
}
Loading