Add default_royalty_fee_percent parameter to global config

contracts/infinity-builder/src/lib.rs

@@ -43,6 +43,7 @@ pub struct InstantiateMsg {
     pub marketplace: String,
     pub pair_creation_fee: Coin,
     pub fair_burn_fee_percent: Decimal,
+    pub default_royalty_fee_percent: Decimal,
     pub max_royalty_fee_percent: Decimal,
     pub max_swap_fee_percent: Decimal,
     pub code_ids: CodeIds,
@@ -104,6 +105,7 @@ pub fn instantiate(
                 infinity_pair_code_id: msg.code_ids.infinity_pair,
                 pair_creation_fee: msg.pair_creation_fee,
                 fair_burn_fee_percent: msg.fair_burn_fee_percent,
+                default_royalty_fee_percent: msg.default_royalty_fee_percent,
                 max_royalty_fee_percent: msg.max_royalty_fee_percent,
                 max_swap_fee_percent: msg.max_swap_fee_percent,
             },

contracts/infinity-global/src/lib.rs

@@ -35,6 +35,8 @@ pub struct GlobalConfig<T: AddressLike> {
     pub pair_creation_fee: Coin,
     /// The percentage amount of a sale that is paid to the FairBurn contract
     pub fair_burn_fee_percent: Decimal,
+    /// The royalty percentage amount to be paid when no royalty is specified for the protocol
+    pub default_royalty_fee_percent: Decimal,
     /// The maximum percentage amount of a sale that can be paid in royalties
     pub max_royalty_fee_percent: Decimal,
     /// The maximum percentage amount of a sale that can be paid to LPs
@@ -53,6 +55,7 @@ impl GlobalConfig<String> {
             infinity_pair_code_id: self.infinity_pair_code_id,
             pair_creation_fee: self.pair_creation_fee,
             fair_burn_fee_percent: self.fair_burn_fee_percent,
+            default_royalty_fee_percent: self.default_royalty_fee_percent,
             max_royalty_fee_percent: self.max_royalty_fee_percent,
             max_swap_fee_percent: self.max_swap_fee_percent,
         })

contracts/infinity-pair/src/helpers.rs

@@ -7,7 +7,10 @@ use crate::{
 use cosmwasm_std::{ensure_eq, Addr, Coin, Decimal, Deps, QuerierWrapper, Storage, Uint128};
 use infinity_global::{load_global_config, load_min_price, GlobalConfig};
 use infinity_shared::InfinityError;
-use stargaze_royalty_registry::{fetch_royalty_entry, state::RoyaltyEntry};
+use stargaze_royalty_registry::{
+    msg::{QueryMsg as RoyaltyRegistryQueryMsg, RoyaltyPaymentResponse},
+    state::RoyaltyEntry,
+};
 use std::cmp::min;
 
 pub fn only_pair_owner(sender: &Addr, pair: &Pair) -> Result<(), ContractError> {
@@ -112,13 +115,26 @@ pub fn load_payout_context(
     let min_price = load_min_price(&deps.querier, infinity_global, denom)?
         .ok_or(InfinityError::InternalError("denom not supported".to_string()))?;
 
-    let royalty_entry = fetch_royalty_entry(
-        &deps.querier,
+    let royalty_payment_response = deps.querier.query_wasm_smart::<RoyaltyPaymentResponse>(
         &global_config.royalty_registry,
-        collection,
-        Some(infinity_global),
+        &RoyaltyRegistryQueryMsg::RoyaltyPayment {
+            collection: collection.to_string(),
+            protocol: Some(infinity_global.to_string()),
+        },
     )?;
 
+    let royalty_entry = if let Some(royalty_protocol) = royalty_payment_response.royalty_protocol {
+        Some(royalty_protocol.royalty_entry)
+    } else if let Some(royalty_default) = royalty_payment_response.royalty_default {
+        Some(RoyaltyEntry {
+            recipient: royalty_default.royalty_entry.recipient,
+            share: global_config.default_royalty_fee_percent,
+            updated: None,
+        })
+    } else {
+        None
+    };
+
     Ok(PayoutContext {
         global_config,
         royalty_entry,

unit-tests/src/infinity_global_tests/message_tests.rs

@@ -31,7 +31,8 @@ fn try_infinity_global_init() {
         infinity_pair_code_id: 1u64,
         pair_creation_fee: coin(1_000_000u128, NATIVE_DENOM),
         fair_burn_fee_percent: Decimal::percent(1u64),
-        max_royalty_fee_percent: Decimal::percent(10u64),
+        default_royalty_fee_percent: Decimal::percent(10u64),
+        max_royalty_fee_percent: Decimal::percent(15u64),
         max_swap_fee_percent: Decimal::percent(10u64),
     };
 
@@ -96,7 +97,8 @@ fn try_infinity_global_update_config() {
         infinity_pair_code_id: 1u64,
         pair_creation_fee: coin(1_000_000u128, NATIVE_DENOM),
         fair_burn_fee_percent: Decimal::percent(1u64),
-        max_royalty_fee_percent: Decimal::percent(10u64),
+        default_royalty_fee_percent: Decimal::percent(10u64),
+        max_royalty_fee_percent: Decimal::percent(15u64),
         max_swap_fee_percent: Decimal::percent(10u64),
     };
 
@@ -193,7 +195,8 @@ fn try_infinity_global_add_remove_min_prices() {
         infinity_pair_code_id: 1u64,
         pair_creation_fee: coin(1_000_000u128, NATIVE_DENOM),
         fair_burn_fee_percent: Decimal::percent(1u64),
-        max_royalty_fee_percent: Decimal::percent(10u64),
+        default_royalty_fee_percent: Decimal::percent(10u64),
+        max_royalty_fee_percent: Decimal::percent(15u64),
         max_swap_fee_percent: Decimal::percent(10u64),
     };
 

unit-tests/src/infinity_pair_tests/pair_quote_tests.rs

@@ -80,7 +80,7 @@ fn try_generate_quotes_token_linear() {
     while spot_price <= remaining_amount && spot_price >= delta {
         let quote = spot_price
             - spot_price.mul_ceil(global_config.fair_burn_fee_percent)
-            - spot_price.mul_ceil(global_config.max_royalty_fee_percent);
+            - spot_price.mul_ceil(global_config.default_royalty_fee_percent);
         expected_quotes.push(quote);
         remaining_amount -= spot_price;
         spot_price -= delta;
@@ -161,7 +161,7 @@ fn try_generate_quotes_token_exponential() {
     while spot_price <= remaining_amount {
         let quote = spot_price
             - spot_price.mul_ceil(global_config.fair_burn_fee_percent)
-            - spot_price.mul_ceil(global_config.max_royalty_fee_percent);
+            - spot_price.mul_ceil(global_config.default_royalty_fee_percent);
         expected_quotes.push(quote);
         remaining_amount -= spot_price;
         spot_price = spot_price.checked_div_floor(Decimal::one() + delta).unwrap();
@@ -389,7 +389,7 @@ fn try_generate_quotes_trade_linear() {
     while spot_price <= remaining_amount && spot_price >= delta {
         let quote = spot_price
             - spot_price.mul_ceil(global_config.fair_burn_fee_percent)
-            - spot_price.mul_ceil(global_config.max_royalty_fee_percent)
+            - spot_price.mul_ceil(global_config.default_royalty_fee_percent)
             - spot_price.mul_ceil(swap_fee_percent);
         expected_quotes.push(quote);
         remaining_amount -= spot_price;
@@ -499,7 +499,7 @@ fn try_generate_quotes_trade_exponential() {
     while spot_price <= remaining_amount {
         let quote = spot_price
             - spot_price.mul_ceil(global_config.fair_burn_fee_percent)
-            - spot_price.mul_ceil(global_config.max_royalty_fee_percent)
+            - spot_price.mul_ceil(global_config.default_royalty_fee_percent)
             - spot_price.mul_ceil(swap_fee_percent);
         expected_quotes.push(quote);
         remaining_amount -= spot_price;
@@ -608,7 +608,7 @@ fn try_generate_quotes_trade_cp() {
     while counter < limit {
         let quote = spot_price
             - spot_price.mul_ceil(global_config.fair_burn_fee_percent)
-            - spot_price.mul_ceil(global_config.max_royalty_fee_percent)
+            - spot_price.mul_ceil(global_config.default_royalty_fee_percent)
             - spot_price.mul_ceil(swap_fee_percent);
         expected_quotes.push(quote);
         remaining_amount -= spot_price;

unit-tests/src/setup/setup_infinity_contracts.rs

@@ -40,7 +40,8 @@ pub fn setup_infinity_global(
             infinity_pair_code_id,
             pair_creation_fee: coin(1_000_000, "ustars"),
             fair_burn_fee_percent: Decimal::percent(1),
-            max_royalty_fee_percent: Decimal::percent(5),
+            default_royalty_fee_percent: Decimal::percent(5),
+            max_royalty_fee_percent: Decimal::percent(10),
             max_swap_fee_percent: Decimal::percent(5),
         },
         min_prices: vec![coin(10u128, NATIVE_DENOM), coin(10u128, UOSMO)],