diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
index 956ada5ac3b747d506227e81fdec22502d78a2c9..0681ec3de0d4ec4bfa3c8e87c1e236db1308e8cf 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
@@ -38,8 +38,8 @@ use xcm_builder::{
EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NativeAsset,
NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
- SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WeightInfoBounds,
- WithComputedOrigin,
+ SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+ WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
};
use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
@@ -350,30 +350,34 @@ impl Contains<RuntimeCall> for SafeCallFilter {
}
}
-pub type Barrier = DenyThenTry<
- DenyReserveTransferToRelayChain,
- (
- TakeWeightCredit,
- // Expected responses are OK.
- AllowKnownQueryResponses<PolkadotXcm>,
- // Allow XCMs with some computed origins to pass through.
- WithComputedOrigin<
- (
- // If the message is one that immediately attemps to pay for execution, then allow it.
- AllowTopLevelPaidExecutionFrom<Everything>,
- // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality get free execution.
- AllowExplicitUnpaidExecutionFrom<(
- ParentOrParentsPlurality,
- FellowsPlurality,
- FellowshipSalaryPallet,
- )>,
- // Subscriptions for version tracking are OK.
- AllowSubscriptionsFrom<ParentOrSiblings>,
- ),
- UniversalLocation,
- ConstU32<8>,
- >,
- ),
+pub type Barrier = TrailingSetTopicAsId<
+ DenyThenTry<
+ DenyReserveTransferToRelayChain,
+ (
+ TakeWeightCredit,
+ // Expected responses are OK.
+ AllowKnownQueryResponses<PolkadotXcm>,
+ // Allow XCMs with some computed origins to pass through.
+ WithComputedOrigin<
+ (
+ // If the message is one that immediately attemps to pay for execution, then
+ // allow it.
+ AllowTopLevelPaidExecutionFrom<Everything>,
+ // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
+ // get free execution.
+ AllowExplicitUnpaidExecutionFrom<(
+ ParentOrParentsPlurality,
+ FellowsPlurality,
+ FellowshipSalaryPallet,
+ )>,
+ // Subscriptions for version tracking are OK.
+ AllowSubscriptionsFrom<ParentOrSiblings>,
+ ),
+ UniversalLocation,
+ ConstU32<8>,
+ >,
+ ),
+ >,
>;
pub type AssetFeeAsExistentialDepositMultiplierFeeCharger = AssetFeeAsExistentialDepositMultiplier<
@@ -443,12 +447,12 @@ pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, R
/// The means for routing XCM messages which are not for local execution into the right message
/// queues.
-pub type XcmRouter = (
+pub type XcmRouter = WithUniqueTopic<(
// Two routers - use UMP to communicate with the relay chain:
cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
// ..and XCMP to communicate with the sibling chains.
XcmpQueue,
-);
+)>;
#[cfg(feature = "runtime-benchmarks")]
parameter_types! {
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
index 118b0c6d71b0bda3bbd164248662b6a98792d551..863191d1bc8b0fbc62d3c5d4e8bd6689c5e910df 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
@@ -33,7 +33,7 @@ use xcm_builder::{
DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, IsConcrete, ParentAsSuperuser,
ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
- UsingComponents, WeightInfoBounds, WithComputedOrigin,
+ TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
};
use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
@@ -156,26 +156,28 @@ impl Contains<RuntimeCall> for SafeCallFilter {
}
}
-pub type Barrier = DenyThenTry<
- DenyReserveTransferToRelayChain,
- (
- // Allow local users to buy weight credit.
- TakeWeightCredit,
- // Expected responses are OK.
- AllowKnownQueryResponses<PolkadotXcm>,
- WithComputedOrigin<
- (
- // If the message is one that immediately attemps to pay for execution, then allow it.
- AllowTopLevelPaidExecutionFrom<Everything>,
- // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality get free execution.
- AllowExplicitUnpaidExecutionFrom<(ParentOrParentsPlurality, FellowsPlurality)>,
- // Subscriptions for version tracking are OK.
- AllowSubscriptionsFrom<ParentOrSiblings>,
- ),
- UniversalLocation,
- ConstU32<8>,
- >,
- ),
+pub type Barrier = TrailingSetTopicAsId<
+ DenyThenTry<
+ DenyReserveTransferToRelayChain,
+ (
+ // Allow local users to buy weight credit.
+ TakeWeightCredit,
+ // Expected responses are OK.
+ AllowKnownQueryResponses<PolkadotXcm>,
+ WithComputedOrigin<
+ (
+ // If the message is one that immediately attemps to pay for execution, then allow it.
+ AllowTopLevelPaidExecutionFrom<Everything>,
+ // Parent, its pluralities (i.e. governance bodies), and the Fellows plurality get free execution.
+ AllowExplicitUnpaidExecutionFrom<(ParentOrParentsPlurality, FellowsPlurality)>,
+ // Subscriptions for version tracking are OK.
+ AllowSubscriptionsFrom<ParentOrSiblings>,
+ ),
+ UniversalLocation,
+ ConstU32<8>,
+ >,
+ ),
+ >,
>;
pub struct XcmConfig;
@@ -220,12 +222,12 @@ pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, R
/// The means for routing XCM messages which are not for local execution into the right message
/// queues.
-pub type XcmRouter = (
+pub type XcmRouter = WithUniqueTopic<(
// Two routers - use UMP to communicate with the relay chain:
cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
// ..and XCMP to communicate with the sibling chains.
XcmpQueue,
-);
+)>;
#[cfg(feature = "runtime-benchmarks")]
parameter_types! {
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
index 3c95da27dd81e49692e25702bb8b1139a4d6ecc6..8a0fb8bea5bc2e5247b9b2f97766664f94adff19 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
@@ -33,8 +33,8 @@ use xcm_builder::{
DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds, IsConcrete,
OriginToPluralityVoice, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative,
SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
- SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,
- WithComputedOrigin,
+ SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
+ UsingComponents, WithComputedOrigin, WithUniqueTopic,
};
use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
@@ -202,27 +202,29 @@ impl Contains<RuntimeCall> for SafeCallFilter {
}
}
-pub type Barrier = DenyThenTry<
- DenyReserveTransferToRelayChain,
- (
- // Allow local users to buy weight credit.
- TakeWeightCredit,
- // Expected responses are OK.
- AllowKnownQueryResponses<PolkadotXcm>,
- // Allow XCMs with some computed origins to pass through.
- WithComputedOrigin<
- (
- // If the message is one that immediately attemps to pay for execution, then allow it.
- AllowTopLevelPaidExecutionFrom<Everything>,
- // Parent and its pluralities (i.e. governance bodies) get free execution.
- AllowExplicitUnpaidExecutionFrom<ParentOrParentsPlurality>,
- // Subscriptions for version tracking are OK.
- AllowSubscriptionsFrom<ParentOrSiblings>,
- ),
- UniversalLocation,
- ConstU32<8>,
- >,
- ),
+pub type Barrier = TrailingSetTopicAsId<
+ DenyThenTry<
+ DenyReserveTransferToRelayChain,
+ (
+ // Allow local users to buy weight credit.
+ TakeWeightCredit,
+ // Expected responses are OK.
+ AllowKnownQueryResponses<PolkadotXcm>,
+ // Allow XCMs with some computed origins to pass through.
+ WithComputedOrigin<
+ (
+ // If the message is one that immediately attemps to pay for execution, then allow it.
+ AllowTopLevelPaidExecutionFrom<Everything>,
+ // Parent and its pluralities (i.e. governance bodies) get free execution.
+ AllowExplicitUnpaidExecutionFrom<ParentOrParentsPlurality>,
+ // Subscriptions for version tracking are OK.
+ AllowSubscriptionsFrom<ParentOrSiblings>,
+ ),
+ UniversalLocation,
+ ConstU32<8>,
+ >,
+ ),
+ >,
>;
pub struct XcmConfig;
@@ -263,12 +265,12 @@ pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, R
/// The means for routing XCM messages which are not for local execution into the right message
/// queues.
-pub type XcmRouter = (
+pub type XcmRouter = WithUniqueTopic<(
// Two routers - use UMP to communicate with the relay chain:
cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
// ..and XCMP to communicate with the sibling chains.
XcmpQueue,
-);
+)>;
#[cfg(feature = "runtime-benchmarks")]
parameter_types! {
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
index 4e072647ce69f6ddb4c7218c1e11f36bb0cc8aab..a6223d9a203091cf5c754332cd9296e489b9aaba 100644
--- a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
@@ -70,7 +70,7 @@ use parachains_common::{
};
use xcm_builder::{
AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, ConvertedConcreteId,
- FungiblesAdapter, LocalMint,
+ FungiblesAdapter, LocalMint, TrailingSetTopicAsId, WithUniqueTopic,
};
use xcm_executor::traits::JustTry;
@@ -383,7 +383,7 @@ match_types! {
};
}
-pub type Barrier = (
+pub type Barrier = TrailingSetTopicAsId<(
TakeWeightCredit,
AllowTopLevelPaidExecutionFrom<Everything>,
// Parent & its unit plurality gets free execution.
@@ -394,7 +394,7 @@ pub type Barrier = (
AllowKnownQueryResponses<PolkadotXcm>,
// Subscriptions for version tracking are OK.
AllowSubscriptionsFrom<Everything>,
-);
+)>;
parameter_types! {
pub MaxAssetsIntoHolding: u32 = 64;
@@ -441,12 +441,12 @@ pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, R
/// The means for routing XCM messages which are not for local execution into the right message
/// queues.
-pub type XcmRouter = (
+pub type XcmRouter = WithUniqueTopic<(
// Two routers - use UMP to communicate with the relay chain:
cumulus_primitives_utility::ParentAsUmp<ParachainSystem, (), ()>,
// ..and XCMP to communicate with the sibling chains.
XcmpQueue,
-);
+)>;
#[cfg(feature = "runtime-benchmarks")]
parameter_types! {