Hybrid Inflation Model

Cargo.toml

@@ -273,6 +273,7 @@ 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 }
 pallet-xc-asset-config = { path = "./pallets/xc-asset-config", default-features = false }

bin/collator/src/local/chain_spec.rs

@@ -21,8 +21,8 @@
 use local_runtime::{
     wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig, BlockRewardConfig,
     CouncilConfig, DemocracyConfig, EVMConfig, GenesisConfig, GrandpaConfig, GrandpaId,
-    Precompiles, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig,
-    VestingConfig,
+    Precompiles, RewardDistributionConfig, Signature, SudoConfig, SystemConfig,
+    TechnicalCommitteeConfig, TreasuryConfig, VestingConfig,
 };
 use sc_service::ChainType;
 use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public};
@@ -117,8 +117,8 @@ fn testnet_genesis(
         },
         block_reward: BlockRewardConfig {
             // Make sure sum is 100
-            reward_config: pallet_block_reward::RewardDistributionConfig {
-                base_treasury_percent: Perbill::from_percent(25),
+            reward_config: RewardDistributionConfig {
+                treasury_percent: Perbill::from_percent(25),
                 base_staker_percent: Perbill::from_percent(30),
                 dapps_percent: Perbill::from_percent(20),
                 collators_percent: Perbill::zero(),

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

@@ -23,8 +23,9 @@ use sc_service::ChainType;
 use shibuya_runtime::{
     wasm_binary_unwrap, AccountId, AuraConfig, AuraId, Balance, BalancesConfig, BlockRewardConfig,
     CollatorSelectionConfig, CouncilConfig, DemocracyConfig, EVMChainIdConfig, EVMConfig,
-    GenesisConfig, ParachainInfoConfig, Precompiles, SessionConfig, SessionKeys, Signature,
-    SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig, VestingConfig, SBY,
+    GenesisConfig, ParachainInfoConfig, Precompiles, RewardDistributionConfig, SessionConfig,
+    SessionKeys, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig,
+    VestingConfig, SBY,
 };
 use sp_core::{sr25519, Pair, Public};
 
@@ -115,8 +116,8 @@ fn make_genesis(
         balances: 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),

pallets/block-rewards-hybrid/Cargo.toml

@@ -0,0 +1,51 @@
+[package]
+name = "pallet-block-rewards-hybrid"
+version = "0.1.0"
+license = "Apache-2.0"
+description = "FRAME pallet for managing block reward issuance & distribution"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[dependencies]
+parity-scale-codec = { workspace = true }
+serde = { workspace = true }
+
+astar-primitives = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+scale-info = { workspace = true }
+sp-arithmetic = { workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
+
+frame-benchmarking = { workspace = true, optional = true }
+
+[dev-dependencies]
+pallet-balances = { workspace = true }
+pallet-timestamp = { workspace = true }
+sp-core = { workspace = true }
+
+[features]
+default = ["std"]
+std = [
+	"parity-scale-codec/std",
+	"sp-core/std",
+	"scale-info/std",
+	"sp-std/std",
+	"serde/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-timestamp/std",
+	"pallet-balances/std",
+	"astar-primitives/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"]