Resolve conflicts

.github/scripts/cmd/cmd.py

@@ -146,8 +146,11 @@
             output_path = default_path if not pallet.startswith("pallet_xcm_benchmarks") else xcm_path
             templates = config.get("benchmarks_templates", {}) or {}
             template = templates.get(pallet)
+            excluded_extrinsics = config.get("benchmarks_exclude_extrinsics", {}) or {}
+            excluded = excluded_extrinsics.get(pallet, [])
+            excluded_string = ",".join(f"{pallet}::{e}" for e in excluded)
 
-            print(f'-- benchmarking {pallet} in {runtime} into {output_path} using template {template}')
+            print(f'-- benchmarking {pallet} in {runtime} into {output_path} using template {template} and excluded {excluded_string}')
 
             status = os.system(f"frame-omni-bencher v1 benchmark pallet "
                                f"--extrinsic=* "
@@ -160,6 +163,7 @@
                                f"--repeat=20 "
                                f"--heap-pages=4096 "
                                f"{f'--template={template} ' if template else ''}"
+                               f"{f'--exclude-extrinsics={excluded_string} ' if excluded_string else ''}"
                                )
             if status != 0 and not args.continue_on_fail:
                 print(f'Failed to benchmark {pallet} in {runtime}')

.github/workflows/integration-tests-matrix.json

@@ -34,5 +34,13 @@
   {
     "name": "coretime-polkadot",
     "package": "coretime-polkadot-integration-tests"
+  },
+  {
+    "name": "governance-polkadot",
+    "package": "governance-polkadot-integration-tests"
+  },
+  {
+    "name": "governance-kusama",
+    "package": "governance-kusama-integration-tests"
   }
 ]

.github/workflows/runtimes-matrix.json

@@ -20,7 +20,6 @@
     "uri": "wss://try-runtime-kusama.polkadot.io:443",
     "is_relay": true,
     "blocktime": 6000,
-    "benchmarks_exclude_extrinsics": "pallet_nomination_pools::apply_slash_fail",
     "extra_args": "--disable-mbm-checks",
     "build_extra_features": "kusama-ahm",
     "benchmarks_templates": {
@@ -45,6 +44,9 @@
     "blocktime": 12000,
     "try_runtime_args": "--overwrite-state-version 1",
     "build_extra_features": "kusama-ahm",
+    "benchmarks_exclude_extrinsics": {
+      "pallet_election_provider_multi_block_verifier": ["on_initialize_invalid_non_terminal"]
+    },
     "benchmarks_templates": {
       "pallet_xcm_benchmarks::generic": "templates/xcm-bench-template.hbs",
       "pallet_xcm_benchmarks::fungible": "templates/xcm-bench-template.hbs"
@@ -60,6 +62,9 @@
     "extra_args": "--disable-mbm-checks",
     "try_runtime_args": "--overwrite-state-version 1",
     "build_extra_features": "polkadot-ahm",
+    "benchmarks_exclude_extrinsics": {
+      "pallet_election_provider_multi_block_verifier": ["on_initialize_invalid_non_terminal"]
+    },
     "benchmarks_templates": {
       "pallet_xcm_benchmarks::generic": "templates/xcm-bench-template.hbs",
       "pallet_xcm_benchmarks::fungible": "templates/xcm-bench-template.hbs"

.github/workflows/test.yml

@@ -122,8 +122,9 @@ jobs:
           if [ -z "${{ matrix.runtime.benchmarks_exclude_extrinsics }}" ]; then
             EXCLUDE_EXTRINSICS=""
           else
-            EXCLUDE_EXTRINSICS=" --exclude-extrinsics "
-            EXCLUDE_EXTRINSICS+=${{ matrix.runtime.benchmarks_exclude_extrinsics }}
+            EXCLUDE_EXTRINSICS_JSON='${{ toJson(matrix.runtime.benchmarks_exclude_extrinsics) }}'
+            EXCLUDE_EXTRINSICS_LIST=$(echo "$EXCLUDE_EXTRINSICS_JSON" | jq -r 'to_entries | map("\(.key)::\(.value[])") | join(" ")')
+            EXCLUDE_EXTRINSICS=" --exclude-extrinsics ${EXCLUDE_EXTRINSICS_LIST}"
           fi
           echo "Running benchmarking for RUNTIME_BLOB_PATH=$RUNTIME_BLOB_PATH $EXCLUDE_EXTRINSICS"
           ./frame-omni-bencher v1 benchmark pallet --runtime $RUNTIME_BLOB_PATH --all --steps 2 --repeat 1 $EXCLUDE_EXTRINSICS --heap-pages 4096

CHANGELOG.md

@@ -4,6 +4,19 @@ Changelog for the runtimes governed by the Polkadot Fellowship.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.9.3] 21.10.2025
+
+### Added
+- Enable view functions on System Chains([polkadot-fellows/runtimes/pull/981](https://github.com/polkadot-fellows/runtimes/pull/981))
+
+## [1.9.3] 21.10.2025
+
+### Fixed
+
+- [BHP](https://github.com/polkadot-fellows/runtimes/pull/978) Add missing snowbridge runtime API to the BridgeHub
+  runtime.
+- Bump `pallet-staking-async` to `0.6.2` to fix incorrect self stake accounting (https://github.com/polkadot-fellows/runtimes/pull/980)
+
 ## [1.9.2] 08.10.2025
 
 ### Added
@@ -165,6 +178,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - [#9202](https://github.com/paritytech/polkadot-sdk/pull/9202): `apply_authorized_force_set_current_code` does not need to consume the whole block
 - Proxy type `NonTranfer`: Use a whitelist of calls and remove some not useful calls from the whitelist ([polkadot-fellows/runtimes/pull/646](https://github.com/polkadot-fellows/runtimes/pull/646))
 - Add Snowbridge V2 pallets, to enable Snowbridge V2 bridging: [polkadot-fellows/runtimes/pull/796](https://github.com/polkadot-fellows/runtimes/pull/796))
+- Moves single block migrations from frame_executive::Executive to frame_system::Config. [polkadot-fellows/runtimes/pull/844](https://github.com/polkadot-fellows/runtimes/pull/844)
 
 ## [1.6.1] 24.06.2025