Added Trusted Query API calls

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

@@ -103,7 +103,7 @@ use xcm::latest::prelude::{
 };
 use xcm::{
 	latest::prelude::{AssetId, BodyId},
-	VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm,
+	VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm,
 };
 use xcm_runtime_apis::{
 	dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
@@ -1780,6 +1780,15 @@ impl_runtime_apis! {
 			genesis_config_presets::preset_names()
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -93,7 +93,7 @@ use assets_common::{
 use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 use xcm::{
 	latest::prelude::AssetId,
-	prelude::{VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm},
+	prelude::{VersionedAsset, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm},
 };
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -1876,6 +1876,15 @@ impl_runtime_apis! {
 			genesis_config_presets::preset_names()
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -1520,6 +1520,15 @@ impl_runtime_apis! {
 			genesis_config_presets::preset_names()
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 #[cfg(test)]

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs

@@ -1336,6 +1336,15 @@ impl_runtime_apis! {
 			genesis_config_presets::preset_names()
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs

@@ -1164,6 +1164,15 @@ impl_runtime_apis! {
 			genesis_config_presets::preset_names()
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs

@@ -878,6 +878,15 @@ impl_runtime_apis! {
 			vec![]
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs

@@ -1147,6 +1147,15 @@ impl_runtime_apis! {
 			vec![]
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs

@@ -1139,6 +1139,15 @@ impl_runtime_apis! {
 			vec![]
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/parachains/runtimes/people/people-rococo/src/lib.rs

@@ -1058,6 +1058,15 @@ impl_runtime_apis! {
 			vec![]
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

cumulus/parachains/runtimes/people/people-westend/src/lib.rs

@@ -1057,6 +1057,15 @@ impl_runtime_apis! {
 			vec![]
 		}
 	}
+
+	impl xcm_runtime_apis::trust_query::TrustedQueryApi<Block> for Runtime {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_reserve(asset, location)
+		}
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trust_query::Error> {
+			PolkadotXcm::is_trusted_teleporter(asset, location)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {

polkadot/xcm/pallet-xcm/src/lib.rs

@@ -70,6 +70,7 @@ use xcm_executor::{
 use xcm_runtime_apis::{
 	dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
 	fees::Error as XcmPaymentApiError,
+	trust_query::Error as TrustQueryApiError,
 };
 
 #[cfg(any(feature = "try-runtime", test))]
@@ -2569,6 +2570,54 @@ impl<T: Config> Pallet<T> {
 		})
 	}
 
+	pub fn is_trusted_reserve(
+		asset: VersionedAsset,
+		location: VersionedLocation,
+	) -> Result<bool, TrustQueryApiError> {
+		let location: Location = location.try_into().map_err(|e| {
+			log::error!(
+				target: "xcm::TrustedQueryApi::is_trusted_reserve",
+				"Asset version conversion failed with error: {:?}",
+				e,
+			);
+			TrustQueryApiError::VersionedLocationConversionFailed
+		})?;
+
+		let ass: Asset = asset.try_into().map_err(|e| {
+			log::error!(
+				target: "xcm::TrustedQueryApi::is_trusted_reserve",
+				"Location version conversion failed with error: {:?}",
+				e,
+			);
+			TrustQueryApiError::VersionedAssetConversionFailed
+		})?;
+
+		Ok(<T::XcmExecutor as XcmAssetTransfers>::IsReserve::contains(&ass, &location))
+	}
+
+	pub fn is_trusted_teleporter(
+		asset: VersionedAsset,
+		location: VersionedLocation,
+	) -> Result<bool, TrustQueryApiError> {
+		let location: Location = location.try_into().map_err(|e| {
+			log::error!(
+				target: "xcm::TrustedQueryApi::is_trusted_teleporter",
+				"Asset version conversion failed with error: {:?}",
+				e,
+			);
+			TrustQueryApiError::VersionedLocationConversionFailed
+		})?;
+		let ass: Asset = asset.try_into().map_err(|e| {
+			log::error!(
+				target: "xcm::TrustedQueryApi::is_trusted_teleporter",
+				"Location version conversion failed with error: {:?}",
+				e,
+			);
+			TrustQueryApiError::VersionedAssetConversionFailed
+		})?;
+		Ok(<T::XcmExecutor as XcmAssetTransfers>::IsTeleporter::contains(&ass, &location))
+	}
+
 	pub fn query_delivery_fees(
 		destination: VersionedLocation,
 		message: VersionedXcm<()>,

polkadot/xcm/xcm-runtime-apis/src/lib.rs

@@ -30,3 +30,6 @@ pub mod dry_run;
 /// Fee estimation API.
 /// Given an XCM program, it will return the fees needed to execute it properly or send it.
 pub mod fees;
+
+// Exposes runtime API for querying trusted reservers and teleporters.
+pub mod trust_query;

polkadot/xcm/xcm-runtime-apis/src/trust_query.rs

@@ -0,0 +1,38 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot 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.
+
+// Polkadot 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 Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Runtime API definition for getting XCM fees.
+
+use codec::{Decode, Encode};
+use frame_support::pallet_prelude::TypeInfo;
+use xcm::{VersionedAsset, VersionedLocation};
+
+sp_api::decl_runtime_apis! {
+	pub trait TrustedQueryApi {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, Error>;
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, Error>;
+	}
+}
+
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, Debug, TypeInfo)]
+pub enum Error {
+	/// Converting a versioned Asset structure from one version to another failed.
+	#[codec(index = 1)]
+	VersionedAssetConversionFailed,
+	/// Converting a versioned Location structure from one version to another failed.
+	#[codec(index = 1)]
+	VersionedLocationConversionFailed,
+}

polkadot/xcm/xcm-runtime-apis/tests/mock.rs

@@ -48,6 +48,7 @@ use xcm_runtime_apis::{
 	conversions::{Error as LocationToAccountApiError, LocationToAccountApi},
 	dry_run::{CallDryRunEffects, DryRunApi, Error as XcmDryRunApiError, XcmDryRunEffects},
 	fees::{Error as XcmPaymentApiError, XcmPaymentApi},
+	trust_query::{Error as TrustedQueryApiError, TrustedQueryApi},
 };
 
 construct_runtime! {
@@ -414,6 +415,17 @@ impl sp_api::ProvideRuntimeApi<Block> for TestClient {
 }
 
 sp_api::mock_impl_runtime_apis! {
+
+	impl TrustedQueryApi<Block> for RuntimeApi {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, TrustedQueryApiError> {
+			XcmPallet::is_trusted_reserve(asset, location)
+		}
+
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, TrustedQueryApiError> {
+			XcmPallet::is_trusted_teleporter(asset, location)
+		}
+	}
+
 	impl LocationToAccountApi<Block, AccountId> for RuntimeApi {
 		fn convert_location(location: VersionedLocation) -> Result<AccountId, LocationToAccountApiError> {
 			let location = location.try_into().map_err(|_| LocationToAccountApiError::VersionedConversionFailed)?;