Transfer asset via bridge with pallet xcm

parachains/common/src/xcm_config.rs

@@ -4,9 +4,11 @@ use frame_support::{
 	log,
 	traits::{fungibles::Inspect, tokens::ConversionToAssetBalance, ContainsPair},
 	weights::Weight,
+	DefaultNoBound,
 };
 use sp_runtime::traits::Get;
 use xcm::latest::prelude::*;
+use xcm_builder::ExporterFor;
 
 /// A `ChargeFeeInFungibles` implementation that converts the output of
 /// a given WeightToFee implementation an amount charged in
@@ -63,3 +65,141 @@ impl<Location: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation>
 		matches!(asset.id, Concrete(ref id) if id == origin && origin == &Location::get())
 	}
 }
+
+/// Trait for matching `Location`.
+pub trait MatchesLocation<Location> {
+	fn matches(&self, location: &Location) -> bool;
+}
+
+/// Simple `MultiLocation` filter utility.
+#[derive(Debug, DefaultNoBound)]
+pub struct LocationFilter<Location> {
+	/// Requested location equals to `Location`.
+	pub equals_any: sp_std::vec::Vec<Location>,
+	/// Requested location starts with `Location`.
+	pub starts_with_any: sp_std::vec::Vec<Location>,
+}
+
+impl<Location> LocationFilter<Location> {
+	pub fn add_equals(mut self, filter: Location) -> Self {
+		self.equals_any.push(filter);
+		self
+	}
+	pub fn add_starts_with(mut self, filter: Location) -> Self {
+		self.starts_with_any.push(filter);
+		self
+	}
+}
+
+/// `MatchesLocation` implementation which works with `MultiLocation`.
+impl MatchesLocation<MultiLocation> for LocationFilter<MultiLocation> {
+	fn matches(&self, location: &MultiLocation) -> bool {
+		for filter in &self.equals_any {
+			if location.eq(filter) {
+				return true
+			}
+		}
+		for filter in &self.starts_with_any {
+			if location.starts_with(filter) {
+				return true
+			}
+		}
+		false
+	}
+}
+
+/// `MatchesLocation` implementation which works with `InteriorMultiLocation`.
+impl MatchesLocation<InteriorMultiLocation> for LocationFilter<InteriorMultiLocation> {
+	fn matches(&self, location: &InteriorMultiLocation) -> bool {
+		for filter in &self.equals_any {
+			if location.eq(filter) {
+				return true
+			}
+		}
+		for filter in &self.starts_with_any {
+			if location.starts_with(filter) {
+				return true
+			}
+		}
+		false
+	}
+}
+
+/// `FilteredNetworkExportTable` is adapter for `ExporterFor` implementation
+/// which tries to find (`bridge_location`, `fees`) for requested `network` and `remote_location`.
+///
+/// Inspired by `xcm_builder::NetworkExportTable`:
+/// the main difference is that `NetworkExportTable` does not check `remote_location`.
+pub struct FilteredNetworkExportTable<T>(sp_std::marker::PhantomData<T>);
+impl<
+		T: Get<
+			sp_std::vec::Vec<(
+				NetworkId,
+				LocationFilter<InteriorMultiLocation>,
+				MultiLocation,
+				Option<MultiAsset>,
+			)>,
+		>,
+	> ExporterFor for FilteredNetworkExportTable<T>
+{
+	fn exporter_for(
+		network: &NetworkId,
+		remote_location: &InteriorMultiLocation,
+		_: &Xcm<()>,
+	) -> Option<(MultiLocation, Option<MultiAsset>)> {
+		T::get()
+			.into_iter()
+			.find(|(ref j, location_filter, ..)| {
+				j == network && location_filter.matches(remote_location)
+			})
+			.map(|(_, _, bridge_location, p)| (bridge_location, p))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn filtered_network_export_table_works() {
+		frame_support::parameter_types! {
+			pub BridgeLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1234)));
+
+			pub BridgeTable: sp_std::vec::Vec<(NetworkId, LocationFilter<InteriorMultiLocation>, MultiLocation, Option<MultiAsset>)> = sp_std::vec![
+				(
+					Kusama,
+					LocationFilter::default()
+						.add_equals(X1(Parachain(2000)))
+						.add_equals(X1(Parachain(3000)))
+						.add_equals(X1(Parachain(4000))),
+					BridgeLocation::get(),
+					None
+				)
+			];
+		}
+
+		let test_data = vec![
+			(Polkadot, X1(Parachain(1000)), None),
+			(Polkadot, X1(Parachain(2000)), None),
+			(Polkadot, X1(Parachain(3000)), None),
+			(Polkadot, X1(Parachain(4000)), None),
+			(Polkadot, X1(Parachain(5000)), None),
+			(Kusama, X1(Parachain(1000)), None),
+			(Kusama, X1(Parachain(2000)), Some((BridgeLocation::get(), None))),
+			(Kusama, X1(Parachain(3000)), Some((BridgeLocation::get(), None))),
+			(Kusama, X1(Parachain(4000)), Some((BridgeLocation::get(), None))),
+			(Kusama, X1(Parachain(5000)), None),
+		];
+
+		for (network, remote_location, expected_result) in test_data {
+			assert_eq!(
+				FilteredNetworkExportTable::<BridgeTable>::exporter_for(
+					&network,
+					&remote_location,
+					&Xcm::default()
+				),
+				expected_result,
+			)
+		}
+	}
+}

parachains/pallets/ping/Cargo.toml

@@ -36,4 +36,4 @@ try-runtime = [
 	"frame-support/try-runtime",
 	"cumulus-pallet-xcm/try-runtime",
 	"sp-runtime/try-runtime"
-]
+]

parachains/runtimes/assets/asset-hub-kusama/src/lib.rs

@@ -1169,7 +1169,10 @@ impl_runtime_apis! {
 				}
 
 				fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
-					Err(BenchmarkError::Skip)
+					match xcm_config::bridging::BridgingBenchmarksHelper::prepare_universal_alias() {
+						Some(alias) => Ok(alias),
+						None => Err(BenchmarkError::Skip)
+					}
 				}
 
 				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {

parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs

@@ -220,7 +220,7 @@ impl<Call> XcmWeightInfo<Call> for AssetHubKusamaXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_transact_status()
 	}
 	fn universal_origin(_: &Junction) -> Weight {
-		Weight::MAX
+		XcmGeneric::<Runtime>::universal_origin()
 	}
 	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
 		Weight::MAX

parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs

@@ -17,7 +17,7 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-07-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024
@@ -54,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_371_000 picoseconds.
-		Weight::from_parts(27_398_000, 3593)
+		// Minimum execution time: 25_626_000 picoseconds.
+		Weight::from_parts(26_227_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -65,8 +65,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `6196`
-		// Minimum execution time: 52_248_000 picoseconds.
-		Weight::from_parts(54_424_000, 6196)
+		// Minimum execution time: 52_510_000 picoseconds.
+		Weight::from_parts(53_139_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -88,8 +88,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `210`
 		//  Estimated: `6196`
-		// Minimum execution time: 76_817_000 picoseconds.
-		Weight::from_parts(78_750_000, 6196)
+		// Minimum execution time: 76_057_000 picoseconds.
+		Weight::from_parts(77_470_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -118,26 +118,26 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 474_937_000 picoseconds.
-		Weight::from_parts(483_577_000, 3574)
+		// Minimum execution time: 455_003_000 picoseconds.
+		Weight::from_parts(471_506_000, 3574)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	pub fn receive_teleported_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_986_000 picoseconds.
-		Weight::from_parts(4_088_000, 0)
+		// Minimum execution time: 3_573_000 picoseconds.
+		Weight::from_parts(3_730_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	pub fn deposit_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 27_152_000 picoseconds.
-		Weight::from_parts(27_954_000, 3593)
+		// Minimum execution time: 25_997_000 picoseconds.
+		Weight::from_parts(26_757_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -159,8 +159,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3593`
-		// Minimum execution time: 54_098_000 picoseconds.
-		Weight::from_parts(55_731_000, 3593)
+		// Minimum execution time: 52_111_000 picoseconds.
+		Weight::from_parts(53_381_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -180,8 +180,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 33_434_000 picoseconds.
-		Weight::from_parts(34_367_000, 3574)
+		// Minimum execution time: 31_805_000 picoseconds.
+		Weight::from_parts(32_627_000, 3574)
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}