correctly triage between T22 and legacy tokens for creator fee transfers (#29)

* correctly triage between T22 and legacy tokens for creator fee transfers

* fmt

Author: leantOnSol

Cargo.lock

@@ -3,12 +3,13 @@ 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.6.0"
+version = "0.7.0"
 edition = "2021"
 readme = "../README.md"
 license = "Apache-2.0"
 
 [features]
+default = ["token-2022"]
 cnft = ["dep:mpl-bubblegum"]
 mpl-core = ["dep:mpl-core"]
 token-2022 = []

toolbox/Cargo.toml

@@ -8,6 +8,7 @@ use mpl_token_metadata::types::TokenStandard;
 use std::slice::Iter;
 use tensor_vipers::prelude::*;
 
+use crate::token_2022::transfer::transfer_checked as token_2022_transfer_checked;
 use crate::TensorError;
 
 pub const HUNDRED_PCT_BPS: u64 = 10000;
@@ -364,17 +365,40 @@ pub fn transfer_creators_fee<'a, 'info>(
                         },
                     ))?;
 
-                    anchor_spl::token::transfer(
-                        CpiContext::new(
-                            token_program.to_account_info(),
-                            anchor_spl::token::Transfer {
-                                from: from_ata.to_account_info(),
-                                to: current_creator_ata_info.to_account_info(),
-                                authority: from.to_account_info(),
-                            },
-                        ),
-                        creator_fee,
-                    )?;
+                    match token_program.key() {
+                        anchor_spl::token::ID => {
+                            anchor_spl::token::transfer(
+                                CpiContext::new(
+                                    token_program.to_account_info(),
+                                    anchor_spl::token::Transfer {
+                                        from: from_ata.to_account_info(),
+                                        to: current_creator_ata_info.to_account_info(),
+                                        authority: from.to_account_info(),
+                                    },
+                                ),
+                                creator_fee,
+                            )?;
+                        }
+                        anchor_spl::token_interface::ID => {
+                            let mint = anchor_spl::token_interface::Mint::try_deserialize(
+                                &mut &currency.data.borrow()[..],
+                            )?;
+                            token_2022_transfer_checked(
+                                CpiContext::new(
+                                    token_program.to_account_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(),
+                                        authority: from.to_account_info(),
+                                    },
+                                ),
+                                creator_fee,
+                                mint.decimals,
+                            )?;
+                        }
+                        _ => return Err(ErrorCode::InvalidProgramId.into()),
+                    }
                 }
             }
         }