Backport transactional processing PR (#1222)

paritytech · Jan 29, 2024 · 7bc62d9 · 7bc62d9
1 parent 993dfbd
commit 7bc62d9
Show file tree

Hide file tree

Showing 46 changed files with 650 additions and 311 deletions.
diff --git a/cumulus/pallets/xcmp-queue/src/mock.rs b/cumulus/pallets/xcmp-queue/src/mock.rs
@@ -29,7 +29,10 @@ use sp_runtime::{
  BuildStorage,
 };
 use xcm::prelude::*;
-use xcm_builder::{CurrencyAdapter, FixedWeightBounds, IsConcrete, NativeAsset, ParentIsPreset};
+use xcm_builder::{
+ CurrencyAdapter, FixedWeightBounds, FrameTransactionalProcessor, IsConcrete, NativeAsset,
+ ParentIsPreset,
+};
 use xcm_executor::traits::ConvertOrigin;
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -168,6 +171,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = RuntimeCall;
  type SafeCallFilter = Everything;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 pub type XcmRouter = (

diff --git a/cumulus/parachain-template/runtime/src/xcm_config.rs b/cumulus/parachain-template/runtime/src/xcm_config.rs
@@ -15,10 +15,10 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
  AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom,
  CurrencyAdapter, DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin,
- FixedWeightBounds, IsConcrete, NativeAsset, ParentIsPreset, RelayChainAsNative,
- SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
- SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
- UsingComponents, WithComputedOrigin, WithUniqueTopic,
+ FixedWeightBounds, FrameTransactionalProcessor, IsConcrete, NativeAsset, ParentIsPreset,
+ RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+ SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
+ TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::XcmExecutor;
 
@@ -136,6 +136,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = RuntimeCall;
  type SafeCallFilter = Everything;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -1433,6 +1433,13 @@ impl_runtime_apis! {
  Ok((origin, ticket, assets))
  }
 
+ fn fee_asset() -> Result<MultiAsset, BenchmarkError> {
+ Ok(Asset {
+ id: AssetId::Concrete(TokenLocation::get()),
+ fun: Fungible(1_000_000 * UNITS),
+ })
+ }
+
  fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
  Err(BenchmarkError::Skip)
  }

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
@@ -47,13 +47,13 @@ use xcm_builder::{
  AccountId32Aliases, AllAssets, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
  AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
  DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal, DescribeFamily,
- EnsureXcmOrigin, FungiblesAdapter, GlobalConsensusParachainConvertsFor, HashedDescription,
- IsConcrete, LocalMint, LocationWithAssetFilters, NetworkExportTableItem, NoChecking,
- ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
- SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
- SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus, TakeWeightCredit,
- TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
- XcmFeesToAccount,
+ EnsureXcmOrigin, FrameTransactionalProcessor, FungiblesAdapter,
+ GlobalConsensusParachainConvertsFor, HashedDescription, IsConcrete, LocalMint,
+ LocationWithAssetFilters, NetworkExportTableItem, NoChecking, ParentAsSuperuser,
+ ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+ SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, StartsWith,
+ StartsWithExplicitGlobalConsensus, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+ WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -621,6 +621,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = WithOriginFilter<SafeCallFilter>;
  type SafeCallFilter = SafeCallFilter;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// Converts a local signed origin into an XCM multilocation.

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1378,6 +1378,13 @@ impl_runtime_apis! {
  Ok((origin, ticket, assets))
  }
 
+ fn fee_asset() -> Result<MultiAsset, BenchmarkError> {
+ Ok(Asset {
+ id: AssetId::Concrete(WestendLocation::get()),
+ fun: Fungible(1_000_000 * UNITS),
+ })
+ }
+
  fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
  Err(BenchmarkError::Skip)
  }

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
@@ -47,12 +47,12 @@ use xcm_builder::{
  AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
  AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
  DenyReserveTransferToRelayChain, DenyThenTry, DescribeFamily, DescribePalletTerminal,
- EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NoChecking,
- ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
- SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
- SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus, TakeWeightCredit,
- TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
- XcmFeesToAccount,
+ EnsureXcmOrigin, FrameTransactionalProcessor, FungiblesAdapter, HashedDescription, IsConcrete,
+ LocalMint, NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative,
+ SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
+ SignedToAccountId32, SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus,
+ TakeWeightCredit, TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin,
+ WithUniqueTopic, XcmFeesToAccount,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -576,6 +576,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = WithOriginFilter<SafeCallFilter>;
  type SafeCallFilter = SafeCallFilter;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// Local origins on this chain are allowed to dispatch XCM sends/executions.

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
@@ -759,6 +759,13 @@ impl_runtime_apis! {
  Ok((origin, ticket, assets))
  }
 
+ fn fee_asset() -> Result<MultiAsset, BenchmarkError> {
+ Ok(Asset {
+ id: AssetId::Concrete(WndRelayLocation::get()),
+ fun: Fungible(1_000_000 * UNITS),
+ })
+ }
+
  fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
  Err(BenchmarkError::Skip)
  }

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs
@@ -32,10 +32,11 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
  AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
  AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
- DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, IsConcrete, ParentAsSuperuser,
- ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
- SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
- TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
+ DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FrameTransactionalProcessor,
+ IsConcrete, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+ SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+ SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+ WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -216,6 +217,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = WithOriginFilter<SafeCallFilter>;
  type SafeCallFilter = SafeCallFilter;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// Converts a local signed origin into an XCM multilocation.

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
@@ -759,6 +759,13 @@ impl_runtime_apis! {
  Ok((origin, ticket, assets))
  }
 
+ fn fee_asset() -> Result<MultiAsset, BenchmarkError> {
+ Ok(Asset {
+ id: AssetId::Concrete(RelayLocation::get()),
+ fun: Fungible(1_000_000 * UNITS),
+ })
+ }
+
  fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
  Err(BenchmarkError::Skip)
  }

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
@@ -32,10 +32,11 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
  AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
  AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
- DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, IsConcrete, ParentAsSuperuser,
- ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
- SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
- TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
+ DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FrameTransactionalProcessor,
+ IsConcrete, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+ SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+ SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+ WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -220,6 +221,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = WithOriginFilter<SafeCallFilter>;
  type SafeCallFilter = SafeCallFilter;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// Converts a local signed origin into an XCM multilocation.

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -948,6 +948,13 @@ impl_runtime_apis! {
  Ok((origin, ticket, assets))
  }
 
+ fn fee_asset() -> Result<MultiAsset, BenchmarkError> {
+ Ok(Asset {
+ id: AssetId::Concrete(TokenLocation::get()),
+ fun: Fungible(1_000_000 * UNITS),
+ })
+ }
+
  fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
  Err(BenchmarkError::Skip)
  }

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
@@ -47,11 +47,11 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
  AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
  AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
- DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, IsConcrete, ParentAsSuperuser,
- ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
- SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
- TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
- XcmFeesToAccount,
+ DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FrameTransactionalProcessor,
+ IsConcrete, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+ SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+ SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+ WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
 };
 use xcm_executor::{
  traits::{ExportXcm, WithOriginFilter},
@@ -288,6 +288,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = WithOriginFilter<SafeCallFilter>;
  type SafeCallFilter = SafeCallFilter;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 pub type PriceForParentDelivery =

diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
@@ -32,11 +32,12 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
  AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
  AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
- DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds, IsConcrete,
- LocatableAssetId, OriginToPluralityVoice, ParentAsSuperuser, ParentIsPreset,
- RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
- SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
- TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
+ DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds,
+ FrameTransactionalProcessor, IsConcrete, LocatableAssetId, OriginToPluralityVoice,
+ ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+ SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+ SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+ WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -275,6 +276,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = WithOriginFilter<SafeCallFilter>;
  type SafeCallFilter = SafeCallFilter;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// Converts a local signed origin into an XCM multilocation.

diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
@@ -37,11 +37,11 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
  AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
  AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
- DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds, IsConcrete,
- NativeAsset, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
- SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
- SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
- WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
+ DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds,
+ FrameTransactionalProcessor, IsConcrete, NativeAsset, ParentAsSuperuser, ParentIsPreset,
+ RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+ SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
+ TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
 };
 use xcm_executor::XcmExecutor;
 
@@ -185,6 +185,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = RuntimeCall;
  type SafeCallFilter = Everything;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// Converts a local signed origin into an XCM multilocation.

diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs
@@ -24,8 +24,8 @@ use frame_support::{
 };
 use xcm::latest::prelude::*;
 use xcm_builder::{
- AllowExplicitUnpaidExecutionFrom, FixedWeightBounds, ParentAsSuperuser, ParentIsPreset,
- SovereignSignedViaLocation,
+ AllowExplicitUnpaidExecutionFrom, FixedWeightBounds, FrameTransactionalProcessor,
+ ParentAsSuperuser, ParentIsPreset, SovereignSignedViaLocation,
 };
 
 parameter_types! {
@@ -84,6 +84,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = RuntimeCall;
  type SafeCallFilter = Everything;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {

diff --git a/cumulus/parachains/runtimes/starters/shell/src/xcm_config.rs b/cumulus/parachains/runtimes/starters/shell/src/xcm_config.rs
@@ -84,6 +84,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = RuntimeCall;
  type SafeCallFilter = Everything;
  type Aliasers = Nothing;
+ type TransactionalProcessor = ();
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {

diff --git a/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs b/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs
@@ -46,11 +46,11 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
  AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
  AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex,
- ConvertedConcreteId, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter,
- IsConcrete, LocalMint, NativeAsset, ParentIsPreset, RelayChainAsNative,
- SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
- SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
- UsingComponents, WithComputedOrigin, WithUniqueTopic,
+ ConvertedConcreteId, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds,
+ FrameTransactionalProcessor, FungiblesAdapter, IsConcrete, LocalMint, NativeAsset,
+ ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+ SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
+ TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::{traits::JustTry, XcmExecutor};
 
@@ -294,6 +294,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = RuntimeCall;
  type SafeCallFilter = Everything;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.

diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
@@ -73,7 +73,8 @@ use parachains_common::{
 };
 use xcm_builder::{
  AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, ConvertedConcreteId,
- FungiblesAdapter, LocalMint, TrailingSetTopicAsId, WithUniqueTopic,
+ FrameTransactionalProcessor, FungiblesAdapter, LocalMint, TrailingSetTopicAsId,
+ WithUniqueTopic,
 };
 use xcm_executor::traits::JustTry;
 
@@ -453,6 +454,7 @@ impl xcm_executor::Config for XcmConfig {
  type CallDispatcher = RuntimeCall;
  type SafeCallFilter = Everything;
  type Aliasers = Nothing;
+ type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 /// Local origins on this chain are allowed to dispatch XCM sends/executions.

diff --git a/cumulus/primitives/utility/src/lib.rs b/cumulus/primitives/utility/src/lib.rs
@@ -27,6 +27,7 @@ use frame_support::{
  Get,
  },
  weights::Weight,
+ CloneNoBound,
 };
 use polkadot_runtime_common::xcm_sender::PriceForMessageDelivery;
 use sp_runtime::{traits::Saturating, SaturatedConversion};
@@ -101,6 +102,7 @@ struct AssetTraderRefunder {
 /// later refund purposes
 /// Important: Errors if the Trader is being called twice by 2 BuyExecution instructions
 /// Alternatively we could just return payment in the aforementioned case
+#[derive(CloneNoBound)]
 pub struct TakeFirstAssetTrader<
  AccountId,
  FeeCharger: ChargeWeightInFungibles<AccountId, ConcreteAssets>,

diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
@@ -2159,6 +2159,13 @@ sp_api::impl_runtime_apis! {
  Ok((origin, ticket, assets))
  }
 
+ fn fee_asset() -> Result<MultiAsset, BenchmarkError> {
+ Ok(Asset {
+ id: AssetId::Concrete(TokenLocation::get()),
+ fun: Fungible(1_000_000 * UNITS),
+ })
+ }
+
  fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
  // Rococo doesn't support asset locking
  Err(BenchmarkError::Skip)