Skip to content

perf: ctoken remove return value of verify_owner_or_delegate_signer #2022

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
ananas-block merged 1 commit into from
Oct 28, 2025
Merged

perf: ctoken remove return value of verify_owner_or_delegate_signer #2022

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
6 changes: 3 additions & 3 deletions programs/compressed-token/program/src/shared/owner_validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use pinocchio::account_info::AccountInfo;
pub fn verify_owner_or_delegate_signer<'a>(
owner_account: &'a AccountInfo,
delegate_account: Option<&'a AccountInfo>,
) -> Result<Option<&'a AccountInfo>, ProgramError> {
) -> Result<(), ProgramError> {
if let Some(delegate_account) = delegate_account {
// If delegate is used, delegate or owner must be signer
match check_signer(delegate_account) {
Expand All @@ -35,7 +35,7 @@ pub fn verify_owner_or_delegate_signer<'a>(
})?;
}
}
Ok(Some(delegate_account))
Ok(())
} else {
// If no delegate, owner must be signer
check_signer(owner_account).map_err(|e| {
Expand All @@ -46,7 +46,7 @@ pub fn verify_owner_or_delegate_signer<'a>(
anchor_lang::solana_program::msg!("Owner signer check failed: {:?}", e);
ProgramError::from(e)
})?;
Ok(None)
Ok(())
}
}

Expand Down
4 changes: 2 additions & 2 deletions programs/compressed-token/program/src/shared/token_input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ fn set_input_compressed_account_inner<const IS_FROZEN: bool>(
None
};

let verified_delegate = verify_owner_or_delegate_signer(owner_account, delegate_account)?;
verify_owner_or_delegate_signer(owner_account, delegate_account)?;
let token_version = TokenDataVersion::try_from(input_token_data.version)?;
let mint_account = &accounts
.get(input_token_data.mint as usize)
Expand Down Expand Up @@ -119,7 +119,7 @@ fn set_input_compressed_account_inner<const IS_FROZEN: bool>(
token_version.serialize_amount_bytes(input_token_data.amount.into())?;

let hashed_delegate =
verified_delegate.map(|delegate| hash_cache.get_or_hash_pubkey(delegate.key()));
delegate_account.map(|delegate| hash_cache.get_or_hash_pubkey(delegate.key()));

if !IS_FROZEN {
TokenData::hash_with_hashed_values(
Expand Down
Loading