Fix XCM related

Cargo.toml

@@ -78,6 +78,7 @@ moonbeam-rpc-primitives-debug           = { git = "https://github.com/darwinia-n
 moonbeam-rpc-trace                      = { git = "https://github.com/darwinia-network/moonbeam", branch = "stable2407" }
 pallet-asset-manager                    = { git = "https://github.com/darwinia-network/moonbeam", branch = "stable2407", default-features = false }
 pallet-evm-precompile-conviction-voting = { git = "https://github.com/darwinia-network/moonbeam", branch = "stable2407", default-features = false }
+pallet-xcm-weight-trader                = { git = "https://github.com/darwinia-network/moonbeam", branch = "stable2407", default-features = false }
 xcm-primitives                          = { git = "https://github.com/darwinia-network/moonbeam", branch = "stable2407", default-features = false }
 
 # open-web3-stack

runtime/koi/Cargo.toml

@@ -45,14 +45,14 @@ pallet-evm-precompile-simple   = { workspace = true }
 moonbeam-rpc-primitives-debug           = { workspace = true }
 pallet-asset-manager                    = { workspace = true }
 pallet-evm-precompile-conviction-voting = { workspace = true }
+pallet-xcm-weight-trader                = { workspace = true }
 precompile-utils                        = { workspace = true }
 xcm-primitives                          = { workspace = true }
 # moonbeam optional
 moonbeam-evm-tracer = { workspace = true, optional = true }
 
 # open-web3-stack
 orml-xcm-support = { workspace = true }
-orml-xtokens     = { workspace = true }
 
 # polkadot-sdk
 cumulus-pallet-aura-ext                    = { workspace = true }
@@ -159,14 +159,14 @@ std = [
 	"moonbeam-rpc-primitives-debug/std",
 	"pallet-asset-manager/std",
 	"pallet-evm-precompile-conviction-voting/std",
+	"pallet-xcm-weight-trader/std",
 	"precompile-utils/std",
 	"xcm-primitives/std",
 	# moonbeam optional
 	"moonbeam-evm-tracer?/std",
 
 	# open-web3-stack
 	"orml-xcm-support/std",
-	"orml-xtokens/std",
 
 	# polkadot-sdk
 	"cumulus-pallet-aura-ext/std",
@@ -245,11 +245,9 @@ runtime-benchmarks = [
 
 	# moonbeam
 	"pallet-asset-manager/runtime-benchmarks",
+	"pallet-xcm-weight-trader/runtime-benchmarks",
 	"xcm-primitives/runtime-benchmarks",
 
-	# open-web3-stack
-	"orml-xtokens/runtime-benchmarks",
-
 	# polkadot-sdk
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
@@ -294,9 +292,6 @@ try-runtime = [
 	# moonbeam
 	"pallet-asset-manager/try-runtime",
 
-	# open-web3-stack
-	"orml-xtokens/try-runtime",
-
 	# frontier
 	"fp-self-contained/try-runtime",
 	"pallet-ethereum/try-runtime",

runtime/koi/src/lib.rs

@@ -180,7 +180,7 @@ mod runtime {
 	#[runtime::pallet_index(26)]
 	pub type XcmpQueue = cumulus_pallet_xcmp_queue;
 	#[runtime::pallet_index(27)]
-	pub type XcmPallet = pallet_xcm;
+	pub type PolkadotXcm = pallet_xcm;
 	#[runtime::pallet_index(28)]
 	pub type CumulusXcm = cumulus_pallet_xcm;
 	// #[runtime::pallet_index(29)]
@@ -191,10 +191,11 @@ mod runtime {
 	pub type MessageQueue = pallet_message_queue;
 	#[runtime::pallet_index(31)]
 	pub type AssetManager = pallet_asset_manager;
-	#[runtime::pallet_index(32)]
-	pub type XTokens = orml_xtokens;
+	// Previously 32: XTokens
 	#[runtime::pallet_index(33)]
 	pub type AssetLimit = darwinia_asset_limit;
+	#[runtime::pallet_index(38)]
+	pub type XcmWeightTrader = pallet_xcm_weight_trader;
 
 	// EVM stuff.
 	#[runtime::pallet_index(34)]
@@ -403,30 +404,11 @@ sp_api::impl_runtime_apis! {
 
 	impl xcm_runtime_apis::fees::XcmPaymentApi<Block> for Runtime {
 		fn query_acceptable_payment_assets(xcm_version: xcm::Version) -> Result<Vec<xcm::VersionedAssetId>, xcm_runtime_apis::fees::Error> {
-			let acceptable_assets = vec![xcm::latest::AssetId(RelayLocation::get())];
-
-			PolkadotXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
+			XcmWeightTrader::query_acceptable_payment_assets(xcm_version)
 		}
 
 		fn query_weight_to_asset_fee(weight: frame_support::weights::Weight, asset: xcm::VersionedAssetId) -> Result<u128, xcm_runtime_apis::fees::Error> {
-			// polkadot-sdk
-			use frame_support::weights::WeightToFee as _;
-
-			match asset.try_as::<xcm::latest::AssetId>() {
-				Ok(asset_id) if asset_id.0 == RelayLocation::get() => {
-					Ok(WeightToFee::weight_to_fee(&weight))
-				},
-				Ok(asset_id) => {
-					log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - unhandled asset_id: {asset_id:?}!");
-
-					Err(xcm_runtime_apis::fees::Error::AssetNotFound)
-				},
-				Err(_) => {
-					log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - failed to convert asset: {asset:?}!");
-
-					Err(xcm_runtime_apis::fees::Error::VersionedConversionFailed)
-				}
-			}
+			XcmWeightTrader::query_weight_to_asset_fee(weight, asset)
 		}
 
 		fn query_xcm_weight(message: xcm::VersionedXcm<()>) -> Result<frame_support::weights::Weight, xcm_runtime_apis::fees::Error> {

runtime/koi/src/pallets.rs

@@ -82,11 +82,10 @@ mod message_queue;
 mod asset_manager;
 pub use asset_manager::*;
 
-mod orml_xtokens;
-pub use orml_xtokens::*;
-
 mod asset_limit;
 
+mod xcm_weight_trader;
+
 // EVM stuff.
 mod ethereum;
 

runtime/koi/src/pallets/polkadot_xcm.rs

@@ -137,22 +137,6 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<(
 	xcm_builder::AllowKnownQueryResponses<PolkadotXcm>,
 )>;
 
-/// This is the struct that will handle the revenue from xcm fees
-/// We do not burn anything because we want to mimic exactly what
-/// the sovereign account has
-pub type XcmFeesToAccount = xcm_primitives::XcmFeesToAccount<
-	Assets,
-	(
-		xcm_builder::ConvertedConcreteId<
-			AssetId,
-			Balance,
-			xcm_primitives::AsAssetType<AssetId, AssetType, AssetManager>,
-			xcm_executor::traits::JustTry,
-		>,
-	),
-	AccountId,
-	XcmFeesAccount,
->;
 pub type XcmWeigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
 pub type LocalOriginToLocation =
@@ -166,6 +150,38 @@ pub type XcmRouter = xcm_builder::WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
+frame_support::parameter_types! {
+	/// Location of Asset Hub
+   pub AssetHubLocation: Location = Location::new(1, [Parachain(1000)]);
+   pub RelayLocationFilter: AssetFilter = Wild(AllOf {
+	   fun: WildFungible,
+	   id: xcm::prelude::AssetId(RelayLocation::get()),
+   });
+   pub RelayChainNativeAssetFromAssetHub: (AssetFilter, Location) = (
+	   RelayLocationFilter::get(),
+	   AssetHubLocation::get()
+   );
+   // We need this to be able to catch when someone is trying to execute a non-
+   // cross-chain transfer in xtokens through the absolute path way
+   pub SelfLocationAbsolute: Location = Location {
+		parents:1,
+		interior: [
+			Parachain(ParachainInfo::parachain_id().into())
+		].into()
+	};
+}
+
+type Reserves = (
+	// Assets bridged from different consensus systems held in reserve on Asset Hub.
+	xcm_primitives::IsBridgedConcreteAssetFrom<AssetHubLocation>,
+	// Relaychain (DOT) from Asset Hub
+	xcm_builder::Case<RelayChainNativeAssetFromAssetHub>,
+	// Assets which the reserve is the same as the origin.
+	xcm_primitives::MultiNativeAsset<
+		xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>,
+	>,
+);
+
 pub struct XcmExecutorConfig;
 impl xcm_executor::Config for XcmExecutorConfig {
 	type Aliasers = frame_support::traits::Nothing;
@@ -181,9 +197,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type HrmpChannelAcceptedHandler = ();
 	type HrmpChannelClosingHandler = ();
 	type HrmpNewChannelOpenRequestHandler = ();
-	type IsReserve = orml_xcm_support::MultiNativeAsset<
-		xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>,
-	>;
+	type IsReserve = Reserves;
 	type IsTeleporter = ();
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 	type MessageExporter = ();
@@ -193,16 +207,11 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type RuntimeCall = RuntimeCall;
 	type SafeCallFilter = frame_support::traits::Everything;
 	type SubscriptionService = PolkadotXcm;
-	type Trader = (
-		xcm_builder::UsingComponents<
-			<Runtime as pallet_transaction_payment::Config>::WeightToFee,
-			SelfReserve,
-			AccountId,
-			Balances,
-			DealWithFees<Runtime>,
-		>,
-		xcm_primitives::FirstAssetTrader<AssetType, AssetManager, XcmFeesToAccount>,
-	);
+	// As trader we use the XcmWeightTrader pallet.
+	// For each foreign asset, the fee is computed based on its relative price (also
+	// stored in the XcmWeightTrader pallet) against the native asset.
+	// For the native asset fee is computed using WeightToFee implementation.
+	type Trader = pallet_xcm_weight_trader::Trader<Runtime>;
 	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
 	type UniversalAliases = frame_support::traits::Nothing;
 	// Teleporting is disabled.

runtime/koi/src/pallets/xcm_weight_trader.rs

@@ -0,0 +1,39 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+// darwinia
+use crate::*;
+
+impl pallet_xcm_weight_trader::Config for Runtime {
+	type AccountIdToLocation = xcm_primitives::AccountIdToLocation<AccountId>;
+	type AddSupportedAssetOrigin = Root;
+	type AssetLocationFilter = frame_support::traits::Everything;
+	type AssetTransactor = AssetTransactors;
+	type Balance = Balance;
+	type EditSupportedAssetOrigin = Root;
+	type NativeLocation = SelfReserve;
+	#[cfg(feature = "runtime-benchmarks")]
+	type NotFilteredLocation = RelayLocation;
+	type PauseSupportedAssetOrigin = Root;
+	type RemoveSupportedAssetOrigin = Root;
+	type ResumeSupportedAssetOrigin = Root;
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_xcm_weight_trader::WeightInfo<Runtime>;
+	type WeightToFee = <Runtime as pallet_transaction_payment::Config>::WeightToFee;
+	type XcmFeesAccount = XcmFeesAccount;
+}

runtime/koi/src/weights.rs

@@ -41,3 +41,4 @@ pub mod pallet_treasury;
 pub mod pallet_tx_pause;
 pub mod pallet_utility;
 pub mod pallet_whitelist;
+pub mod pallet_xcm_weight_trader;

runtime/koi/src/weights/pallet_asset_manager.rs

@@ -95,4 +95,21 @@ impl<T: frame_system::Config> pallet_asset_manager::WeightInfo for WeightInfo<T>
 			.saturating_add(T::DbWeight::get().writes(6))
 			.saturating_add(Weight::from_parts(0, 14))
 	}
+	/// Storage: `AssetManager::AssetIdType` (r:1 w:1)
+	/// Proof: `AssetManager::AssetIdType` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeId` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn remove_existing_asset_type() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `447 + x * (4 ±0)`
+		//  Estimated: `3909 + x * (5 ±0)`
+		// Minimum execution time: 14_047_000 picoseconds.
+		Weight::from_parts(15_828_607, 3909)
+			// Standard Error: 1_451
+			.saturating_add(Weight::from_parts(74_700, 0))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+			.saturating_add(Weight::from_parts(0, 5))
+	}
 }