Skip to content

fix spl ata creator fees logic #30

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
samuelvanderwaal merged 1 commit into from
Dec 19, 2024
Merged

fix spl ata creator fees logic #30

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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion toolbox/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "tensor-toolbox"
description = "Toolbox of useful Rust utilities for Tensor Foundation's Solana programs"
repository = "https://github.com/tensor-foundation/toolbox"
homepage = "https://github.com/tensor-foundation/toolbox"
version = "0.7.0"
version = "0.7.1"
edition = "2021"
readme = "../README.md"
license = "Apache-2.0"
Expand Down
21 changes: 13 additions & 8 deletions toolbox/src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ pub fn transfer_creators_fee<'a, 'info>(
let mut remaining_fee = creator_fee;
for creator in creators {
let current_creator_info = next_account_info(creator_accounts)?;

require!(
creator.address.eq(current_creator_info.key),
TensorError::CreatorMismatch
Expand All @@ -296,7 +297,7 @@ pub fn transfer_creators_fee<'a, 'info>(
let pct = creator.share as u64;
let creator_fee = unwrap_checked!({ pct.checked_mul(creator_fee)?.checked_div(100) });

match mode {
let current_creator_ata_info = match mode {
CreatorFeeMode::Sol { from: _ } => {
// Prevents InsufficientFundsForRent, where creator acc doesn't have enough fee
// https://explorer.solana.com/tx/vY5nYA95ELVrs9SU5u7sfU2ucHj4CRd3dMCi1gWrY7MSCBYQLiPqzABj9m8VuvTLGHb9vmhGaGY7mkqPa1NLAFE
Expand All @@ -305,6 +306,7 @@ pub fn transfer_creators_fee<'a, 'info>(
//skip current creator, we can't pay them
continue;
}
None
}
CreatorFeeMode::Spl {
associated_token_program: _,
Expand All @@ -314,8 +316,11 @@ pub fn transfer_creators_fee<'a, 'info>(
from: _,
from_token_acc: _,
rent_payer: _,
} => {}
}
} => {
// ATA validated on transfer CPI.
Some(next_account_info(creator_accounts)?)
}
};

remaining_fee = unwrap_int!(remaining_fee.checked_sub(creator_fee));
if creator_fee > 0 {
Expand Down Expand Up @@ -350,14 +355,14 @@ pub fn transfer_creators_fee<'a, 'info>(
from_token_acc: from_ata,
rent_payer,
} => {
// ATA validated on transfer CPI.
let current_creator_ata_info = next_account_info(creator_accounts)?;
let creator_ata_info =
unwrap_opt!(current_creator_ata_info, "missing creator ata");

anchor_spl::associated_token::create_idempotent(CpiContext::new(
associated_token_program.to_account_info(),
anchor_spl::associated_token::Create {
payer: rent_payer.to_account_info(),
associated_token: current_creator_ata_info.to_account_info(),
associated_token: creator_ata_info.to_account_info(),
authority: current_creator_info.to_account_info(),
mint: currency.to_account_info(),
system_program: system_program.to_account_info(),
Expand All @@ -372,7 +377,7 @@ pub fn transfer_creators_fee<'a, 'info>(
token_program.to_account_info(),
anchor_spl::token::Transfer {
from: from_ata.to_account_info(),
to: current_creator_ata_info.to_account_info(),
to: creator_ata_info.to_account_info(),
authority: from.to_account_info(),
},
),
Expand All @@ -389,7 +394,7 @@ pub fn transfer_creators_fee<'a, 'info>(
anchor_spl::token_interface::TransferChecked {
from: from_ata.to_account_info(),
mint: currency.to_account_info(),
to: current_creator_ata_info.to_account_info(),
to: creator_ata_info.to_account_info(),
authority: from.to_account_info(),
},
),
Expand Down
Loading