Merge pull request #14 from paritytech/xcm-improvements

Improve XCm configuration for mainnet

primitives/xcm/src/lib.rs

@@ -3,7 +3,7 @@
 use frame_support::traits::{Get, OriginTrait};
 use xcm::latest::prelude::*;
 
-// Convert a local Origin (i.e., a signed 20 byte account Origin) to a Multilocation
+// Convert a local Origin (i.e., a signed 20 byte account Origin) to a Location
 pub struct SignedToAccountId20<Origin, AccountId, Network>(
 	sp_std::marker::PhantomData<(Origin, AccountId, Network)>,
 );

runtime/mainnet/src/lib.rs

@@ -62,6 +62,7 @@ use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
 // XCM Imports
 
+use crate::xcm_config::SelfReserve;
 use xcm::latest::prelude::BodyId;
 
 /// The address format for describing accounts.
@@ -440,7 +441,7 @@ impl pallet_message_queue::Config for Runtime {
 
 parameter_types! {
 	/// The asset ID for the asset that we use to pay for message delivery fees.
-	pub FeeAssetId: AssetId = AssetId(xcm_config::RelayLocation::get());
+	pub FeeAssetId: AssetId = AssetId(SelfReserve::get());
 	/// The base fee for the message delivery fees.
 	pub const BaseDeliveryFee: Balance = 300_000_000;
 	/// The fee per byte
@@ -457,7 +458,7 @@ pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender:
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ChannelInfo = ParachainSystem;
-	type VersionWrapper = ();
+	type VersionWrapper = PolkadotXcm;
 	// Enqueue XCMP messages from siblings for later processing.
 	type XcmpQueue = frame_support::traits::TransformOrigin<
 		MessageQueue,

runtime/mainnet/src/xcm_config.rs

@@ -10,36 +10,34 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use polkadot_parachain_primitives::primitives::Sibling;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountKey20Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom,
-	CreateMatcher, EnsureXcmOrigin, FixedWeightBounds, FrameTransactionalProcessor, MatchXcm,
-	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
-	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, WithComputedOrigin,
-	WithUniqueTopic,
+	CreateMatcher, DescribeFamily, DescribeTerminus, EnsureXcmOrigin, FixedWeightBounds,
+	FrameTransactionalProcessor, HashedDescription, MatchXcm, RelayChainAsNative,
+	SiblingParachainAsNative, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
+	WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::traits::Properties;
 use xcm_executor::{traits::ShouldExecute, XcmExecutor};
 use xcm_primitives::SignedToAccountId20;
 
 parameter_types! {
 	pub const RelayLocation: Location = Location::parent();
-	pub const RelayNetwork: NetworkId = cumulus_primitives_core::Ethereum { chain_id: 132 }; // todo!();
-	pub SelfReserve: Location = Location { parents: 0, interior: Here };
-	pub PlaceholderAccount: AccountId = PolkadotXcm::check_account();
+	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
+	pub SelfReserve: Location = Location::here();
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub UniversalLocation: InteriorLocation = (GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into())).into();
+	pub UniversalLocation: InteriorLocation =
+		[GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into())].into();
 }
 
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
 pub type LocationToAccountId = (
 	// The parent (Relay-chain) origin converts to the parent `AccountId`.
-	ParentIsPreset<AccountId>,
 	// Sibling parachain origins convert to AccountId via the `ParaId::into`.
-	SiblingParachainConvertsVia<Sibling, AccountId>,
+	HashedDescription<AccountId, DescribeFamily<DescribeTerminus>>,
 	// If we receive a Location of type AccountKey20, just generate a native account
 	AccountKey20Aliases<RelayNetwork, AccountId>,
 );
@@ -201,7 +199,7 @@ pub type LocalOriginToLocation = SignedToAccountId20<RuntimeOrigin, AccountId, R
 /// queues.
 pub type XcmRouter = WithUniqueTopic<(
 	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, (), ()>,
+	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
 	// and XCMP to communicate with the sibling chains.
 	XcmpQueue,
 )>;