Hybrid Inflation Model

bin/collator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "5.24.0"
+version = "5.25.0"
 description = "Astar collator implementation in Rust."
 build = "build.rs"
 default-run = "astar-collator"
@@ -94,7 +94,6 @@ shiden-runtime = { workspace = true, features = ["std"] }
 
 # astar pallets dependencies
 astar-primitives = { workspace = true }
-block-rewards-hybrid = { workspace = true }
 pallet-block-reward = { workspace = true }
 
 # frame dependencies

bin/collator/src/local/chain_spec.rs

@@ -19,7 +19,7 @@
 //! Chain specifications.
 
 use local_runtime::{
-    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig, BlockRewardConfig,
+    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig, BlockRewardConfig, RewardDistributionConfig,
     CouncilConfig, DemocracyConfig, EVMConfig, GenesisConfig, GrandpaConfig, GrandpaId,
     Precompiles, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig,
     VestingConfig,
@@ -117,7 +117,7 @@ fn testnet_genesis(
         },
         block_reward: BlockRewardConfig {
             // Make sure sum is 100
-            reward_config: block_rewards_hybrid::RewardDistributionConfig {
+            reward_config: RewardDistributionConfig {
                 treasury_percent: Perbill::from_percent(25),
                 base_staker_percent: Perbill::from_percent(30),
                 dapps_percent: Perbill::from_percent(20),

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

@@ -21,7 +21,7 @@
 use cumulus_primitives_core::ParaId;
 use sc_service::ChainType;
 use shibuya_runtime::{
-    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, Balance, BalancesConfig, BlockRewardConfig,
+    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, Balance, BalancesConfig, BlockRewardConfig, RewardDistributionConfig,
     CollatorSelectionConfig, CouncilConfig, DemocracyConfig, EVMChainIdConfig, EVMConfig,
     GenesisConfig, ParachainInfoConfig, Precompiles, SessionConfig, SessionKeys, Signature,
     SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig, VestingConfig, SBY,
@@ -115,7 +115,7 @@ fn make_genesis(
         balances: BalancesConfig { balances },
         block_reward: BlockRewardConfig {
             // Make sure sum is 100
-            reward_config: block_rewards_hybrid::RewardDistributionConfig {
+            reward_config: RewardDistributionConfig {
                 treasury_percent: Perbill::from_percent(10),
                 base_staker_percent: Perbill::from_percent(20),
                 dapps_percent: Perbill::from_percent(20),

pallets/block-rewards-hybrid/src/tests.rs

@@ -68,12 +68,12 @@ fn reward_distribution_config_is_consistent() {
     // 4
     // 100%
     let reward_config = RewardDistributionConfig {
-        treasury_percent: Perbill::from_percent(3),
-        base_staker_percent: Perbill::from_percent(14),
-        dapps_percent: Perbill::from_percent(18),
-        collators_percent: Perbill::from_percent(31),
-        adjustable_percent: Perbill::from_percent(34),
-        ideal_dapps_staking_tvl: Zero::zero(),
+        treasury_percent: Perbill::from_rational(4663701u32, 100000000u32),
+        base_staker_percent: Perbill::from_rational(2309024u32, 10000000u32),
+        dapps_percent: Perbill::from_rational(173094531u32, 1000000000u32),
+        collators_percent: Perbill::from_rational(29863296u32, 1000000000u32),
+        adjustable_percent: Perbill::from_rational(519502763u32, 1000000000u32),
+        ideal_dapps_staking_tvl: Perbill::from_percent(60),
     };
     assert!(reward_config.is_consistent());
 }
@@ -211,13 +211,13 @@ pub fn reward_distribution_as_expected() {
             reward_config.clone()
         ));
 
-        // Initial adjustment of TVL
-        set_tvl(30);
-
         // Issue rewards a couple of times and verify distribution is as expected
         // also ensure that the non distributed reward amount is burn
         // (that the total issuance is only increased by the amount that has been rewarded)
         for _block in 1..=100 {
+            // TVL amount is updated every block
+            // to ensure TVL ratio as expected
+            adjust_tvl(30);
             let init_balance_state = FreeBalanceSnapshot::new();
             let total_issuance_before = <TestRuntime as Config>::Currency::total_issuance();
             let distributed_rewards = Rewards::calculate(&reward_config);
@@ -258,10 +258,10 @@ pub fn non_distributed_reward_amount_is_burned() {
         ));
 
         for tvl in [30, 50, 70, 100] {
-            // Initial adjustment of TVL
-            set_tvl(tvl);
-
             for _block in 1..=100 {
+                // TVL amount is updated every block
+                // to ensure TVL ratio as expected
+                adjust_tvl(tvl);
                 let total_issuance_before = <TestRuntime as Config>::Currency::total_issuance();
                 let distributed_rewards = Rewards::calculate(&reward_config);
                 let burned_amount = BLOCK_REWARD - distributed_rewards.sum();
@@ -456,3 +456,7 @@ impl Rewards {
             + self.treasury_reward
     }
 }
+
+fn adjust_tvl(desired_percent: u128) {
+    set_tvl(<TestRuntime as Config>::Currency::total_issuance() / 100 * desired_percent);
+}

runtime/astar/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "astar-runtime"
-version = "5.24.0"
+version = "5.25.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

runtime/astar/src/lib.rs

@@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("astar"),
     impl_name: create_runtime_str!("astar"),
     authoring_version: 1,
-    spec_version: 71,
+    spec_version: 72,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,

runtime/local/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "local-runtime"
-version = "5.23.0"
+version = "5.25.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

runtime/local/src/lib.rs

@@ -65,6 +65,7 @@ pub use astar_primitives::{
     evm::EvmRevertCodeHandler, AccountId, Address, AssetId, Balance, BlockNumber, Hash, Header,
     Index, Signature,
 };
+pub use block_rewards_hybrid::RewardDistributionConfig;
 
 pub use crate::precompiles::WhitelistedCalls;
 #[cfg(feature = "std")]
@@ -438,7 +439,7 @@ impl block_rewards_hybrid::BeneficiaryPayout<NegativeImbalance> for BeneficiaryP
 }
 
 parameter_types! {
-    pub const MaxBlockRewardAmount: Balance = 2_664 * MILLIAST;
+    pub const MaxBlockRewardAmount: Balance = 230_718 * MILLIAST;
 }
 
 impl block_rewards_hybrid::Config for Runtime {

runtime/shibuya/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shibuya-runtime"
-version = "5.24.0"
+version = "5.25.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

runtime/shibuya/src/lib.rs

@@ -72,6 +72,7 @@ pub use astar_primitives::{
     xcm::AssetLocationIdConverter, AccountId, Address, AssetId, Balance, BlockNumber, Hash, Header,
     Index, Signature,
 };
+pub use block_rewards_hybrid::RewardDistributionConfig;
 
 pub use crate::precompiles::WhitelistedCalls;
 
@@ -166,7 +167,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("shibuya"),
     impl_name: create_runtime_str!("shibuya"),
     authoring_version: 1,
-    spec_version: 114,
+    spec_version: 115,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -552,7 +553,7 @@ impl block_rewards_hybrid::BeneficiaryPayout<NegativeImbalance> for BeneficiaryP
 }
 
 parameter_types! {
-    pub const MaxBlockRewardAmount: Balance = 2_530 * MILLISBY;
+    pub const MaxBlockRewardAmount: Balance = 230_718 * MILLISBY;
 }
 
 impl block_rewards_hybrid::Config for Runtime {
@@ -1311,10 +1312,44 @@ pub type Executive = frame_executive::Executive<
     Migrations,
 >;
 
+pub use frame_support::traits::{OnRuntimeUpgrade, StorageVersion};
+pub struct HybridInflationModelMigration;
+impl OnRuntimeUpgrade for HybridInflationModelMigration {
+    fn on_runtime_upgrade() -> Weight {
+        let mut reward_config = block_rewards_hybrid::RewardDistributionConfig {
+            // 4.66%
+            treasury_percent: Perbill::from_rational(4663701u32, 100000000u32),
+            // 23.09%
+            base_staker_percent: Perbill::from_rational(2309024u32, 10000000u32),
+            // 17.31%
+            dapps_percent: Perbill::from_rational(173094531u32, 1000000000u32),
+            // 2.99%
+            collators_percent: Perbill::from_rational(29863296u32, 1000000000u32),
+            // 51.95%
+            adjustable_percent: Perbill::from_rational(519502763u32, 1000000000u32),
+            // 60.00%
+            ideal_dapps_staking_tvl: Perbill::from_percent(60),
+        };
+
+        // This HAS to be tested prior to update - we need to ensure that config is consistent
+        #[cfg(feature = "try-runtime")]
+        assert!(reward_config.is_consistent());
+
+        // This should never execute but we need to have code in place that ensures config is consistent
+        if !reward_config.is_consistent() {
+            reward_config = Default::default();
+        }
+
+        block_rewards_hybrid::RewardDistributionConfigStorage::<Runtime>::put(reward_config);
+
+        <Runtime as frame_system::pallet::Config>::DbWeight::get().writes(1)
+    }
+}
+
 /// All migrations that will run on the next runtime upgrade.
 ///
 /// Once done, migrations should be removed from the tuple.
-pub type Migrations = ();
+pub type Migrations = HybridInflationModelMigration;
 
 type EventRecord = frame_system::EventRecord<
     <Runtime as frame_system::Config>::RuntimeEvent,

runtime/shiden/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shiden-runtime"
-version = "5.24.0"
+version = "5.25.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

runtime/shiden/src/lib.rs

@@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("shiden"),
     impl_name: create_runtime_str!("shiden"),
     authoring_version: 1,
-    spec_version: 111,
+    spec_version: 112,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,