Merge branch 'main' into oty-reapply-changes

polkadot-fellows · Jan 30, 2024 · f84df9d · f84df9d
2 parents 465b839 + ecd1687
commit f84df9d
Show file tree

Hide file tree

Showing 27 changed files with 118 additions and 60 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -2,10 +2,14 @@ name: Modify Changelog
 
 on:
   pull_request_target:
+    types:
+      - synchronize
+      - edited
 
 jobs:
 
-  verifyChangelogIsUpdated:
+  verifyChangelog:
+    name: Verify that Changelog is Updated
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ github.token }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/emulated/common/Cargo.toml b/integration-tests/emulated/common/Cargo.toml
@@ -41,7 +41,7 @@ cumulus-pallet-xcmp-queue = { version = "0.4.0" }
 cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , version = "0.4.0" }
 asset-test-utils = { version = "4.0.0" }
 cumulus-pallet-dmp-queue = { version = "0.4.0" }
-penpal-runtime = { version = "0.11.0" }
+penpal-runtime = { version = "0.11.1" }
 
 # Local runtimes
 kusama-runtime = { package = "staging-kusama-runtime", path = "../../../relay/kusama" }

diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml
@@ -72,7 +72,7 @@ pallet-membership = { default-features = false , version = "25.0.0" }
 pallet-message-queue = { default-features = false , version = "28.0.0" }
 pallet-mmr = { default-features = false , version = "24.0.0" }
 pallet-multisig = { default-features = false , version = "25.0.0" }
-pallet-nomination-pools = { default-features = false , version = "22.0.0" }
+pallet-nomination-pools = { default-features = false , version = "22.0.2" }
 pallet-offences = { default-features = false , version = "24.0.0" }
 pallet-preimage = { default-features = false , version = "25.0.0" }
 pallet-proxy = { default-features = false , version = "25.0.0" }
@@ -112,7 +112,7 @@ runtime-parachains = { package = "polkadot-runtime-parachains", default-features
 primitives = { package = "polkadot-primitives", default-features = false , version = "4.0.0" }
 
 xcm = { package = "staging-xcm", default-features = false , version = "4.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "4.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "4.0.2" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "4.0.0" }
 
 sp-debug-derive = { default-features = false, version = "10.0.0" }

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

diff --git a/relay/kusama/src/xcm_config.rs b/relay/kusama/src/xcm_config.rs
@@ -38,10 +38,10 @@ use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
 	ChildParachainConvertsVia, CurrencyAdapter as XcmCurrencyAdapter, DescribeAllTerminal,
-	DescribeFamily, HashedDescription, IsChildSystemParachain, IsConcrete, MintLocation,
-	OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
-	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
+	DescribeFamily, FrameTransactionalProcessor, HashedDescription, IsChildSystemParachain,
+	IsConcrete, MintLocation, OriginToPluralityVoice, SignedAccountId32AsNative,
+	SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
+	UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
 };
 
 parameter_types! {
@@ -208,6 +208,7 @@ impl xcm_executor::Config for XcmConfig {
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
 	type Aliasers = Nothing;
+	type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 parameter_types! {

diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml
@@ -68,7 +68,7 @@ pallet-membership = { default-features = false , version = "25.0.0" }
 pallet-message-queue = { default-features = false , version = "28.0.0" }
 pallet-mmr = { default-features = false , version = "24.0.0" }
 pallet-multisig = { default-features = false , version = "25.0.0" }
-pallet-nomination-pools = { default-features = false , version = "22.0.0" }
+pallet-nomination-pools = { default-features = false , version = "22.0.2" }
 pallet-nomination-pools-runtime-api = { default-features = false , version = "20.0.0" }
 pallet-offences = { default-features = false , version = "24.0.0" }
 pallet-preimage = { default-features = false , version = "25.0.0" }
@@ -108,7 +108,7 @@ runtime-parachains = { package = "polkadot-runtime-parachains", default-features
 primitives = { package = "polkadot-primitives", default-features = false , version = "4.0.0" }
 
 xcm = { package = "staging-xcm", default-features = false , version = "4.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "4.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "4.0.2" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "4.0.0" }
 
 sp-debug-derive = { default-features = false, version = "10.0.0" }

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

diff --git a/relay/polkadot/src/xcm_config.rs b/relay/polkadot/src/xcm_config.rs
@@ -43,10 +43,10 @@ use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
 	ChildParachainConvertsVia, CurrencyAdapter as XcmCurrencyAdapter, DescribeAllTerminal,
-	DescribeFamily, HashedDescription, IsConcrete, MintLocation, OriginToPluralityVoice,
-	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
-	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-	XcmFeesToAccount,
+	DescribeFamily, FrameTransactionalProcessor, HashedDescription, IsConcrete, MintLocation,
+	OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
 };
 
 parameter_types! {
@@ -223,6 +223,7 @@ impl xcm_executor::Config for XcmConfig {
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = Everything;
 	type Aliasers = Nothing;
+	type TransactionalProcessor = FrameTransactionalProcessor;
 }
 
 parameter_types! {

diff --git a/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml b/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml
@@ -73,7 +73,7 @@ polkadot-parachain-primitives = { default-features = false, version = "3.0.0" }
 polkadot-runtime-common = { default-features = false, version = "4.0.0" }
 xcm = { package = "staging-xcm", default-features = false, version = "4.0.0" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "4.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "4.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "4.0.2" }
 
 # Cumulus
 cumulus-pallet-aura-ext = { default-features = false , version = "0.4.0" }

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

diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs
@@ -46,12 +46,13 @@ use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal, DescribeFamily,
-	EnsureXcmOrigin, FungiblesAdapter, GlobalConsensusParachainConvertsFor, HashedDescription,
-	IsConcrete, LocalMint, 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, NoChecking,
+	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus, TakeWeightCredit,
+	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
+	XcmFeesToAccount,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -601,6 +602,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/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml b/system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml
@@ -68,7 +68,7 @@ polkadot-parachain-primitives = { default-features = false, version = "3.0.0" }
 polkadot-runtime-common = { default-features = false, version = "4.0.0" }
 xcm = { package = "staging-xcm", default-features = false, version = "4.0.0" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "4.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "4.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "4.0.2" }
 
 # Cumulus
 cumulus-pallet-aura-ext = { default-features = false , version = "0.4.0" }

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

diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs
@@ -43,12 +43,13 @@ use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal, DescribeFamily,
-	EnsureXcmOrigin, FungiblesAdapter, GlobalConsensusParachainConvertsFor, HashedDescription,
-	IsConcrete, LocalMint, 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, NoChecking,
+	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus, TakeWeightCredit,
+	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
+	XcmFeesToAccount,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -523,6 +524,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/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml b/system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml
@@ -65,7 +65,7 @@ polkadot-parachain-primitives = { default-features = false, version = "3.0.0" }
 polkadot-runtime-common = { default-features = false, version = "4.0.0" }
 xcm = { package = "staging-xcm", default-features = false, version = "4.0.0" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "4.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "4.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "4.0.2" }
 
 # Cumulus
 cumulus-pallet-aura-ext = { default-features = false , version = "0.4.0" }

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

diff --git a/system-parachains/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs b/system-parachains/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs
@@ -41,8 +41,8 @@ use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal, DescribeFamily,
-	EnsureXcmOrigin, HashedDescription, IsConcrete, ParentAsSuperuser, ParentIsPreset,
-	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	EnsureXcmOrigin, FrameTransactionalProcessor, HashedDescription, IsConcrete, ParentAsSuperuser,
+	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
 	XcmFeesToAccount,
@@ -281,6 +281,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/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml b/system-parachains/bridge-hubs/bridge-hub-polkadot/Cargo.toml
@@ -65,7 +65,7 @@ polkadot-parachain-primitives = { default-features = false, version = "3.0.0" }
 polkadot-runtime-common = { default-features = false, version = "4.0.0" }
 xcm = { package = "staging-xcm", default-features = false, version = "4.0.0" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "4.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "4.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "4.0.2" }
 
 # Cumulus
 cumulus-pallet-aura-ext = { default-features = false , version = "0.4.0" }

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

diff --git a/system-parachains/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs b/system-parachains/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
@@ -41,8 +41,8 @@ use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal, DescribeFamily,
-	EnsureXcmOrigin, HashedDescription, IsConcrete, ParentAsSuperuser, ParentIsPreset,
-	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	EnsureXcmOrigin, FrameTransactionalProcessor, HashedDescription, IsConcrete, ParentAsSuperuser,
+	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
 	XcmFeesToAccount,
@@ -288,6 +288,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.