Added hybrid inflation model to Astar (#1103)

* Added hybrid inflation model to Astar * space
AstarNetwork · Dec 14, 2023 · 2220838 · 2220838
1 parent 01d8a95
commit 2220838
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 1,237 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -272,7 +272,6 @@ orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-modu
 
 # Astar pallets & modules
 # (wasm)
-pallet-block-reward = { path = "./pallets/block-reward", default-features = false }
 pallet-block-rewards-hybrid = { path = "./pallets/block-rewards-hybrid", default-features = false }
 pallet-collator-selection = { path = "./pallets/collator-selection", default-features = false }
 pallet-dapps-staking = { path = "./pallets/dapps-staking", 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-block-reward = { workspace = true }
 
 # frame dependencies
 frame-system = { workspace = true, features = ["std"] }

diff --git a/bin/collator/src/parachain/chain_spec/astar.rs b/bin/collator/src/parachain/chain_spec/astar.rs
@@ -20,7 +20,7 @@
 
 use astar_runtime::{
     wasm_binary_unwrap, AccountId, AuraId, Balance, BlockRewardConfig, EVMConfig,
-    ParachainInfoConfig, Precompiles, Signature, SystemConfig, ASTR,
+    ParachainInfoConfig, Precompiles, RewardDistributionConfig, Signature, SystemConfig, ASTR,
 };
 use cumulus_primitives_core::ParaId;
 use sc_service::ChainType;
@@ -112,8 +112,8 @@ fn make_genesis(
         balances: astar_runtime::BalancesConfig { balances },
         block_reward: BlockRewardConfig {
             // Make sure sum is 100
-            reward_config: pallet_block_reward::RewardDistributionConfig {
-                base_treasury_percent: Perbill::from_percent(10),
+            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),

diff --git a/pallets/block-reward/Cargo.toml b/pallets/block-reward/Cargo.toml
diff --git a/pallets/block-reward/src/benchmarking.rs b/pallets/block-reward/src/benchmarking.rs