Add filter check to do_transfer_multiassets and update related test case

Signed-off-by: Dengjianping <[email protected]>

Author: Dengjianping

xtokens/src/lib.rs

@@ -458,6 +458,10 @@ pub mod module {
 				currencies.len() <= T::MaxAssetsForTransfer::get(),
 				Error::<T>::TooManyAssetsBeingSent
 			);
+			ensure!(
+				T::MultiLocationsFilter::contains(&dest),
+				Error::<T>::NotSupportedMultiLocation
+			);
 
 			let mut assets = MultiAssets::new();
 
@@ -470,10 +474,6 @@ pub mod module {
 				let location: MultiLocation = T::CurrencyIdConvert::convert(currency_id.clone())
 					.ok_or(Error::<T>::NotCrossChainTransferableCurrency)?;
 				ensure!(!amount.is_zero(), Error::<T>::ZeroAmount);
-				ensure!(
-					T::MultiLocationsFilter::contains(&dest),
-					Error::<T>::NotSupportedMultiLocation
-				);
 
 				// Push contains saturated addition, so we should be able to use it safely
 				assets.push((location, (*amount).into()).into())
@@ -500,6 +500,10 @@ pub mod module {
 				assets.len() <= T::MaxAssetsForTransfer::get(),
 				Error::<T>::TooManyAssetsBeingSent
 			);
+			ensure!(
+				T::MultiLocationsFilter::contains(&dest),
+				Error::<T>::NotSupportedMultiLocation
+			);
 			let origin_location = T::AccountIdToMultiLocation::convert(who.clone());
 
 			let mut non_fee_reserve: Option<MultiLocation> = None;

xtokens/src/mock/para.rs

@@ -294,12 +294,13 @@ parameter_types! {
 pub struct WhiteListingMultiLocations;
 impl Contains<MultiLocation> for WhiteListingMultiLocations {
 	fn contains(dest: &MultiLocation) -> bool {
-		if dest.parent_count() != 1 {
+		// Consider children parachain, means parent = 0
+		if dest.parent_count() != 0 && dest.parent_count() != 1 {
 			return false;
 		}
 
 		if let Junctions::X1(Junction::AccountId32 { .. }) = dest.interior() {
-			// parent = 1, and the junctions is the variant X1
+			// parent = 1 or 0, and the junctions is the variant X1
 			// means the asset will be sent to relaychain.
 			true
 		} else {

xtokens/src/tests.rs

@@ -1342,6 +1342,7 @@ fn unsupported_multilocation_should_be_filtered() {
 
 	ParaB::execute_with(|| {
 		assert_ok!(ParaTokens::deposit(CurrencyId::B, &ALICE, 1_000));
+		assert_ok!(ParaTokens::deposit(CurrencyId::B1, &ALICE, 1_000));
 		assert_noop!(
 			ParaXTokens::transfer(
 				Some(ALICE).into(),
@@ -1362,5 +1363,26 @@ fn unsupported_multilocation_should_be_filtered() {
 			),
 			Error::<para::Runtime>::NotSupportedMultiLocation
 		);
+
+		assert_noop!(
+			ParaXTokens::transfer_multicurrencies(
+				Some(ALICE).into(),
+				vec![(CurrencyId::B1, 50), (CurrencyId::B, 450)],
+				0,
+				Box::new(
+					(
+						Parent,
+						Parachain(4),
+						Junction::AccountId32 {
+							network: NetworkId::Any,
+							id: BOB.into(),
+						},
+					)
+						.into()
+				),
+				40,
+			),
+			Error::<para::Runtime>::NotSupportedMultiLocation
+		);
 	});
 }