dapp staking v3 - part 4 (#1053)

* EraRewardSpan * Initial version of claim_staker_reward * Tests * Test utils for claim-staker * Bug fixes, improvements * Claim improvements & some tests * Refactoring in progress * Refactoring continued * Refactoring progress * Refactoring finished * Bonus rewards * Docs & some minor changes * Comments, tests, improved coverage * Tier params & config init solution * Tier reward calculation WIP * Tier assignemnt * Minor cleanup * Claim dapp rewards * Claim dapp reward tests * unstake from unregistered call * Extra traits * fixes * Extra calls * Refactoring * More refactoring, improvements, TODO solving * Local integration * Genesis config * Add forcing call * try runtime build fix * Minor changes * Minor * Formatting * Benchmarks INIT * Compiling benchmarks * Fix * dapp tier calculation benchmark * Measured tier assignment * Decending rewards in benchmarks * Series refactoring & partial tests * Comments, minor changes * Tests, improvements * More tests, some minor refactoring * Formatting * More benchmarks & experiments, refactoring * Readme, docs * Minor renaming, docs * More docs * More docs * Minor addition * Review comment fixes & changes * Minor change * Review comments * Update frontier to make CI pass
AstarNetwork · Nov 14, 2023 · 9b5f988 · 9b5f988
1 parent 655c280
commit 9b5f988
Show file tree

Hide file tree

Showing 17 changed files with 4,487 additions and 1,969 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -274,6 +274,7 @@ pallet-block-reward = { path = "./pallets/block-reward", default-features = fals
 pallet-collator-selection = { path = "./pallets/collator-selection", default-features = false }
 pallet-custom-signatures = { path = "./pallets/custom-signatures", default-features = false }
 pallet-dapps-staking = { path = "./pallets/dapps-staking", default-features = false }
+pallet-dapp-staking-v3 = { path = "./pallets/dapp-staking-v3", default-features = false }
 pallet-xc-asset-config = { path = "./pallets/xc-asset-config", default-features = false }
 pallet-xvm = { path = "./pallets/xvm", default-features = false }
 pallet-xcm = { path = "./pallets/pallet-xcm", default-features = false }

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -95,6 +95,7 @@ shiden-runtime = { workspace = true, features = ["std"] }
 # astar pallets dependencies
 astar-primitives = { workspace = true }
 pallet-block-reward = { workspace = true }
+pallet-dapp-staking-v3 = { workspace = true }
 
 # frame dependencies
 frame-system = { workspace = true, features = ["std"] }

diff --git a/bin/collator/src/local/chain_spec.rs b/bin/collator/src/local/chain_spec.rs
@@ -20,17 +20,19 @@
 
 use local_runtime::{
     wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig, BaseFeeConfig,
-    BlockRewardConfig, CouncilConfig, DemocracyConfig, EVMConfig, GenesisConfig, GrandpaConfig,
-    GrandpaId, Precompiles, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
-    TreasuryConfig, VestingConfig,
+    BlockRewardConfig, CouncilConfig, DappStakingConfig, DemocracyConfig, EVMConfig, GenesisConfig,
+    GrandpaConfig, GrandpaId, Precompiles, Signature, SudoConfig, SystemConfig,
+    TechnicalCommitteeConfig, TreasuryConfig, VestingConfig, AST,
 };
 use sc_service::ChainType;
 use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public};
 use sp_runtime::{
     traits::{IdentifyAccount, Verify},
-    Perbill,
+    Perbill, Permill,
 };
 
+use pallet_dapp_staking_v3::TierThreshold;
+
 type AccountPublic = <Signature as Verify>::Signer;
 
 /// Specialized `ChainSpec` for Shiden Network.
@@ -112,7 +114,7 @@ fn testnet_genesis(
             balances: endowed_accounts
                 .iter()
                 .cloned()
-                .map(|k| (k, 1_000_000_000_000_000_000_000_000_000))
+                .map(|k| (k, 1_000_000_000 * AST))
                 .collect(),
         },
         block_reward: BlockRewardConfig {
@@ -181,6 +183,36 @@ fn testnet_genesis(
         },
         democracy: DemocracyConfig::default(),
         treasury: TreasuryConfig::default(),
+        dapp_staking: DappStakingConfig {
+            reward_portion: vec![
+                Permill::from_percent(40),
+                Permill::from_percent(30),
+                Permill::from_percent(20),
+                Permill::from_percent(10),
+            ],
+            slot_distribution: vec![
+                Permill::from_percent(10),
+                Permill::from_percent(20),
+                Permill::from_percent(30),
+                Permill::from_percent(40),
+            ],
+            tier_thresholds: vec![
+                TierThreshold::DynamicTvlAmount {
+                    amount: 100 * AST,
+                    minimum_amount: 80 * AST,
+                },
+                TierThreshold::DynamicTvlAmount {
+                    amount: 50 * AST,
+                    minimum_amount: 40 * AST,
+                },
+                TierThreshold::DynamicTvlAmount {
+                    amount: 20 * AST,
+                    minimum_amount: 20 * AST,
+                },
+                TierThreshold::FixedTvlAmount { amount: 10 * AST },
+            ],
+            slots_per_tier: vec![10, 20, 30, 40],
+        },
     }
 }
 

diff --git a/pallets/dapp-staking-v3/Cargo.toml b/pallets/dapp-staking-v3/Cargo.toml
@@ -23,6 +23,8 @@ sp-std = { workspace = true }
 
 astar-primitives = { workspace = true }
 
+frame-benchmarking = { workspace = true, optional = true }
+
 [dev-dependencies]
 pallet-balances = { workspace = true }
 
@@ -42,4 +44,13 @@ std = [
 	"frame-system/std",
 	"pallet-balances/std",
 	"astar-primitives/std",
+	"frame-benchmarking/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
+try-runtime = ["frame-support/try-runtime"]