From 2c8cc048173c305f5d65404917836366f6d41533 Mon Sep 17 00:00:00 2001 From: Dino Pacandi Date: Wed, 20 Dec 2023 17:16:09 +0100 Subject: [PATCH] v5.28.0 release prep --- Cargo.lock | 10 ++++----- bin/collator/Cargo.toml | 2 +- runtime/astar/Cargo.toml | 2 +- runtime/astar/src/lib.rs | 42 ++------------------------------------ runtime/local/Cargo.toml | 2 +- runtime/shibuya/Cargo.toml | 2 +- runtime/shibuya/src/lib.rs | 3 ++- runtime/shiden/Cargo.toml | 2 +- runtime/shiden/src/lib.rs | 2 +- 9 files changed, 15 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c3e62ad0..ff480f3a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -413,7 +413,7 @@ dependencies = [ [[package]] name = "astar-collator" -version = "5.27.0" +version = "5.28.0" dependencies = [ "astar-primitives", "astar-runtime", @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "astar-runtime" -version = "5.27.0" +version = "5.28.0" dependencies = [ "array-bytes 6.1.0", "astar-primitives", @@ -6005,7 +6005,7 @@ checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "local-runtime" -version = "5.27.0" +version = "5.28.0" dependencies = [ "array-bytes 6.1.0", "astar-primitives", @@ -13136,7 +13136,7 @@ dependencies = [ [[package]] name = "shibuya-runtime" -version = "5.27.0" +version = "5.28.0" dependencies = [ "array-bytes 6.1.0", "astar-primitives", @@ -13249,7 +13249,7 @@ dependencies = [ [[package]] name = "shiden-runtime" -version = "5.27.0" +version = "5.28.0" dependencies = [ "array-bytes 6.1.0", "astar-primitives", diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml index 6676a9aa3..e3df85e38 100644 --- 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 index 4948ec59d..141760afd 100644 --- 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 index c03b40373..25c401c0f 100644 --- 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::::put(reward_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< ::RuntimeEvent, diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml index 92740a2ea..231cda0aa 100644 --- 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 index bd5081512..46e2eb1c8 100644 --- 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 index 228718d42..d140b0069 100644 --- 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, pallet_dapp_staking_v3::DAppStakingV3InitConfig, frame_support::migrations::RemovePallet< diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml index b95fad217..3d12b3600 100644 --- 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 index 50fe7657a..dc13cfe10 100644 --- 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,