Allow explicit unpaid executions from the relay chains for system parachains

parachains/runtimes/assets/statemine/src/xcm_config.rs

@@ -39,6 +39,7 @@ use xcm_builder::{
 	NativeAsset, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
 	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WeightInfoBounds,
+	WithComputedOrigin,
 };
 use xcm_executor::{
 	traits::{JustTry, WithOriginFilter},
@@ -134,12 +135,15 @@ pub type XcmOriginToTransactDispatchOrigin = (
 parameter_types! {
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAssetsIntoHolding: u32 = 64;
+	pub const MaxPrefixes: u32 = 8;
 	pub XcmAssetFeesReceiver: Option<AccountId> = Authorship::author();
 }
 
 match_types! {
-	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
+	pub type ParentLocation: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here }
+	};
+	pub type ParentsExecutivePlurality: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
 	};
 	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
@@ -251,11 +255,20 @@ pub type Barrier = DenyThenTry<
 		TakeWeightCredit,
 		AllowTopLevelPaidExecutionFrom<Everything>,
 		// Parent and its exec plurality get free execution
-		AllowExplicitUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
+		AllowExplicitUnpaidExecutionFrom<ParentLocation>,
 		// Expected responses are OK.
 		AllowKnownQueryResponses<PolkadotXcm>,
 		// Subscriptions for version tracking are OK.
 		AllowSubscriptionsFrom<ParentOrSiblings>,
+		// Allow XCMs with some computed origins to pass through.
+		WithComputedOrigin<
+			(
+				// Parent's executive plurality (i.e. governance) gets free execution.
+				AllowExplicitUnpaidExecutionFrom<ParentsExecutivePlurality>,
+			),
+			UniversalLocation,
+			MaxPrefixes,
+		>,
 	),
 >;
 

parachains/runtimes/assets/statemint/src/xcm_config.rs

@@ -39,6 +39,7 @@ use xcm_builder::{
 	NativeAsset, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
 	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WeightInfoBounds,
+	WithComputedOrigin,
 };
 use xcm_executor::{
 	traits::{JustTry, WithOriginFilter},
@@ -138,8 +139,10 @@ parameter_types! {
 }
 
 match_types! {
-	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
+	pub type ParentLocation: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here }
+	};
+	pub type ParentsExecutivePlurality: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
 	};
 	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
@@ -251,11 +254,20 @@ pub type Barrier = DenyThenTry<
 		TakeWeightCredit,
 		AllowTopLevelPaidExecutionFrom<Everything>,
 		// Parent and its exec plurality get free execution
-		AllowExplicitUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
+		AllowExplicitUnpaidExecutionFrom<ParentLocation>,
 		// Expected responses are OK.
 		AllowKnownQueryResponses<PolkadotXcm>,
 		// Subscriptions for version tracking are OK.
 		AllowSubscriptionsFrom<ParentOrSiblings>,
+		// Allow XCMs with some computed origins to pass through.
+		WithComputedOrigin<
+			(
+				// Parent's executive plurality (i.e. governance) gets free execution.
+				AllowExplicitUnpaidExecutionFrom<ParentsExecutivePlurality>,
+			),
+			UniversalLocation,
+			MaxPrefixes,
+		>,
 	),
 >;
 

parachains/runtimes/assets/westmint/src/xcm_config.rs

@@ -39,6 +39,7 @@ use xcm_builder::{
 	NativeAsset, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
 	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WeightInfoBounds,
+	WithComputedOrigin,
 };
 use xcm_executor::{
 	traits::{JustTry, WithOriginFilter},
@@ -134,12 +135,15 @@ pub type XcmOriginToTransactDispatchOrigin = (
 parameter_types! {
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAssetsIntoHolding: u32 = 64;
+	pub const MaxPrefixes: u32 = 8;
 	pub XcmAssetFeesReceiver: Option<AccountId> = Authorship::author();
 }
 
 match_types! {
-	pub type ParentOrParentsPlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
+	pub type ParentLocation: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here }
+	};
+	pub type ParentsPlurality: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: X1(Plurality { .. }) }
 	};
 }
@@ -245,12 +249,21 @@ pub type Barrier = DenyThenTry<
 	(
 		TakeWeightCredit,
 		AllowTopLevelPaidExecutionFrom<Everything>,
-		// Parent and its plurality get free execution
-		AllowExplicitUnpaidExecutionFrom<ParentOrParentsPlurality>,
+		// Parent gets free execution
+		AllowExplicitUnpaidExecutionFrom<ParentLocation>,
 		// Expected responses are OK.
 		AllowKnownQueryResponses<PolkadotXcm>,
 		// Subscriptions for version tracking are OK.
 		AllowSubscriptionsFrom<Everything>,
+		// Allow XCMs with some computed origins to pass through.
+		WithComputedOrigin<
+			(
+				// Parent's plurality (i.e. governance bodies) gets free execution.
+				AllowExplicitUnpaidExecutionFrom<ParentsPlurality>,
+			),
+			UniversalLocation,
+			MaxPrefixes,
+		>,
 	),
 >;
 

parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs

@@ -35,6 +35,7 @@ use xcm_builder::{
 	FixedWeightBounds, IsConcrete, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative,
 	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
 	SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,
+	WithComputedOrigin,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -103,11 +104,14 @@ parameter_types! {
 	pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAssetsIntoHolding: u32 = 64;
+	pub const MaxPrefixes: u32 = 8;
 }
 
 match_types! {
 	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
+		MultiLocation { parents: 1, interior: Here }
+	};
+	pub type ParentsExecutivePlurality: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
 	};
 	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
@@ -186,13 +190,22 @@ pub type Barrier = DenyThenTry<
 		// Allow local users to buy weight credit.
 		TakeWeightCredit,
 		// Parent and its exec plurality get free execution.
-		AllowExplicitUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
+		AllowExplicitUnpaidExecutionFrom<ParentLocation>,
 		// Expected responses are OK.
 		AllowKnownQueryResponses<PolkadotXcm>,
 		// Subscriptions for version tracking are OK.
 		AllowSubscriptionsFrom<ParentOrSiblings>,
 		// Allow anything to pay for execution.
 		AllowTopLevelPaidExecutionFrom<Everything>,
+		// Allow XCMs with some computed origins to pass through.
+		WithComputedOrigin<
+			(
+				// Parent's executive plurality (i.e. governance) gets free execution.
+				AllowExplicitUnpaidExecutionFrom<ParentsExecutivePlurality>,
+			),
+			UniversalLocation,
+			MaxPrefixes,
+		>,
 	),
 >;
 

parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs

@@ -33,7 +33,7 @@ use xcm_builder::{
 	FixedWeightBounds, IsConcrete, NativeAsset, ParentAsSuperuser, ParentIsPreset,
 	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
-	UsingComponents,
+	UsingComponents, WithComputedOrigin,
 };
 use xcm_executor::XcmExecutor;
 
@@ -105,11 +105,14 @@ parameter_types! {
 	// One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate.
 	pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
 	pub const MaxInstructions: u32 = 100;
+	pub const MaxPrefixes: u32 = 8;
 }
 
 match_types! {
-	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
+	pub type ParentLocation: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here }
+	};
+	pub type ParentsExecutivePlurality: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
 	};
 	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
@@ -124,11 +127,20 @@ pub type Barrier = DenyThenTry<
 		TakeWeightCredit,
 		AllowTopLevelPaidExecutionFrom<Everything>,
 		// Parent and its exec plurality get free execution
-		AllowExplicitUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
+		AllowExplicitUnpaidExecutionFrom<ParentLocation>,
 		// Expected responses are OK.
 		AllowKnownQueryResponses<PolkadotXcm>,
 		// Subscriptions for version tracking are OK.
 		AllowSubscriptionsFrom<ParentOrSiblings>,
+		// Allow XCMs with some computed origins to pass through.
+		WithComputedOrigin<
+			(
+				// Parent's executive plurality (i.e. governance) gets free execution.
+				AllowExplicitUnpaidExecutionFrom<ParentsExecutivePlurality>,
+			),
+			UniversalLocation,
+			MaxPrefixes,
+		>,
 	),
 >;