Release v6.7.0 (#1599)

* Audit review * Release `v6.7.0` * Format Signed-off-by: Xavier Lau <x@acg.box> * Fix try-runtime Signed-off-by: Xavier Lau <x@acg.box> --------- Signed-off-by: Xavier Lau <x@acg.box>
darwinia-network · Sep 24, 2024 · 70233a7 · 70233a7
1 parent 941b687
commit 70233a7
Show file tree

Hide file tree

Showing 20 changed files with 81 additions and 43 deletions.
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.5"
+version    = "6.7.0"
 
 [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.5";
+pub const NODE_VERSION: &str = "6.7.0";
 
 /// 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
@@ -53,7 +53,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_5_0,
+	spec_version: 6_6_7_0,
 	impl_version: 0,
 	apis: sp_version::create_apis_vec!([]),
 	transaction_version: 0,

diff --git a/pallet/deposit/Cargo.toml b/pallet/deposit/Cargo.toml
@@ -81,6 +81,9 @@ runtime-benchmarks = [
 ]
 
 try-runtime = [
+	# darwinia
+	"darwinia-ethtx-forwarder/try-runtime",
+
 	# polkadot-sdk
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",

diff --git a/pallet/ethtx-forwarder/Cargo.toml b/pallet/ethtx-forwarder/Cargo.toml
@@ -86,6 +86,16 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 ]
 
+try-runtime = [
+	# frontier
+	"pallet-evm/try-runtime",
+
+	# polkadot-sdk
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
+
 evm-tracing = [
 	# moonbeam
 	"moonbeam-evm-tracer",

diff --git a/pallet/staking/Cargo.toml b/pallet/staking/Cargo.toml
@@ -96,6 +96,9 @@ runtime-benchmarks = [
 ]
 
 try-runtime = [
+	# darwinia
+	"darwinia-ethtx-forwarder/try-runtime",
+
 	# polkadot-sdk
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",

diff --git a/pallet/staking/src/lib.rs b/pallet/staking/src/lib.rs
@@ -816,7 +816,11 @@ pub mod pallet {
 			// let cs_from_contract = Self::elect_from_contract(n1)?;
 			// let cs_from_pallet = Self::elect(n2)?;
 			let cs_from_contract = Self::elect_from_contract(n1).unwrap_or_default();
-			let cs_from_pallet = Self::elect(n2).unwrap_or_default();
+			let cs_from_pallet = Self::elect(n2)
+				.unwrap_or_default()
+				.into_iter()
+				.filter(|c| !cs_from_contract.contains(c))
+				.collect();
 
 			log::info!("collators from contract {cs_from_contract:?}");
 			log::info!("collators from pallet {cs_from_pallet:?}");
@@ -1356,7 +1360,8 @@ where
 	PalletId(*b"da/staki").into_account_truncating()
 }
 
-fn now<T>() -> Moment
+/// The current time in milliseconds.
+pub fn now<T>() -> Moment
 where
 	T: Config,
 {

diff --git a/pallet/staking/src/mock.rs b/pallet/staking/src/mock.rs
@@ -266,13 +266,17 @@ impl crate::Election<AccountId> for RingStaking {
 				.map(|i| {
 					let who = AccountId(i);
 
-					assert_ok!(Session::set_keys(
+					if Session::set_keys(
 						RuntimeOrigin::signed(who),
 						SessionKeys { uint: i.into() },
-						Vec::new()
-					));
-
-					who
+						Vec::new(),
+					)
+					.is_ok()
+					{
+						who
+					} else {
+						AccountId(0)
+					}
 				})
 				.collect(),
 		)

diff --git a/pallet/staking/src/tests.rs b/pallet/staking/src/tests.rs
@@ -845,6 +845,24 @@ fn hybrid_election_should_work() {
 	});
 }
 
+#[test]
+fn dedup_election_should_work() {
+	ExtBuilder::default().collator_count(10).build().execute_with(|| {
+		let who = AccountId(100);
+		let _ = <pallet_balances::Pallet<Runtime>>::deposit_creating(&who, 100 as _);
+
+		assert_ok!(Staking::stake(RuntimeOrigin::signed(who), 100 as _, Vec::new()));
+		assert_ok!(Staking::collect(RuntimeOrigin::signed(who), Perbill::zero()));
+		assert_ok!(Staking::nominate(RuntimeOrigin::signed(who), who));
+
+		Timestamp::set_timestamp(30 * DAY_IN_MILLIS);
+		new_session();
+		new_session();
+
+		assert_eq!(vec![who], <pallet_session::Validators<Runtime>>::get());
+	});
+}
+
 #[test]
 fn hybrid_payout_should_work() {
 	ExtBuilder::default().collator_count(10).inflation_type(1).build().execute_with(|| {

diff --git a/precompile/deposit/src/lib.rs b/precompile/deposit/src/lib.rs
@@ -90,15 +90,4 @@ where
 
 		Ok(true)
 	}
-
-	#[precompile::public("migrate(address)")]
-	fn migrate(handle: &mut impl PrecompileHandle, who: Address) -> EvmResult<bool> {
-		let origin: AccountIdOf<Runtime> = handle.context().caller.into();
-		RuntimeHelper::<Runtime>::try_dispatch(
-			handle,
-			Some(origin).into(),
-			darwinia_deposit::Call::<Runtime>::migrate { who: H160::from(who).into() },
-		)?;
-		Ok(true)
-	}
 }
diff --git a/precompile/deposit/src/tests.rs b/precompile/deposit/src/tests.rs
@@ -36,7 +36,6 @@ fn selectors() {
 	assert!(PCall::lock_selectors().contains(&0x998e4242));
 	assert!(PCall::claim_selectors().contains(&0x4e71d92d));
 	assert!(PCall::claim_with_penalty_selectors().contains(&0xfa04a9bf));
-	assert!(PCall::migrate_selectors().contains(&0xce5494bb));
 }
 
 #[test]

diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
@@ -277,6 +277,7 @@ try-runtime = [
 	# darwinia
 	"darwinia-account-migration/try-runtime",
 	"darwinia-deposit/try-runtime",
+	"darwinia-ethtx-forwarder/try-runtime",
 	"darwinia-staking/try-runtime",
 
 	# frontier

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_5_0,
+	spec_version: 6_6_7_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
@@ -84,6 +84,8 @@ fn migrate() -> frame_support::weights::Weight {
 		<darwinia_staking::RingStakingContract<Runtime>>::put(who);
 	}
 
+	<darwinia_staking::MigrationStartPoint<Runtime>>::put(darwinia_staking::now::<Runtime>());
+
 	// frame_support::weights::Weight::zero()
 	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(7, 7)
 }
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
@@ -301,6 +301,7 @@ try-runtime = [
 	"darwinia-account-migration/try-runtime",
 	"darwinia-asset-limit/try-runtime",
 	"darwinia-deposit/try-runtime",
+	"darwinia-ethtx-forwarder/try-runtime",
 	"darwinia-staking/try-runtime",
 
 	# frontier

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_5_0,
+	spec_version: 6_6_7_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
@@ -92,6 +92,8 @@ fn migrate() -> frame_support::weights::Weight {
 		<darwinia_staking::RingStakingContract<Runtime>>::put(who);
 	}
 
+	<darwinia_staking::MigrationStartPoint<Runtime>>::put(darwinia_staking::now::<Runtime>());
+
 	// frame_support::weights::Weight::zero()
 	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(7, 107)
 }
diff --git a/runtime/koi/Cargo.toml b/runtime/koi/Cargo.toml
@@ -291,6 +291,7 @@ try-runtime = [
 	# darwinia
 	"darwinia-asset-limit/try-runtime",
 	"darwinia-deposit/try-runtime",
+	"darwinia-ethtx-forwarder/try-runtime",
 	"darwinia-staking/try-runtime",
 
 	# moonbeam

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_6_2,
+	spec_version: 6_6_7_0,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 0,