v5.28.0 release prep (#1113)

AstarNetwork · Dec 20, 2023 · b487f00 · b487f00
1 parent 9536303
commit b487f00
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 52 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "5.27.0"
+version = "5.28.0"
 description = "Astar collator implementation in Rust."
 build = "build.rs"
 default-run = "astar-collator"

diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-runtime"
-version = "5.27.0"
+version = "5.28.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs
@@ -138,7 +138,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("astar"),
     impl_name: create_runtime_str!("astar"),
     authoring_version: 1,
-    spec_version: 74,
+    spec_version: 75,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -1058,45 +1058,7 @@ 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 = pallet_block_rewards_hybrid::RewardDistributionConfig {
-            // 4.78%
-            treasury_percent: Perbill::from_rational(4_783_623u32, 100_000_000u32),
-            // 23.04%
-            base_staker_percent: Perbill::from_rational(23_041_451u32, 100_000_000u32),
-            // 17.27%
-            dapps_percent: Perbill::from_rational(17_272_878u32, 100_000_000u32),
-            // 3.06%
-            collators_percent: Perbill::from_rational(3_061_518u32, 100_000_000u32),
-            // 51.84%
-            adjustable_percent: Perbill::from_rational(51_840_530u32, 100_000_000u32),
-            // 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();
-        }
-
-        pallet_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.
-/// `HybridInflationModelMigration` to be applied on spec_version: 74
-pub type Migrations = HybridInflationModelMigration;
+pub type Migrations = ();
 
 type EventRecord = frame_system::EventRecord<
     <Runtime as frame_system::Config>::RuntimeEvent,

diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "local-runtime"
-version = "5.27.0"
+version = "5.28.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shibuya-runtime"
-version = "5.27.0"
+version = "5.28.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs
@@ -171,7 +171,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("shibuya"),
     impl_name: create_runtime_str!("shibuya"),
     authoring_version: 1,
-    spec_version: 117,
+    spec_version: 118,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -1384,6 +1384,7 @@ parameter_types! {
 ///
 /// Once done, migrations should be removed from the tuple.
 pub type Migrations = (
+    // The following 4 migrations should be done as part of shibuya-118 upgrade.
     pallet_inflation::PalletInflationInitConfig<Runtime, InitInflationParams>,
     pallet_dapp_staking_v3::DAppStakingV3InitConfig<Runtime, InitDappStakingv3Params>,
     frame_support::migrations::RemovePallet<

diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shiden-runtime"
-version = "5.27.0"
+version = "5.28.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

diff --git a/runtime/shiden/src/lib.rs b/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: 114,
+    spec_version: 115,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,