Rename TCOMP_FEE_BPS; align calc_creators_fee and add is_royalty_enforced for both marketplace + AMM. (#25)

* Rename TCOMP_FEE_BPS -> TAKER_FEE_BPS to share b/w marketplace + amm.

* Also change calc_creators_fee + add is_royalty_enforced.

Author: richardwu

Cargo.lock

@@ -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.4.0"
+version = "0.5.0"
 edition = "2021"
 readme = "../README.md"
 license = "Apache-2.0"

toolbox/Cargo.toml

@@ -16,7 +16,7 @@ pub const HUNDRED_PCT_BPS: u64 = 10000;
 pub const HUNDRED_PCT: u64 = 100;
 pub const BROKER_FEE_PCT: u64 = 50;
 pub const TNSR_DISCOUNT_BPS: u64 = 2500;
-pub const TCOMP_FEE_BPS: u64 = 200;
+pub const TAKER_FEE_BPS: u64 = 200;
 pub const MAKER_BROKER_PCT: u64 = 80; // Out of 100
 
 pub mod escrow {
@@ -134,20 +134,20 @@ pub fn calc_fees(args: CalcFeesArgs) -> Result<Fees> {
     })
 }
 
+pub fn is_royalty_enforced(token_standard: Option<TokenStandard>) -> bool {
+    matches!(
+        token_standard,
+        Some(TokenStandard::ProgrammableNonFungible)
+            | Some(TokenStandard::ProgrammableNonFungibleEdition)
+    )
+}
+
 pub fn calc_creators_fee(
     seller_fee_basis_points: u16,
     amount: u64,
-    token_standard: Option<TokenStandard>,
-    optional_royalty_pct: Option<u16>,
+    royalty_pct: Option<u16>,
 ) -> Result<u64> {
-    // Enforce royalties on pnfts.
-    let adj_optional_royalty_pct = match token_standard {
-        Some(TokenStandard::ProgrammableNonFungible)
-        | Some(TokenStandard::ProgrammableNonFungibleEdition) => Some(100),
-        _ => optional_royalty_pct,
-    };
-
-    let creator_fee_bps = if let Some(royalty_pct) = adj_optional_royalty_pct {
+    let creator_fee_bps = if let Some(royalty_pct) = royalty_pct {
         require!(royalty_pct <= 100, TensorError::BadRoyaltiesPct);
 
         // If optional passed, pay optional royalties