Set migration user to Multilocation

Polimec · Jun 26, 2024 · 1b1c897 · 1b1c897
1 parent 1edc79b
commit 1b1c897
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/funding/src/functions/6_settlement.rs b/pallets/funding/src/functions/6_settlement.rs
@@ -448,8 +448,8 @@ impl<T: Config> Pallet<T> {
 		vesting_time: BlockNumberFor<T>,
 	) -> DispatchResult {
 		UserMigrations::<T>::try_mutate(project_id, origin, |maybe_migrations| -> DispatchResult {
-			let migration_origin =
-				MigrationOrigin { user: T::AccountId32Conversion::convert(origin.clone()), id, participation_type };
+			let multilocation_user = (AccountId32 { network: None, id: T::AccountId32Conversion::convert(origin.clone()) }).into();
+			let migration_origin = MigrationOrigin { user: multilocation_user, id, participation_type };
 			let vesting_time: u64 = vesting_time.try_into().map_err(|_| Error::<T>::BadMath)?;
 			let migration_info: MigrationInfo = (ct_amount.into(), vesting_time.into()).into();
 			let migration = Migration::new(migration_origin, migration_info);

diff --git a/pallets/funding/src/instantiator/chain_interactions.rs b/pallets/funding/src/instantiator/chain_interactions.rs
@@ -917,7 +917,8 @@ impl<
 			(_, Some((_, migrations))) => {
 				let maybe_migration = migrations.into_iter().find(|migration| {
 					let user = T::AccountId32Conversion::convert(account.clone());
-					matches!(migration.origin, MigrationOrigin { user: m_user, id: m_id, participation_type: m_participation_type } if m_user == user && m_id == id && m_participation_type == participation_type)
+					let multilocation_user = MultiLocation{parents: 0, interior: X1(AccountId32 {network: None, id: user})};
+					matches!(migration.origin, MigrationOrigin { user: m_user, id: m_id, participation_type: m_participation_type } if m_user == multilocation_user && m_id == id && m_participation_type == participation_type)
 				});
 				match maybe_migration {
 					// Migration exists so we check if the amount is correct and if it should exist

diff --git a/pallets/polimec-receiver/Cargo.toml b/pallets/polimec-receiver/Cargo.toml
@@ -25,6 +25,7 @@ cumulus-pallet-xcm.workspace = true
 polkadot-parachain-primitives.workspace = true
 polimec-common.workspace = true
 sp-runtime.workspace = true
+xcm.workspace = true
 
 [dev-dependencies]
 serde.workspace = true

diff --git a/pallets/polimec-receiver/src/lib.rs b/pallets/polimec-receiver/src/lib.rs
@@ -31,6 +31,7 @@ pub mod pallet {
 	use polkadot_parachain_primitives::primitives::{Id as ParaId, Sibling};
 	use sp_runtime::traits::{AccountIdConversion, Convert};
 	use sp_std::prelude::*;
+	use xcm::latest::{Junction::AccountId32, Junctions::X1, MultiLocation};
 
 	type MomentOf<T> = <<T as Config>::Vesting as VestingSchedule<<T as frame_system::Config>::AccountId>>::Moment;
 
@@ -57,11 +58,10 @@ pub mod pallet {
 
 	#[pallet::storage]
 	#[pallet::getter(fn something)]
-	// pub type ExecutedMigrations<T> = StorageNMap<_, BoundedVec<MigrationOrigin, T::MaxMigrations>>;
 	pub type ExecutedMigrations<T> = StorageNMap<
 		_,
 		(
-			NMapKey<Blake2_128Concat, [u8; 32]>,
+			NMapKey<Blake2_128Concat, xcm::latest::MultiLocation>,
 			NMapKey<Blake2_128Concat, ParticipationType>,
 			NMapKey<Blake2_128Concat, u32>,
 		),
@@ -109,19 +109,23 @@ pub mod pallet {
 				..
 			} in migrations.clone().inner()
 			{
+				let user_32 = match user {
+					MultiLocation { parents: 0, interior: X1(AccountId32 { network: _, id }) } => Ok(id),
+					_ => Err(Error::<T>::NoneValue),
+				}?;
 				let already_executed = ExecutedMigrations::<T>::get((user, participation_type, id));
 				if already_executed {
 					Self::deposit_event(Event::DuplicatedMigrationSkipped { migration });
 					continue;
 				}
 				T::Balances::transfer(
 					&polimec_soverign_account,
-					&user.into(),
+					&user_32.into(),
 					contribution_token_amount.into(),
 					KeepAlive,
 				)?;
 				T::Vesting::add_vesting_schedule(
-					&user.into(),
+					&user_32.into(),
 					contribution_token_amount.into(),
 					T::MigrationInfoToPerBlockBalance::convert(migration.info.clone()),
 					T::GenesisMoment::get(),

diff --git a/polimec-common/common/src/lib.rs b/polimec-common/common/src/lib.rs
@@ -101,10 +101,11 @@ pub trait ReleaseSchedule<AccountId, Reason> {
 
 pub mod migration_types {
 	use super::*;
+	use xcm::latest::MultiLocation;
 
 	#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 	pub struct MigrationOrigin {
-		pub user: [u8; 32],
+		pub user: MultiLocation,
 		pub id: u32,
 		pub participation_type: ParticipationType,
 	}