stash

pallet/account-migration/Cargo.toml

@@ -14,7 +14,6 @@ scale-info  = { workspace = true }
 
 # darwinia
 darwinia-deposit = { workspace = true }
-darwinia-staking = { workspace = true }
 dc-primitives    = { workspace = true }
 
 # polkadot-sdk
@@ -43,7 +42,6 @@ std = [
 
 	# darwinia
 	"darwinia-deposit/std",
-	"darwinia-staking/std",
 	"dc-primitives/std",
 
 	# polkadot-sdk
@@ -62,7 +60,6 @@ std = [
 runtime-benchmarks = [
 	# darwinia
 	"darwinia-deposit/runtime-benchmarks",
-	"darwinia-staking/runtime-benchmarks",
 
 	# polkadot-sdk
 	"frame-benchmarking/runtime-benchmarks",
@@ -76,7 +73,6 @@ runtime-benchmarks = [
 try-runtime = [
 	# darwinia
 	"darwinia-deposit/try-runtime",
-	"darwinia-staking/try-runtime",
 
 	# polkadot-sdk
 	"frame-support/try-runtime",

pallet/account-migration/src/lib.rs

@@ -24,7 +24,7 @@
 //! These two algorithm are not compatible.
 //! Thus, an account migration is required.
 //!
-//! ## Technical detail
+//! ## Technical Detail
 //!
 //! Users must send an extrinsic themselves to migrate their account(s).
 //! This extrinsic should be unsigned, the reason is the same as `pallet-claims`.
@@ -56,7 +56,6 @@ pub use weights::WeightInfo;
 
 // darwinia
 use darwinia_deposit::{Deposit, DepositId};
-use darwinia_staking::Ledger;
 use dc_primitives::{AccountId as AccountId20, AssetId, Balance, BlockNumber, Nonce};
 // polkadot-sdk
 use frame_support::{
@@ -95,9 +94,6 @@ pub mod pallet {
 	/// The account is not a member of the multisig.
 	pub(crate) const E_NOT_MULTISIG_MEMBER: u8 = 4;
 
-	#[pallet::pallet]
-	pub struct Pallet<T>(_);
-
 	#[pallet::config]
 	pub trait Config:
 		frame_system::Config<
@@ -108,12 +104,11 @@ pub mod pallet {
 		> + pallet_assets::Config<Balance = Balance, AssetId = AssetId>
 		+ pallet_balances::Config<Balance = Balance>
 		+ darwinia_deposit::Config
-		+ darwinia_staking::Config
 	{
 		/// Override the [`frame_system::Config::RuntimeEvent`].
 		type RuntimeEvent: From<Event> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
-		/// Weight information for extrinsics in this pallet.
+		/// Weight information for extrinsic in this pallet.
 		type WeightInfo: WeightInfo;
 	}
 
@@ -158,7 +153,7 @@ pub mod pallet {
 	#[pallet::getter(fn deposit_of)]
 	pub type Deposits<T: Config> = StorageMap<_, Blake2_128Concat, AccountId32, Vec<Deposit>>;
 
-	/// [`darwinia_staking::migration::v2::OldLedger`] data.
+	/// Old ledger data.
 	#[pallet::storage]
 	#[pallet::getter(fn ledger_of)]
 	pub type Ledgers<T: Config> = StorageMap<_, Blake2_128Concat, AccountId32, OldLedger>;
@@ -169,6 +164,14 @@ pub mod pallet {
 	#[pallet::getter(fn multisig_of)]
 	pub type Multisigs<T: Config> = StorageMap<_, Identity, AccountId32, MultisigMigrationDetail>;
 
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+	#[pallet::hooks]
+	impl <T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_idle(_: BlockNumberFor<T>, mut remaining_weight: Weight) -> Weight {
+			remaining_weight
+		}
+	}
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Migrate all the account data under the `from` to `to`.
@@ -417,19 +420,17 @@ pub mod pallet {
 						asset_details,
 					);
 				}
-				if let Some(l) = <Ledgers<T>>::take(from) {
-					if let Some(ds) = <Deposits<T>>::take(from) {
-						<pallet_balances::Pallet<T> as Currency<_>>::transfer(
-							to,
-							&darwinia_deposit::account_id(),
-							ds.iter().map(|d| d.value).sum(),
-							AllowDeath,
-						)?;
-						<darwinia_deposit::Deposits<T>>::insert(
-							to,
-							BoundedVec::try_from(ds).map_err(|_| <Error<T>>::ExceedMaxDeposits)?,
-						);
-					}
+				if let Some(ds) = <Deposits<T>>::take(from) {
+					<pallet_balances::Pallet<T> as Currency<_>>::transfer(
+						to,
+						&darwinia_deposit::account_id(),
+						ds.iter().map(|d| d.value).sum(),
+						AllowDeath,
+					)?;
+					<darwinia_deposit::Deposits<T>>::insert(
+						to,
+						BoundedVec::try_from(ds).map_err(|_| <Error<T>>::ExceedMaxDeposits)?,
+					);
 				}
 			}
 

pallet/account-migration/src/mock.rs

@@ -106,17 +106,6 @@ impl darwinia_deposit::Config for Runtime {
 	type WeightInfo = ();
 }
 
-impl darwinia_staking::Config for Runtime {
-	type Currency = Balances;
-	type IssuingManager = ();
-	type KtonStaking = ();
-	type RingStaking = ();
-	type RuntimeEvent = RuntimeEvent;
-	type Treasury = ();
-	type UnixTime = Timestamp;
-	type WeightInfo = ();
-}
-
 impl crate::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
@@ -129,7 +118,6 @@ frame_support::construct_runtime! {
 		Balances: pallet_balances,
 		Assets: pallet_assets,
 		Deposit: darwinia_deposit,
-		Staking: darwinia_staking,
 		AccountMigration: crate,
 	}
 }

pallet/account-migration/src/tests.rs

@@ -139,7 +139,7 @@ fn migrate_multisig_should_work() {
 				signature: signature.0,
 				new_multisig_params: None
 			}),
-			TransactionValidityError::Invalid(InvalidTransaction::Custom(E_DUPLICATIVE_SUBMISSION))
+			TransactionValidityError::Invalid(InvalidTransaction::Custom(E_DUPLICATED_SUBMISSION))
 		);
 
 		assert!(<Multisigs<Runtime>>::get(&multisig).is_some());