Feat/dyn tier thresholds

bin/collator/src/local/chain_spec.rs

@@ -29,7 +29,7 @@ use sc_service::ChainType;
 use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public};
 use sp_runtime::{
     traits::{AccountIdConversion, IdentifyAccount, Verify},
-    Permill,
+    Perbill, Permill,
 };
 
 type AccountPublic = <Signature as Verify>::Signer;
@@ -163,19 +163,21 @@ fn testnet_genesis(
                 Permill::from_percent(40),
             ],
             tier_thresholds: vec![
-                TierThreshold::DynamicTvlAmount {
-                    amount: 100 * AST,
-                    minimum_amount: 80 * AST,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(35_700_000), // 3.57%
+                    minimum_required_percentage: Perbill::from_parts(23_800_000), // 2.38%
                 },
-                TierThreshold::DynamicTvlAmount {
-                    amount: 50 * AST,
-                    minimum_amount: 40 * AST,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(8_900_000), // 0.89%
+                    minimum_required_percentage: Perbill::from_parts(6_000_000), // 0.6%
                 },
-                TierThreshold::DynamicTvlAmount {
-                    amount: 20 * AST,
-                    minimum_amount: 20 * AST,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(23_800_000), // 2.38%
+                    minimum_required_percentage: Perbill::from_parts(17_900_000), // 1.79%
+                },
+                TierThreshold::FixedPercentage {
+                    required_percentage: Perbill::from_parts(6_000_000), // 0.6%
                 },
-                TierThreshold::FixedTvlAmount { amount: 10 * AST },
             ],
             slots_per_tier: vec![10, 20, 30, 40],
             safeguard: Some(false),

bin/collator/src/parachain/chain_spec/astar.rs

@@ -30,7 +30,7 @@ use sc_service::ChainType;
 use sp_core::{sr25519, Pair, Public};
 use sp_runtime::{
     traits::{IdentifyAccount, Verify},
-    Permill,
+    Perbill, Permill,
 };
 
 const PARA_ID: u32 = 2006;
@@ -167,21 +167,22 @@ fn make_genesis(
                 Permill::from_percent(30),
                 Permill::from_percent(40),
             ],
+            // percentages below are calulated based on total issuance at the time when dApp staking v3 was launched (8.4B)
             tier_thresholds: vec![
-                TierThreshold::DynamicTvlAmount {
-                    amount: 30000 * ASTR,
-                    minimum_amount: 20000 * ASTR,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(35_700_000), // 3.57%
+                    minimum_required_percentage: Perbill::from_parts(23_800_000), // 2.38%
                 },
-                TierThreshold::DynamicTvlAmount {
-                    amount: 7500 * ASTR,
-                    minimum_amount: 5000 * ASTR,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(8_900_000), // 0.89%
+                    minimum_required_percentage: Perbill::from_parts(6_000_000), // 0.6%
                 },
-                TierThreshold::DynamicTvlAmount {
-                    amount: 20000 * ASTR,
-                    minimum_amount: 15000 * ASTR,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(23_800_000), // 2.38%
+                    minimum_required_percentage: Perbill::from_parts(17_900_000), // 1.79%
                 },
-                TierThreshold::FixedTvlAmount {
-                    amount: 5000 * ASTR,
+                TierThreshold::FixedPercentage {
+                    required_percentage: Perbill::from_parts(6_000_000), // 0.6%
                 },
             ],
             slots_per_tier: vec![10, 20, 30, 40],

bin/collator/src/parachain/chain_spec/shibuya.rs

@@ -33,7 +33,7 @@ use sp_core::{sr25519, Pair, Public};
 use astar_primitives::oracle::CurrencyAmount;
 use sp_runtime::{
     traits::{IdentifyAccount, Verify},
-    Permill,
+    Perbill, Permill,
 };
 
 use super::{get_from_seed, Extensions};
@@ -179,20 +179,23 @@ fn make_genesis(
                 Permill::from_percent(30),
                 Permill::from_percent(40),
             ],
+            // percentages below are calulated based on a total issuance at the time when dApp staking v3 was launched (147M)
             tier_thresholds: vec![
-                TierThreshold::DynamicTvlAmount {
-                    amount: 100 * SBY,
-                    minimum_amount: 80 * SBY,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(20_000), // 0.0020%
+                    minimum_required_percentage: Perbill::from_parts(17_000), // 0.0017%
                 },
-                TierThreshold::DynamicTvlAmount {
-                    amount: 50 * SBY,
-                    minimum_amount: 40 * SBY,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(10_000), // 0.0010%
+                    minimum_required_percentage: Perbill::from_parts(6_800), // 0.00068%
                 },
-                TierThreshold::DynamicTvlAmount {
-                    amount: 20 * SBY,
-                    minimum_amount: 20 * SBY,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(5_400), // 0.00054%
+                    minimum_required_percentage: Perbill::from_parts(3_400), // 0.00034%
+                },
+                TierThreshold::FixedPercentage {
+                    required_percentage: Perbill::from_parts(1_400), // 0.00014%
                 },
-                TierThreshold::FixedTvlAmount { amount: 10 * SBY },
             ],
             slots_per_tier: vec![10, 20, 30, 40],
             safeguard: Some(false),

bin/collator/src/parachain/chain_spec/shiden.rs

@@ -30,7 +30,7 @@ use sp_core::{sr25519, Pair, Public};
 use astar_primitives::oracle::CurrencyAmount;
 use sp_runtime::{
     traits::{IdentifyAccount, Verify},
-    Permill,
+    Perbill, Permill,
 };
 
 use super::{get_from_seed, Extensions};
@@ -169,20 +169,23 @@ fn make_genesis(
                 Permill::from_percent(30),
                 Permill::from_percent(40),
             ],
+            // percentages below are calulated based on a total issuance at the time when dApp staking v3 was launched (84.3M)
             tier_thresholds: vec![
-                TierThreshold::DynamicTvlAmount {
-                    amount: 30000 * SDN,
-                    minimum_amount: 20000 * SDN,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(35_700_000), // 3.57%
+                    minimum_required_percentage: Perbill::from_parts(23_800_000), // 2.38%
                 },
-                TierThreshold::DynamicTvlAmount {
-                    amount: 7500 * SDN,
-                    minimum_amount: 5000 * SDN,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(8_900_000), // 0.89%
+                    minimum_required_percentage: Perbill::from_parts(6_000_000), // 0.6%
                 },
-                TierThreshold::DynamicTvlAmount {
-                    amount: 20000 * SDN,
-                    minimum_amount: 15000 * SDN,
+                TierThreshold::DynamicPercentage {
+                    percentage: Perbill::from_parts(23_800_000), // 2.38%
+                    minimum_required_percentage: Perbill::from_parts(17_900_000), // 1.79%
+                },
+                TierThreshold::FixedPercentage {
+                    required_percentage: Perbill::from_parts(6_000_000), // 0.6%
                 },
-                TierThreshold::FixedTvlAmount { amount: 5000 * SDN },
             ],
             slots_per_tier: vec![10, 20, 30, 40],
             safeguard: Some(false),

pallets/dapp-staking-v3/README.md

@@ -208,7 +208,7 @@ At the end of each build&earn subperiod era, dApps are evaluated using a simple
 Based on this metric, they are sorted, and assigned to tiers.
 
 There is a limited number of tiers, and each tier has a limited capacity of slots.
-Each tier also has a _threshold_ which a dApp must satisfy in order to enter it.
+Each tier also has a _threshold_ which a dApp must satisfy in order to enter it. Thresholds for each tier are dynamically calculated as percentages of the total issuance at the time of the dApp staking v3 launch.
 
 Better tiers bring bigger rewards, so dApps are encouraged to compete for higher tiers and attract staker's support.
 For each tier, the reward pool and capacity are fixed. Each dApp within a tier always gets the same amount of reward.

pallets/dapp-staking-v3/src/benchmarking/mod.rs

@@ -704,10 +704,9 @@ mod benchmarks {
         // This is a hacky part to ensure we accommodate max number of contracts.
         TierConfig::<T>::mutate(|config| {
             let max_number_of_contracts: u16 = T::MaxNumberOfContracts::get().try_into().unwrap();
-            config.number_of_slots = max_number_of_contracts;
             config.slots_per_tier[0] = max_number_of_contracts;
             config.slots_per_tier[1..].iter_mut().for_each(|x| *x = 0);
-            config.tier_thresholds[0] = TierThreshold::FixedTvlAmount { amount: 1 };
+            config.tier_thresholds[0] = 1;
         });
         force_advance_to_next_era::<T>();
         let claim_era = ActiveProtocolState::<T>::get().era - 1;

pallets/dapp-staking-v3/src/benchmarking/utils.rs

@@ -177,32 +177,36 @@ pub(super) fn init_tier_settings<T: Config>() {
         ])
         .unwrap(),
         tier_thresholds: BoundedVec::try_from(vec![
-            TierThreshold::DynamicTvlAmount {
-                amount: 100 * UNIT,
-                minimum_amount: 80 * UNIT,
+            TierThreshold::DynamicPercentage {
+                percentage: Perbill::from_parts(11_112_000), // 1.1112%
+                minimum_required_percentage: Perbill::from_parts(8_889_000), // 0.8889%
             },
-            TierThreshold::DynamicTvlAmount {
-                amount: 50 * UNIT,
-                minimum_amount: 40 * UNIT,
+            TierThreshold::DynamicPercentage {
+                percentage: Perbill::from_parts(5_556_000), // 0.5556%
+                minimum_required_percentage: Perbill::from_parts(4_400_000), // 0.44%
             },
-            TierThreshold::DynamicTvlAmount {
-                amount: 20 * UNIT,
-                minimum_amount: 20 * UNIT,
+            TierThreshold::DynamicPercentage {
+                percentage: Perbill::from_parts(2_223_000), // 0.2223%
+                minimum_required_percentage: Perbill::from_parts(2_223_000), // 0.2223%
             },
-            TierThreshold::FixedTvlAmount {
-                amount: MIN_TIER_THRESHOLD,
+            TierThreshold::FixedPercentage {
+                required_percentage: Perbill::from_parts(1_667_000), // 0.1667%
             },
         ])
         .unwrap(),
     };
 
+    let total_issuance = SEED as u128 * UNIT;
+    let tier_thresholds_with_issuance = ThresholdsWithIssuance {
+        thresholds: tier_params.tier_thresholds.clone(),
+        total_issuance,
+    };
     // Init tier config, based on the initial params
     let init_tier_config =
         TiersConfiguration::<T::NumberOfTiers, T::TierSlots, T::BaseNativeCurrencyPrice> {
-            number_of_slots: NUMBER_OF_SLOTS.try_into().unwrap(),
             slots_per_tier: BoundedVec::try_from(vec![10, 20, 30, 40]).unwrap(),
             reward_portion: tier_params.reward_portion.clone(),
-            tier_thresholds: tier_params.tier_thresholds.clone(),
+            tier_thresholds: BoundedVec::from(tier_thresholds_with_issuance),
             _phantom: Default::default(),
         };
 

pallets/dapp-staking-v3/src/lib.rs

@@ -94,7 +94,7 @@ pub mod pallet {
     use super::*;
 
     /// The current storage version.
-    pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(7);
+    pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(8);
 
     #[pallet::pallet]
     #[pallet::storage_version(STORAGE_VERSION)]
@@ -520,8 +520,8 @@ pub mod pallet {
                 reward_portion: vec![Permill::from_percent(100 / num_tiers); num_tiers as usize],
                 slot_distribution: vec![Permill::from_percent(100 / num_tiers); num_tiers as usize],
                 tier_thresholds: (0..num_tiers)
-                    .map(|i| TierThreshold::FixedTvlAmount {
-                        amount: (10 * i).into(),
+                    .map(|i| TierThreshold::FixedPercentage {
+                        required_percentage: Perbill::from_percent(i),
                     })
                     .collect(),
                 slots_per_tier: vec![100; num_tiers as usize],
@@ -554,23 +554,23 @@ pub mod pallet {
                 "Invalid tier parameters values provided."
             );
 
-            // Prepare tier configuration and verify its correctness
-            let number_of_slots = self.slots_per_tier.iter().fold(0_u16, |acc, &slots| {
-                acc.checked_add(slots).expect("Overflow")
-            });
+            let tier_thresholds_with_issuance = ThresholdsWithIssuance {
+                thresholds: tier_params.tier_thresholds.clone(),
+                total_issuance: T::Currency::total_issuance(),
+            };
+
             let tier_config =
                 TiersConfiguration::<T::NumberOfTiers, T::TierSlots, T::BaseNativeCurrencyPrice> {
-                    number_of_slots,
                     slots_per_tier: BoundedVec::<u16, T::NumberOfTiers>::try_from(
                         self.slots_per_tier.clone(),
                     )
                     .expect("Invalid number of slots per tier entries provided."),
                     reward_portion: tier_params.reward_portion.clone(),
-                    tier_thresholds: tier_params.tier_thresholds.clone(),
+                    tier_thresholds: BoundedVec::from(tier_thresholds_with_issuance),
                     _phantom: Default::default(),
                 };
             assert!(
-                tier_params.is_valid(),
+                tier_config.is_valid(),
                 "Invalid tier config values provided."
             );
 
@@ -1717,25 +1717,23 @@ pub mod pallet {
             let mut upper_bound = Balance::zero();
             let mut rank_rewards = Vec::new();
 
-            for (tier_id, (tier_capacity, tier_threshold)) in tier_config
+            for (tier_id, (tier_capacity, lower_bound)) in tier_config
                 .slots_per_tier
                 .iter()
                 .zip(tier_config.tier_thresholds.iter())
                 .enumerate()
             {
-                let lower_bound = tier_threshold.threshold();
-
                 // Iterate over dApps until one of two conditions has been met:
                 // 1. Tier has no more capacity
                 // 2. dApp doesn't satisfy the tier threshold (since they're sorted, none of the following dApps will satisfy the condition either)
                 for (dapp_id, staked_amount) in dapp_stakes
                     .iter()
                     .skip(dapp_tiers.len())
-                    .take_while(|(_, amount)| tier_threshold.is_satisfied(*amount))
+                    .take_while(|(_, amount)| amount.ge(lower_bound))
                     .take(*tier_capacity as usize)
                 {
                     let rank = if T::RankingEnabled::get() {
-                        RankedTier::find_rank(lower_bound, upper_bound, *staked_amount)
+                        RankedTier::find_rank(*lower_bound, upper_bound, *staked_amount)
                     } else {
                         0
                     };
@@ -1765,7 +1763,7 @@ pub mod pallet {
 
                 rank_rewards.push(reward_per_rank);
                 dapp_tiers.append(&mut tier_slots);
-                upper_bound = lower_bound; // current threshold becomes upper bound for next tier
+                upper_bound = *lower_bound; // current threshold becomes upper bound for next tier
             }
 
             // 5.
@@ -1954,8 +1952,21 @@ pub mod pallet {
             // Re-calculate tier configuration for the upcoming new era
             let tier_params = StaticTierParams::<T>::get();
             let average_price = T::NativePriceProvider::average_price();
-            let new_tier_config = TierConfig::<T>::get().calculate_new(average_price, &tier_params);
-            TierConfig::<T>::put(new_tier_config);
+            let total_issuance = T::Currency::total_issuance();
+
+            let new_tier_config =
+                TierConfig::<T>::get().calculate_new(&tier_params, average_price, total_issuance);
+
+            // Validate new tier configuration
+            if new_tier_config.is_valid() {
+                TierConfig::<T>::put(new_tier_config);
+            } else {
+                log::warn!(
+                    target: LOG_TARGET,
+                    "New tier configuration is invalid for era {}, preserving old one.",
+                    next_era
+                );
+            }
 
             Self::deposit_event(Event::<T>::NewEra { era: next_era });
             if let Some(period_event) = maybe_period_event {