dApp Staking v3 - Shibuya integration (#1109)

* dApp staking v3 - Shibuya integration * Init * Fix build * Fix find/replace doc mess * Migration & disable * More integration * Progress * Adjusted integration * Finished integration * Additional modifications & cleanup * Move comment * Fixes * Shibuya integration tests fix & proxy * Renaming * Integration test fixes & legacy support * Adjust for benchmarks * Remove chain-extension, small updates * fixes * Partial weights * Minor changes * Benchmark fixes * dApp staking weights * Weights, deps * Remove redundant storage item * Inflation params, resolve TODOs * Optimize lengthy benchmark * Integration test * Sort out more TODOs * Benchmark optimization * Fix seed * Remove spec version bump * Fix integration test * Weights update
AstarNetwork · Dec 20, 2023 · 9fbbbaa · 9fbbbaa
1 parent b7983e9
commit 9fbbbaa
Show file tree

Hide file tree

Showing 40 changed files with 2,272 additions and 1,270 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,6 @@ members = [
 
 	"primitives",
 
-	"chain-extensions/dapps-staking",
 	"chain-extensions/pallet-assets",
 	"chain-extensions/xvm",
 	"chain-extensions/unified-accounts",
@@ -298,12 +297,10 @@ pallet-evm-precompile-dapps-staking = { path = "./precompiles/dapps-staking", de
 pallet-evm-precompile-dapp-staking-v3 = { path = "./precompiles/dapp-staking-v3", default-features = false }
 pallet-evm-precompile-unified-accounts = { path = "./precompiles/unified-accounts", default-features = false }
 
-pallet-chain-extension-dapps-staking = { path = "./chain-extensions/dapps-staking", default-features = false }
 pallet-chain-extension-xvm = { path = "./chain-extensions/xvm", default-features = false }
 pallet-chain-extension-assets = { path = "./chain-extensions/pallet-assets", default-features = false }
 pallet-chain-extension-unified-accounts = { path = "./chain-extensions/unified-accounts", default-features = false }
 
-dapps-staking-chain-extension-types = { path = "./chain-extensions/types/dapps-staking", default-features = false }
 xvm-chain-extension-types = { path = "./chain-extensions/types/xvm", default-features = false }
 assets-chain-extension-types = { path = "./chain-extensions/types/assets", default-features = false }
 unified-accounts-chain-extension-types = { path = "./chain-extensions/types/unified-accounts", default-features = false }

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -94,7 +94,6 @@ shiden-runtime = { workspace = true, features = ["std"] }
 
 # astar pallets dependencies
 astar-primitives = { 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
@@ -22,8 +22,8 @@ use local_runtime::{
     wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig, BlockRewardConfig,
     CouncilConfig, DappStakingConfig, DemocracyConfig, EVMConfig, GenesisConfig, GrandpaConfig,
     GrandpaId, InflationConfig, InflationParameters, Precompiles, RewardDistributionConfig,
-    Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig, VestingConfig,
-    AST,
+    Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TierThreshold, TreasuryConfig,
+    VestingConfig, AST,
 };
 use sc_service::ChainType;
 use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public};
@@ -32,8 +32,6 @@ use sp_runtime::{
     Perbill, Permill,
 };
 
-use pallet_dapp_staking_v3::TierThreshold;
-
 type AccountPublic = <Signature as Verify>::Signer;
 
 /// Specialized `ChainSpec` for Shiden Network.

diff --git a/bin/collator/src/parachain/chain_spec/shibuya.rs b/bin/collator/src/parachain/chain_spec/shibuya.rs
@@ -21,17 +21,17 @@
 use cumulus_primitives_core::ParaId;
 use sc_service::ChainType;
 use shibuya_runtime::{
-    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, Balance, BalancesConfig, BlockRewardConfig,
-    CollatorSelectionConfig, CouncilConfig, DemocracyConfig, EVMChainIdConfig, EVMConfig,
-    GenesisConfig, ParachainInfoConfig, Precompiles, RewardDistributionConfig, SessionConfig,
-    SessionKeys, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig,
-    VestingConfig, SBY,
+    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, Balance, BalancesConfig,
+    CollatorSelectionConfig, CouncilConfig, DappStakingConfig, DemocracyConfig, EVMChainIdConfig,
+    EVMConfig, GenesisConfig, InflationConfig, InflationParameters, ParachainInfoConfig,
+    Precompiles, SessionConfig, SessionKeys, Signature, SudoConfig, SystemConfig,
+    TechnicalCommitteeConfig, TierThreshold, TreasuryConfig, VestingConfig, SBY,
 };
 use sp_core::{sr25519, Pair, Public};
 
 use sp_runtime::{
     traits::{IdentifyAccount, Verify},
-    Perbill,
+    Permill,
 };
 
 use super::{get_from_seed, Extensions};
@@ -114,17 +114,6 @@ fn make_genesis(
         },
         parachain_info: ParachainInfoConfig { parachain_id },
         balances: BalancesConfig { balances },
-        block_reward: BlockRewardConfig {
-            // Make sure sum is 100
-            reward_config: RewardDistributionConfig {
-                treasury_percent: Perbill::from_percent(10),
-                base_staker_percent: Perbill::from_percent(20),
-                dapps_percent: Perbill::from_percent(20),
-                collators_percent: Perbill::from_percent(5),
-                adjustable_percent: Perbill::from_percent(45),
-                ideal_dapps_staking_tvl: Perbill::from_percent(40),
-            },
-        },
         vesting: VestingConfig { vesting: vec![] },
         session: SessionConfig {
             keys: authorities
@@ -174,6 +163,41 @@ fn make_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),
+            ],
+            // TODO: adjust this if needed
+            tier_thresholds: vec![
+                TierThreshold::DynamicTvlAmount {
+                    amount: 100 * SBY,
+                    minimum_amount: 80 * SBY,
+                },
+                TierThreshold::DynamicTvlAmount {
+                    amount: 50 * SBY,
+                    minimum_amount: 40 * SBY,
+                },
+                TierThreshold::DynamicTvlAmount {
+                    amount: 20 * SBY,
+                    minimum_amount: 20 * SBY,
+                },
+                TierThreshold::FixedTvlAmount { amount: 10 * SBY },
+            ],
+            slots_per_tier: vec![10, 20, 30, 40],
+        },
+        // TODO: adjust this if needed
+        inflation: InflationConfig {
+            params: InflationParameters::default(),
+        },
     }
 }
 

diff --git a/chain-extensions/dapps-staking/Cargo.toml b/chain-extensions/dapps-staking/Cargo.toml