Add XCM Precompile to pallet-xcm

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

@@ -399,4 +399,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

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

@@ -64,7 +64,7 @@ use pallet_asset_conversion_tx_payment::SwapAssetAdapter;
 use pallet_assets::precompiles::{InlineIdConfig, ERC20};
 use pallet_nfts::{DestroyWitness, PalletFeatures};
 use pallet_revive::evm::runtime::EthExtra;
-use pallet_xcm::EnsureXcm;
+use pallet_xcm::{precompiles::XcmPrecompile, EnsureXcm};
 use parachains_common::{
 	impls::DealWithFees, message_queue::*, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
 	BlockNumber, CollectionId, Hash, Header, ItemId, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
@@ -1080,6 +1080,7 @@ impl pallet_revive::Config for Runtime {
 	type Precompiles = (
 		ERC20<Self, InlineIdConfig<0x120>, TrustBackedAssetsInstance>,
 		ERC20<Self, InlineIdConfig<0x320>, PoolAssetsInstance>,
+		XcmPrecompile<Self>,
 	);
 	type AddressMapper = pallet_revive::AccountId32Mapper<Self>;
 	type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;

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

@@ -373,4 +373,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

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

@@ -373,4 +373,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_xcm.rs

@@ -375,4 +375,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/pallet_xcm.rs

@@ -363,4 +363,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/pallet_xcm.rs

@@ -363,4 +363,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

cumulus/parachains/runtimes/people/people-rococo/src/weights/pallet_xcm.rs

@@ -351,4 +351,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

cumulus/parachains/runtimes/people/people-westend/src/weights/pallet_xcm.rs

@@ -359,4 +359,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

polkadot/runtime/rococo/src/weights/pallet_xcm.rs

@@ -394,4 +394,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

polkadot/runtime/westend/src/weights/pallet_xcm.rs

@@ -394,4 +394,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+
+	fn weigh_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 7_785_000 picoseconds.
+		Weight::from_parts(8_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
 }

polkadot/xcm/pallet-xcm/Cargo.toml

@@ -20,10 +20,12 @@ tracing = { workspace = true }
 
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+pallet-revive = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
+pallet-timestamp = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
@@ -49,6 +51,8 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-balances/std",
+	"pallet-revive/std",
+	"pallet-timestamp/std",
 	"scale-info/std",
 	"serde",
 	"sp-core/std",
@@ -66,6 +70,8 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-revive/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -80,6 +86,8 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-revive/try-runtime",
+	"pallet-timestamp/try-runtime",
 	"polkadot-runtime-parachains/try-runtime",
 	"sp-runtime/try-runtime",
 ]

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

@@ -18,7 +18,7 @@ use super::*;
 use frame_benchmarking::v2::*;
 use frame_support::{assert_ok, weights::Weight};
 use frame_system::RawOrigin;
-use xcm::latest::prelude::*;
+use xcm::{latest::prelude::*, MAX_INSTRUCTIONS_TO_DECODE};
 use xcm_builder::EnsureDelivery;
 use xcm_executor::traits::FeeReason;
 
@@ -680,6 +680,20 @@ mod benchmarks {
 		Ok(())
 	}
 
+	#[benchmark]
+	fn weigh_message() -> Result<(), BenchmarkError> {
+		let msg = Xcm(vec![ClearOrigin; MAX_INSTRUCTIONS_TO_DECODE.into()]);
+		let versioned_msg = VersionedXcm::from(msg);
+
+		#[block]
+		{
+			crate::Pallet::<T>::query_xcm_weight(versioned_msg)
+				.map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
+		}
+
+		Ok(())
+	}
+
 	impl_benchmark_test_suite!(
 		Pallet,
 		crate::mock::new_test_ext_with_balances(Vec::new()),

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

@@ -22,6 +22,7 @@
 pub mod benchmarking;
 #[cfg(test)]
 mod mock;
+pub mod precompiles;
 #[cfg(test)]
 mod tests;
 
@@ -107,6 +108,8 @@ pub trait WeightInfo {
 	fn claim_assets() -> Weight;
 	fn add_authorized_alias() -> Weight;
 	fn remove_authorized_alias() -> Weight;
+
+	fn weigh_message() -> Weight;
 }
 
 /// fallback implementation
@@ -199,6 +202,10 @@ impl WeightInfo for TestWeightInfo {
 	fn remove_authorized_alias() -> Weight {
 		Weight::from_parts(100_000, 0)
 	}
+
+	fn weigh_message() -> Weight {
+		Weight::from_parts(100_000, 0)
+	}
 }
 
 #[derive(Clone, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]

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

@@ -47,7 +47,8 @@ use xcm_executor::{
 };
 use xcm_simulator::helpers::derive_topic_id;
 
-use crate::{self as pallet_xcm, TestWeightInfo};
+use crate::{self as pallet_xcm, precompiles::XcmPrecompile, TestWeightInfo};
+use pallet_timestamp;
 
 pub type AccountId = AccountId32;
 pub type Balance = u128;
@@ -139,6 +140,17 @@ pub mod pallet_test_notifier {
 	}
 }
 
+parameter_types! {
+	pub const MinimumPeriod: u64 = 1;
+}
+
+impl pallet_timestamp::Config for Test {
+	type Moment = u64;
+	type OnTimestampSet = ();
+	type MinimumPeriod = MinimumPeriod;
+	type WeightInfo = ();
+}
+
 construct_runtime!(
 	pub enum Test
 	{
@@ -148,6 +160,8 @@ construct_runtime!(
 		ParasOrigin: origin,
 		XcmPallet: pallet_xcm,
 		TestNotifier: pallet_test_notifier,
+		Revive: pallet_revive,
+		Timestamp: pallet_timestamp,
 	}
 );
 
@@ -320,6 +334,16 @@ impl pallet_assets::Config for Test {
 	type BenchmarkHelper = XcmBenchmarkHelper;
 }
 
+#[derive_impl(pallet_revive::config_preludes::TestDefaultConfig)]
+impl pallet_revive::Config for Test {
+	type AddressMapper = pallet_revive::AccountId32Mapper<Self>;
+	type Currency = Balances;
+	type Precompiles = (XcmPrecompile<Self>,);
+	type Time = Timestamp;
+	type UploadOrigin = frame_system::EnsureSigned<AccountId>;
+	type InstantiateOrigin = frame_system::EnsureSigned<AccountId>;
+}
+
 // This child parachain is a system parachain trusted to teleport native token.
 pub const SOME_SYSTEM_PARA: u32 = 1001;
 
@@ -717,6 +741,8 @@ pub(crate) fn buy_limited_execution<C>(
 	BuyExecution { fees: fees.into(), weight_limit }
 }
 
+pub const ALICE: AccountId32 = AccountId::new([0u8; 32]);
+
 pub(crate) fn new_test_ext_with_balances(
 	balances: Vec<(AccountId, Balance)>,
 ) -> sp_io::TestExternalities {
@@ -741,6 +767,10 @@ pub(crate) fn new_test_ext_with_balances_and_xcm_version(
 		.assimilate_storage(&mut t)
 		.unwrap();
 
+	pallet_revive::GenesisConfig::<Test> { mapped_accounts: vec![ALICE] }
+		.assimilate_storage(&mut t)
+		.unwrap();
+
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext