Skip to content

Remove unnecessary transfer hook token program account info #1004

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
merged 3 commits into from
Aug 13, 2025
Merged

Remove unnecessary transfer hook token program account info #1004

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
95fd5ea
Remove unnecessary transfer hook account info
Arrowana Jul 10, 2025
128565a
changeset
yugure-orca Jul 15, 2025
9aefbc6
Merge branch 'main' into transfer-hook-unnecessary-account-info
yugure-orca Aug 13, 2025
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
5 changes: 5 additions & 0 deletions .changeset/yellow-parks-show.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@orca-so/whirlpools-program": patch
---

Remove unnecessary transfer hook token program account info
18 changes: 8 additions & 10 deletions programs/whirlpool/src/util/v2/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ pub fn transfer_from_owner_to_vault_v2<'info>(
)?;

let mut account_infos = vec![
token_program.to_account_info(),
// owner to vault
token_owner_account.to_account_info(), // from (owner account)
token_mint.to_account_info(), // mint
Expand All @@ -69,9 +68,9 @@ pub fn transfer_from_owner_to_vault_v2<'info>(

// TransferHook extension
if let Some(hook_program_id) = get_transfer_hook_program_id(token_mint)? {
if transfer_hook_accounts.is_none() {
return Err(ErrorCode::NoExtraAccountsForTransferHook.into());
}
let transfer_hook_accounts = transfer_hook_accounts
.as_deref()
.ok_or(ErrorCode::NoExtraAccountsForTransferHook)?;

spl_transfer_hook_interface::onchain::add_extra_accounts_for_execute_cpi(
&mut instruction,
Expand All @@ -83,7 +82,7 @@ pub fn transfer_from_owner_to_vault_v2<'info>(
token_vault.to_account_info(), // to (vault account)
authority.to_account_info(), // authority (owner)
amount,
transfer_hook_accounts.as_ref().unwrap(),
transfer_hook_accounts,
)?;
}

Expand Down Expand Up @@ -141,7 +140,6 @@ pub fn transfer_from_vault_to_owner_v2<'info>(
)?;

let mut account_infos = vec![
token_program.to_account_info(),
// vault to owner
token_vault.to_account_info(), // from (vault account)
token_mint.to_account_info(), // mint
Expand All @@ -151,9 +149,9 @@ pub fn transfer_from_vault_to_owner_v2<'info>(

// TransferHook extension
if let Some(hook_program_id) = get_transfer_hook_program_id(token_mint)? {
if transfer_hook_accounts.is_none() {
return Err(ErrorCode::NoExtraAccountsForTransferHook.into());
}
let transfer_hook_accounts = transfer_hook_accounts
.as_deref()
.ok_or(ErrorCode::NoExtraAccountsForTransferHook)?;

spl_transfer_hook_interface::onchain::add_extra_accounts_for_execute_cpi(
&mut instruction,
Expand All @@ -165,7 +163,7 @@ pub fn transfer_from_vault_to_owner_v2<'info>(
token_owner_account.to_account_info(), // to (owner account)
whirlpool.to_account_info(), // authority (pool)
amount,
transfer_hook_accounts.as_ref().unwrap(),
transfer_hook_accounts,
)?;
}

Expand Down