(fix): Send back xcDOT to AssetHub from Moonbeam (#2938)

* initial setup

* fix comments

* start testing

* add one more step in test

* add more tests

* revert changes in xtokens precompile

* remove para_event() unused function

* fix costs

* fix more costs

* use proper branch

* add tests to moonriver and moonbeam

* rename struct to ConcreteAssetFromRelay and add more docs

* remove unneeded transfer in test

precompiles/xtokens/src/tests.rs

@@ -94,7 +94,7 @@ fn transfer_self_reserve_works() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(2000)
+				.expect_cost(3000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -139,7 +139,7 @@ fn transfer_to_reserve_works() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -186,7 +186,7 @@ fn transfer_to_reserve_with_unlimited_weight_works() {
 						weight: u64::MAX,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -235,7 +235,7 @@ fn transfer_to_reserve_with_fee_works() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -290,7 +290,7 @@ fn transfer_non_reserve_to_non_reserve_works() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -339,7 +339,7 @@ fn transfer_non_reserve_to_non_reserve_with_fee_works() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -394,7 +394,7 @@ fn transfer_multi_asset_to_reserve_works() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -442,7 +442,7 @@ fn transfer_multi_asset_self_reserve_works() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(2000)
+				.expect_cost(3000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -490,7 +490,7 @@ fn transfer_multi_asset_self_reserve_with_fee_works() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(2000)
+				.expect_cost(3000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -542,7 +542,7 @@ fn transfer_multi_asset_non_reserve_to_non_reserve() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -591,7 +591,7 @@ fn transfer_multi_asset_non_reserve_to_non_reserve_with_fee() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -645,7 +645,7 @@ fn transfer_multi_currencies() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 
@@ -718,7 +718,7 @@ fn transfer_multi_assets() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(3000)
+				.expect_cost(4000)
 				.expect_no_logs()
 				.execute_returns(());
 

runtime/moonbase/tests/integration_test.rs

@@ -1568,7 +1568,7 @@ fn xtokens_precompiles_transfer() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(348090)
+				.expect_cost(348298)
 				.expect_no_logs()
 				// We expect an evm subcall ERC20.burnFrom
 				.with_subcall_handle(move |subcall| {
@@ -1659,7 +1659,7 @@ fn xtokens_precompiles_transfer_multiasset() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(348090)
+				.expect_cost(348298)
 				.expect_no_logs()
 				// We expect an evm subcall ERC20.burnFrom
 				.with_subcall_handle(move |subcall| {
@@ -1743,7 +1743,7 @@ fn xtokens_precompiles_transfer_native() {
 						weight: 4_000_000,
 					},
 				)
-				.expect_cost(16000)
+				.expect_cost(16208)
 				.expect_no_logs()
 				.execute_returns(());
 		})

runtime/moonbase/tests/xcm_mock/mod.rs

@@ -106,7 +106,7 @@ decl_test_parachain! {
 		Runtime = statemint_like::Runtime,
 		XcmpMessageHandler = statemint_like::MsgQueue,
 		DmpMessageHandler = statemint_like::MsgQueue,
-		new_ext = statemint_ext(4),
+		new_ext = statemint_ext(1000),
 	}
 }
 
@@ -118,7 +118,7 @@ decl_test_relay_chain! {
 		XcmConfig = relay_chain::XcmConfig,
 		MessageQueue = relay_chain::MessageQueue,
 		System = relay_chain::System,
-		new_ext = relay_ext(vec![1, 2, 3, 4]),
+		new_ext = relay_ext(vec![1, 2, 3, 1000]),
 	}
 }
 
@@ -129,7 +129,7 @@ decl_test_network! {
 			(1, ParaA),
 			(2, ParaB),
 			(3, ParaC),
-			(4, Statemint),
+			(1000, Statemint),
 		],
 	}
 }

runtime/moonbase/tests/xcm_mock/parachain.rs

@@ -50,11 +50,11 @@ use xcm::latest::{
 };
 use xcm_builder::{
 	AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom,
-	AllowTopLevelPaidExecutionFrom, ConvertedConcreteId, EnsureXcmOrigin, FixedRateOfFungible,
-	FixedWeightBounds, FungibleAdapter as XcmCurrencyAdapter, FungiblesAdapter, IsConcrete,
-	NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
-	SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation,
-	TakeWeightCredit, WithComputedOrigin,
+	AllowTopLevelPaidExecutionFrom, Case, ConvertedConcreteId, EnsureXcmOrigin,
+	FixedRateOfFungible, FixedWeightBounds, FungibleAdapter as XcmCurrencyAdapter,
+	FungiblesAdapter, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset,
+	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, WithComputedOrigin,
 };
 use xcm_executor::{traits::JustTry, Config, XcmExecutor};
 
@@ -330,6 +330,18 @@ parameter_types! {
 		].into()
 	};
 	pub const MaxAssetsIntoHolding: u32 = 64;
+
+	pub AssetHubLocation: Location = Location::new(1, [Parachain(1000)]);
+	pub const RelayLocation: Location = Location::parent();
+	pub RelayLocationFilter: AssetFilter = Wild(AllOf {
+		fun: WildFungible,
+		id: xcm::prelude::AssetId(RelayLocation::get()),
+	});
+
+	pub RelayChainNativeAssetFromAssetHub: (AssetFilter, Location) = (
+		RelayLocationFilter::get(),
+		AssetHubLocation::get()
+	);
 }
 
 use frame_system::RawOrigin;
@@ -338,15 +350,22 @@ use sp_runtime::DispatchErrorWithPostInfo;
 use xcm_executor::traits::CallDispatcher;
 moonbeam_runtime_common::impl_moonbeam_xcm_call!();
 
+type Reserves = (
+	// Relaychain (DOT) from Asset Hub
+	Case<RelayChainNativeAssetFromAssetHub>,
+	// Assets which the reserve is the same as the origin.
+	orml_xcm_support::MultiNativeAsset<
+		xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>,
+	>,
+);
+
 pub struct XcmConfig;
 impl Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
 	type XcmSender = XcmRouter;
 	type AssetTransactor = AssetTransactors;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	type IsReserve = orml_xcm_support::MultiNativeAsset<
-		xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>,
-	>;
+	type IsReserve = Reserves;
 	type IsTeleporter = ();
 	type UniversalLocation = UniversalLocation;
 	type Barrier = XcmBarrier;
@@ -430,7 +449,7 @@ parameter_types! {
 parameter_type_with_key! {
 	pub ParachainMinFee: |location: Location| -> Option<u128> {
 		match (location.parents, location.first_interior()) {
-			(1, Some(Parachain(4u32))) => Some(50u128),
+			(1, Some(Parachain(1000u32))) => Some(50u128),
 			_ => None,
 		}
 	};

runtime/moonbase/tests/xcm_mock/relay_chain.rs

@@ -177,7 +177,7 @@ pub type XcmBarrier = (
 
 parameter_types! {
 	pub Kusama: AssetFilter = Wild(AllOf { fun: WildFungible, id: AssetId(KsmLocation::get()) });
-	pub Statemine: Location = Parachain(4).into();
+	pub Statemine: Location = Parachain(1000).into();
 	pub KusamaForStatemine: (AssetFilter, Location) = (Kusama::get(), Statemine::get());
 }
 

runtime/moonbase/tests/xcm_mock/statemint_like.rs

@@ -18,19 +18,17 @@
 
 use frame_support::{
 	construct_runtime, parameter_types,
-	traits::{AsEnsureOriginWithArg, Contains, Everything, Nothing},
+	traits::{AsEnsureOriginWithArg, Contains, ContainsPair, Everything, Get, Nothing},
 	weights::Weight,
 };
 use frame_system::{EnsureRoot, EnsureSigned};
-
+use polkadot_core_primitives::BlockNumber as RelayBlockNumber;
 use sp_core::H256;
 use sp_runtime::{
 	traits::{ConstU32, Hash, IdentityLookup},
 	AccountId32,
 };
 
-use polkadot_core_primitives::BlockNumber as RelayBlockNumber;
-
 use polkadot_parachain::primitives::Id as ParaId;
 use polkadot_parachain::primitives::Sibling;
 use sp_std::convert::TryFrom;
@@ -290,8 +288,33 @@ pub type Barrier = (
 parameter_types! {
 	pub MatcherLocation: Location = Location::here();
 	pub const MaxAssetsIntoHolding: u32 = 64;
+	pub const RelayTokenLocation: Location = Location::parent();
 }
 
+// Copied from:
+//
+// https://github.com/paritytech/polkadot-sdk/blob/f4eb41773611008040c9d4d8a8e6b7323eccfca1/cumulus
+// /parachains/common/src/xcm_config.rs#L118
+//
+// The difference with the original "ConcreteAssetFromSystem" (which is used by AssetHub),
+// is that in our tests we only need to check if the asset matches the relay one.
+pub struct ConcreteAssetFromRelay<AssetLocation>(sp_std::marker::PhantomData<AssetLocation>);
+impl<AssetLocation: Get<Location>> ContainsPair<Asset, Location>
+	for ConcreteAssetFromRelay<AssetLocation>
+{
+	fn contains(asset: &Asset, origin: &Location) -> bool {
+		let is_relay = match origin.unpack() {
+			// The Relay Chain
+			(1, []) => true,
+			// Others
+			_ => false,
+		};
+		asset.id.0 == AssetLocation::get() && is_relay
+	}
+}
+
+pub type TrustedTeleporters = (ConcreteAssetFromRelay<RelayTokenLocation>,);
+
 pub struct XcmConfig;
 impl Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
@@ -300,7 +323,7 @@ impl Config for XcmConfig {
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
 	type IsReserve =
 		orml_xcm_support::MultiNativeAsset<orml_traits::location::RelativeReserveProvider>;
-	type IsTeleporter = ();
+	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;