Merge branch 'master' into skalman--beefy-client-keystore-supporting-…

…both-ecdsa-and-bls

.github/workflows/claim-crates.yml

@@ -0,0 +1,25 @@
+name: Claim Crates
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  claim-crates:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+        with:
+          cache-on-failure: true
+
+      - name: install parity-publish
+        run: cargo install [email protected]
+
+      - name: parity-publish claim
+        env:
+          PARITY_PUBLISH_CRATESIO_TOKEN: ${{ secrets.CRATESIO_PUBLISH_CLAIM_TOKEN }}
+        run: parity-publish claim

.gitlab/pipeline/zombienet/substrate.yml

@@ -38,13 +38,14 @@
   tags:
     - zombienet-polkadot-integration-test
 
-zombienet-substrate-0000-block-building:
-  extends:
-    - .zombienet-substrate-common
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
-      --local-dir="${LOCAL_DIR}/0000-block-building"
-      --test="block-building.zndsl"
+# Skip this one until PolkadotJS includes `SkipCheckIfFeeless` extension
+# zombienet-substrate-0000-block-building:
+#   extends:
+#     - .zombienet-substrate-common
+#   script:
+#     - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+#       --local-dir="${LOCAL_DIR}/0000-block-building"
+#       --test="block-building.zndsl"
 
 zombienet-substrate-0001-basic-warp-sync:
   extends:

Cargo.toml

@@ -293,6 +293,7 @@ members = [
 	"substrate/frame/child-bounties",
 	"substrate/frame/collective",
 	"substrate/frame/contracts",
+	"substrate/frame/contracts/fixtures",
 	"substrate/frame/contracts/primitives",
 	"substrate/frame/contracts/proc-macro",
 	"substrate/frame/conviction-voting",
@@ -381,6 +382,7 @@ members = [
 	"substrate/frame/transaction-payment/asset-tx-payment",
 	"substrate/frame/transaction-payment/rpc",
 	"substrate/frame/transaction-payment/rpc/runtime-api",
+	"substrate/frame/transaction-payment/skip-feeless-payment",
 	"substrate/frame/transaction-storage",
 	"substrate/frame/treasury",
 	"substrate/frame/try-runtime",

cumulus/parachain-template/runtime/src/xcm_config.rs

@@ -150,11 +150,6 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -180,8 +175,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();

cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs

@@ -21,7 +21,7 @@ use frame_support::traits::OnInitialize;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	impl_assets_helpers_for_system_parachain, xcm_emulator::decl_test_parachains,
+	impl_assets_helpers_for_parachain, xcm_emulator::decl_test_parachains,
 };
 use rococo_emulated_chain::Rococo;
 
@@ -51,5 +51,5 @@ decl_test_parachains! {
 
 // AssetHubRococo implementation
 impl_accounts_helpers_for_parachain!(AssetHubRococo);
-impl_assert_events_helpers_for_parachain!(AssetHubRococo);
-impl_assets_helpers_for_system_parachain!(AssetHubRococo, Rococo);
+impl_assert_events_helpers_for_parachain!(AssetHubRococo, false);
+impl_assets_helpers_for_parachain!(AssetHubRococo, Rococo);

cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs

@@ -21,7 +21,7 @@ use frame_support::traits::OnInitialize;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	impl_assets_helpers_for_system_parachain, xcm_emulator::decl_test_parachains,
+	impl_assets_helpers_for_parachain, xcm_emulator::decl_test_parachains,
 };
 use westend_emulated_chain::Westend;
 
@@ -51,5 +51,5 @@ decl_test_parachains! {
 
 // AssetHubWestend implementation
 impl_accounts_helpers_for_parachain!(AssetHubWestend);
-impl_assert_events_helpers_for_parachain!(AssetHubWestend);
-impl_assets_helpers_for_system_parachain!(AssetHubWestend, Westend);
+impl_assert_events_helpers_for_parachain!(AssetHubWestend, false);
+impl_assets_helpers_for_parachain!(AssetHubWestend, Westend);

cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/src/lib.rs

@@ -19,7 +19,7 @@ use frame_support::traits::OnInitialize;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	impl_assets_helpers_for_system_parachain, xcm_emulator::decl_test_parachains,
+	impl_assets_helpers_for_parachain, xcm_emulator::decl_test_parachains,
 };
 use wococo_emulated_chain::Wococo;
 
@@ -49,5 +49,5 @@ decl_test_parachains! {
 
 // AssetHubWococo implementation
 impl_accounts_helpers_for_parachain!(AssetHubWococo);
-impl_assert_events_helpers_for_parachain!(AssetHubWococo);
-impl_assets_helpers_for_system_parachain!(AssetHubWococo, Wococo);
+impl_assert_events_helpers_for_parachain!(AssetHubWococo, false);
+impl_assets_helpers_for_parachain!(AssetHubWococo, Wococo);

cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs

@@ -46,4 +46,4 @@ decl_test_parachains! {
 
 // BridgeHubRococo implementation
 impl_accounts_helpers_for_parachain!(BridgeHubRococo);
-impl_assert_events_helpers_for_parachain!(BridgeHubRococo);
+impl_assert_events_helpers_for_parachain!(BridgeHubRococo, false);

cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs

@@ -46,4 +46,4 @@ decl_test_parachains! {
 
 // BridgeHubWestend implementation
 impl_accounts_helpers_for_parachain!(BridgeHubWestend);
-impl_assert_events_helpers_for_parachain!(BridgeHubWestend);
+impl_assert_events_helpers_for_parachain!(BridgeHubWestend, false);

cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/src/lib.rs

@@ -44,4 +44,4 @@ decl_test_parachains! {
 
 // BridgeHubWococo implementation
 impl_accounts_helpers_for_parachain!(BridgeHubWococo);
-impl_assert_events_helpers_for_parachain!(BridgeHubWococo);
+impl_assert_events_helpers_for_parachain!(BridgeHubWococo, false);

cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml

@@ -22,3 +22,4 @@ parachains-common = { path = "../../../../../../../parachains/common" }
 cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
 emulated-integration-tests-common = { path = "../../../../common", default-features = false }
 penpal-runtime = { path = "../../../../../../runtimes/testing/penpal" }
+rococo-emulated-chain = { path = "../../../relays/rococo" }

cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs

@@ -21,8 +21,10 @@ use frame_support::traits::OnInitialize;
 
 // Cumulus
 use emulated_integration_tests_common::{
-	impl_assert_events_helpers_for_parachain, xcm_emulator::decl_test_parachains,
+	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
+	impl_assets_helpers_for_parachain, xcm_emulator::decl_test_parachains,
 };
+use rococo_emulated_chain::Rococo;
 
 // Penpal Parachain declaration
 decl_test_parachains! {
@@ -40,6 +42,7 @@ decl_test_parachains! {
 		pallets = {
 			PolkadotXcm: penpal_runtime::PolkadotXcm,
 			Assets: penpal_runtime::Assets,
+			Balances: penpal_runtime::Balances,
 		}
 	},
 	pub struct PenpalB {
@@ -56,10 +59,13 @@ decl_test_parachains! {
 		pallets = {
 			PolkadotXcm: penpal_runtime::PolkadotXcm,
 			Assets: penpal_runtime::Assets,
+			Balances: penpal_runtime::Balances,
 		}
 	},
 }
 
 // Penpal implementation
-impl_assert_events_helpers_for_parachain!(PenpalA);
-impl_assert_events_helpers_for_parachain!(PenpalB);
+impl_accounts_helpers_for_parachain!(PenpalA);
+impl_assets_helpers_for_parachain!(PenpalA, Rococo);
+impl_assert_events_helpers_for_parachain!(PenpalA, true);
+impl_assert_events_helpers_for_parachain!(PenpalB, true);

cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/lib.rs

@@ -30,7 +30,7 @@ decl_test_relay_chains! {
 		on_init = (),
 		runtime = westend_runtime,
 		core = {
-			SovereignAccountOf: westend_runtime::xcm_config::LocationConverter, //TODO: rename to SovereignAccountOf,
+			SovereignAccountOf: westend_runtime::xcm_config::LocationConverter,
 		},
 		pallets = {
 			XcmPallet: westend_runtime::XcmPallet,