fixes for xcm conversion of KAR and KUSD

pallets/flexible-fee/src/mock.rs

@@ -77,7 +77,7 @@ parameter_types! {
 
 impl system::Config for Test {
 	type AccountData = balances::AccountData<u64>;
-	type AccountId = AccountId32;
+	type AccountId = AccountId;
 	type BaseCallFilter = ();
 	type BlockHashCount = BlockHashCount;
 	type BlockLength = ();

runtime/bifrost/src/lib.rs

@@ -75,10 +75,10 @@ use sp_runtime::traits::ConvertInto;
 use xcm::v0::{BodyId, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId, Xcm};
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,
-	EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,
-	ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative,
-	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,
+	EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, ParentAsSuperuser,
+	ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
+	UsingComponents,
 };
 use xcm_executor::{Config, XcmExecutor};
 use xcm_support::BifrostCurrencyAdapter;

runtime/common/src/xcm_impl.rs

@@ -114,35 +114,48 @@ fn native_currency_location(id: CurrencyId, para_id: ParaId) -> MultiLocation {
 pub struct BifrostCurrencyIdConvert<T>(sp_std::marker::PhantomData<T>);
 impl<T: Get<ParaId>> Convert<CurrencyId, Option<MultiLocation>> for BifrostCurrencyIdConvert<T> {
 	fn convert(id: CurrencyId) -> Option<MultiLocation> {
-		use CurrencyId::{Native, Token};
+		use CurrencyId::{Native, Stable, Token};
 		match id {
 			Token(TokenSymbol::KSM) => Some(X1(Parent)),
 			Native(TokenSymbol::ASG) | Native(TokenSymbol::BNC) =>
 				Some(native_currency_location(id, T::get())),
+			// Karura currencyId types
+			Token(TokenSymbol::KAR) | Stable(TokenSymbol::KUSD) =>
+				Some(X3(Parent, Parachain(2000), GeneralKey(id.encode()))),
 			_ => None,
 		}
 	}
 }
 impl<T: Get<ParaId>> Convert<MultiLocation, Option<CurrencyId>> for BifrostCurrencyIdConvert<T> {
 	fn convert(location: MultiLocation) -> Option<CurrencyId> {
-		use CurrencyId::{Native, Token};
+		use CurrencyId::{Native, Stable, Token};
 		use TokenSymbol::*;
 		match location {
 			X1(Parent) => Some(Token(KSM)),
-			X3(Parent, Junction::Parachain(id), GeneralKey(key))
-				if ParaId::from(id) == T::get() =>
-			{
+			X3(Parent, Junction::Parachain(id), GeneralKey(key)) => {
 				// decode the general key
 				if let Ok(currency_id) = CurrencyId::decode(&mut &key[..]) {
 					// check `currency_id` is cross-chain asset
-					match currency_id {
-						Native(TokenSymbol::ASG) | Native(TokenSymbol::BNC) => Some(currency_id),
-						_ => None,
+					if ParaId::from(id) == T::get() {
+						match currency_id {
+							Native(TokenSymbol::ASG) | Native(TokenSymbol::BNC) =>
+								Some(currency_id),
+							_ => None,
+						}
+					// Kurara CurrencyId types
+					} else if id == 2000 {
+						match currency_id {
+							Token(TokenSymbol::KAR) | Stable(TokenSymbol::KUSD) =>
+								Some(currency_id),
+							_ => None,
+						}
+					} else {
+						None
 					}
 				} else {
 					None
 				}
-			}
+			},
 			_ => None,
 		}
 	}