feat: Shiden runtime upgrade for pallet-dapps-staking 3.1.0 (#602)

AstarNetwork · Mar 30, 2022 · 9624f9f · 9624f9f
1 parent 1d311bf
commit 9624f9f
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 31 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 = "3.13.0"
+version = "3.14.0"
 authors = ["Stake Technologies <[email protected]>"]
 description = "Astar collator implementation in Rust."
 build = "build.rs"

diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-runtime"
-version = "3.13.0"
+version = "3.14.0"
 authors = ["Stake Technologies <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "local-runtime"
-version = "3.13.0"
+version = "3.14.0"
 authors = ["Stake Technologies <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shibuya-runtime"
-version = "3.13.0"
+version = "3.14.0"
 authors = ["Stake Technologies <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shiden-runtime"
-version = "3.13.0"
+version = "3.14.0"
 authors = ["Stake Technologies <[email protected]>"]
 edition = "2018"
 build = "build.rs"
@@ -80,8 +80,8 @@ try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "p
 # Astar pallets
 pallet-block-reward = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.17", default-features = false }
 pallet-custom-signatures = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.17", default-features = false }
-pallet-dapps-staking = { git = "https://github.com/AstarNetwork/astar-frame", tag = "pallet-dapps-staking-3.0.4/polkadot-v0.9.17", default-features = false }
-pallet-precompile-dapps-staking = { git = "https://github.com/AstarNetwork/astar-frame", tag = "pallet-dapps-staking-3.0.4/polkadot-v0.9.17", default-features = false }
+pallet-dapps-staking = { git = "https://github.com/AstarNetwork/astar-frame", tag = "pallet-dapps-staking-3.1.0/polkadot-v0.9.17", default-features = false }
+pallet-precompile-dapps-staking = { git = "https://github.com/AstarNetwork/astar-frame", tag = "pallet-dapps-staking-3.1.0/polkadot-v0.9.17", default-features = false }
 pallet-evm-precompile-sr25519 = { git = "https://github.com/AstarNetwork/astar-frame", tag = "pallet-evm-precompile-sr25519-1.0.0/polkadot-v0.9.17", default-features = false }
 
 [build-dependencies]

diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs
@@ -87,7 +87,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("shiden"),
     impl_name: create_runtime_str!("shiden"),
     authoring_version: 1,
-    spec_version: 42,
+    spec_version: 43,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -748,26 +748,32 @@ pub type Executive = frame_executive::Executive<
     frame_system::ChainContext<Runtime>,
     Runtime,
     AllPalletsWithSystem,
-    (DappsStakingMigrationV3,),
+    DappsStakingFixEraLength,
 >;
 
-pub struct DappsStakingMigrationV3;
+// Migration for fixing era length in dapps staking.
+pub struct DappsStakingFixEraLength;
 
-impl OnRuntimeUpgrade for DappsStakingMigrationV3 {
+impl OnRuntimeUpgrade for DappsStakingFixEraLength {
     fn on_runtime_upgrade() -> frame_support::weights::Weight {
-        pallet_dapps_staking::migrations::v3::stateful_migrate::<Runtime>(
-            RuntimeBlockWeights::get().max_block / 5, // should be 100_000_000_000 [ps]
-        )
-    }
+        use frame_system::pallet::Config;
+        use pallet_dapps_staking::{Config as DappStakingConfig, CurrentEra, NextEraStartingBlock};
+        use sp_runtime::SaturatedConversion;
 
-    #[cfg(feature = "try-runtime")]
-    fn pre_upgrade() -> Result<(), &'static str> {
-        pallet_dapps_staking::migrations::v3::pre_migrate::<Runtime, Self>()
-    }
+        let dapps_staking_block_offset: u32 = 489600; // calculated 2022/03/29
+                                                      // Shiden: 1384490 - (1384490 % 7200) - (124 * 7200)
 
-    #[cfg(feature = "try-runtime")]
-    fn post_upgrade() -> Result<(), &'static str> {
-        pallet_dapps_staking::migrations::v3::post_migrate::<Runtime, Self>()
+        let blocks_per_era =
+            <Runtime as DappStakingConfig>::BlockPerEra::get().saturated_into::<u32>();
+        let current_era = CurrentEra::<Runtime>::get();
+
+        let next_era_starting_block =
+            dapps_staking_block_offset + ((current_era + 1) * blocks_per_era);
+
+        NextEraStartingBlock::<Runtime>::put(
+            next_era_starting_block.saturated_into::<<Runtime as Config>::BlockNumber>(),
+        );
+        <Runtime as Config>::DbWeight::get().reads_writes(1, 1)
     }
 }