v6.6.5 prerelease (#1556)

* Release `v6.6.5` * Migrate * Add addresses * Set storage * Correct reward address * Fix * Fix test
darwinia-network · Aug 9, 2024 · 5d8f799 · 5d8f799
1 parent e619d26
commit 5d8f799
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 32 deletions.
diff --git a/.github/note-template/runtime.md b/.github/note-template/runtime.md
@@ -1,6 +1,6 @@
 ## {{ .Env.CHAIN | strings.Title }}
 <h3 align="right">Upgrade Priority HIGH :red_circle:</h3>
-<h4 align="center">!!All nodes need to be updated to this(`v6.6.4`) version prior to the upcoming `v6.6.5` release because of the new asynchronous backing feature!!</h4>
+<h4 align="center">!!All nodes must be upgraded to a minimum of `v6.6.4` version because of the new asynchronous backing feature!!</h4>
 
 #### Whitelist Hash
 ```

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ edition    = "2021"
 homepage   = "https://darwinia.network"
 license    = "GPL-3.0"
 repository = "https://github.com/darwinia-network/darwinia"
-version    = "6.6.4"
+version    = "6.6.5"
 
 [workspace.dependencies]
 # crates.io

diff --git a/node/src/cli.rs b/node/src/cli.rs
@@ -24,7 +24,7 @@
 ///
 /// The worker binaries associated to the node binary should ensure that they are using the same
 /// version as the main node that started them.
-pub const NODE_VERSION: &str = "6.6.4";
+pub const NODE_VERSION: &str = "6.6.5";
 
 /// Sub-commands supported by the collator.
 #[derive(Debug, clap::Subcommand)]

diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
@@ -54,7 +54,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 	spec_name: sp_runtime::create_runtime_str!("Darwinia2"),
 	impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
 	authoring_version: 0,
-	spec_version: 6_6_4_0,
+	spec_version: 6_6_5_0,
 	impl_version: 0,
 	apis: sp_version::create_apis_vec!([]),
 	transaction_version: 0,

diff --git a/pallet/staking/src/lib.rs b/pallet/staking/src/lib.rs
@@ -671,7 +671,11 @@ pub mod pallet {
 			};
 
 			reward(account_id(), actual_reward_to_ring);
-			reward(<KtonRewardDistributionContract<T>>::get(), reward_to_kton);
+			reward(
+				[109, 111, 100, 108, 100, 97, 47, 116, 114, 115, 114, 121, 0, 0, 0, 0, 0, 0, 0, 0]
+					.into(),
+				reward_to_kton,
+			);
 
 			T::KtonStakerNotifier::notify(reward_to_kton);
 		}

diff --git a/pallet/staking/src/tests.rs b/pallet/staking/src/tests.rs
@@ -539,9 +539,6 @@ fn payout_should_work() {
 			vec![
 				// Pay to staking failed.
 				Event::Unpaid { who: account_id(), amount: 5000000000000000000000 },
-				// Pay to distribution contract failed.
-				// The contract address is the same as staking pallet account in unit test.
-				Event::Unpaid { who: account_id(), amount: 5000000000000000000000 },
 				// Pay to collator failed.
 				Event::Unpaid { who: account_id_of(6), amount: 3749999998500000000000 },
 				// Pay to nominator failed.

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
@@ -80,7 +80,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 	spec_name: sp_runtime::create_runtime_str!("Crab2"),
 	impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
 	authoring_version: 0,
-	spec_version: 6_6_4_0,
+	spec_version: 6_6_5_0,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 0,

diff --git a/runtime/crab/src/migration.rs b/runtime/crab/src/migration.rs
@@ -45,6 +45,16 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 }
 
 fn migrate() -> frame_support::weights::Weight {
-	frame_support::weights::Weight::zero()
-	// <Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, 0)
+	const KTON_DAO_VAULT_ADDR: &str = "0xf1b4f3D438eE2B363C5ba1641A498709ff5780bA";
+
+	#[cfg(feature = "try-runtime")]
+	assert!(array_bytes::hex_n_into::<_, _, 20>(KTON_DAO_VAULT_ADDR).is_ok());
+
+	if let Ok(w) = array_bytes::hex_n_into::<_, _, 20>(KTON_DAO_VAULT_ADDR) {
+		<darwinia_staking::KtonRewardDistributionContract<Runtime>>::put(w);
+		darwinia_staking::migration::migrate_staking_reward_distribution_contract::<Runtime>(w);
+	}
+
+	// frame_support::weights::Weight::zero()
+	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(10, 10)
 }
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
@@ -80,7 +80,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 	spec_name: sp_runtime::create_runtime_str!("Darwinia2"),
 	impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
 	authoring_version: 0,
-	spec_version: 6_6_4_0,
+	spec_version: 6_6_5_0,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 0,

diff --git a/runtime/darwinia/src/migration.rs b/runtime/darwinia/src/migration.rs
@@ -61,6 +61,16 @@ fn migrate() -> frame_support::weights::Weight {
 	}
 	.remove_storage_values();
 
+	const KTON_DAO_VAULT_ADDR: &str = "0xf1b4f3D438eE2B363C5ba1641A498709ff5780bA";
+
+	#[cfg(feature = "try-runtime")]
+	assert!(array_bytes::hex_n_into::<_, _, 20>(KTON_DAO_VAULT_ADDR).is_ok());
+
+	if let Ok(w) = array_bytes::hex_n_into::<_, _, 20>(KTON_DAO_VAULT_ADDR) {
+		<darwinia_staking::KtonRewardDistributionContract<Runtime>>::put(w);
+		darwinia_staking::migration::migrate_staking_reward_distribution_contract::<Runtime>(w);
+	}
+
 	// frame_support::weights::Weight::zero()
-	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, n)
+	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(10, n + 10)
 }
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
@@ -80,7 +80,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 	spec_name: sp_runtime::create_runtime_str!("Darwinia Koi"),
 	impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
 	authoring_version: 0,
-	spec_version: 6_6_4_1,
+	spec_version: 6_6_5_0,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 0,