Updates from upstream

.cargo/config.toml

@@ -1,7 +1,7 @@
 [build]
 rustdocflags = [
-  "-Dwarnings",
-  "-Arustdoc::redundant_explicit_links", # stylistic
+	"-Dwarnings",
+	"-Arustdoc::redundant_explicit_links", # stylistic
 ]
 
 # An auto defined `clippy` feature was introduced,
@@ -12,30 +12,30 @@ rustdocflags = [
 # RUSTFLAGS= cargo clippy
 [target.'cfg(feature = "cargo-clippy")']
 rustflags = [
-  "-Aclippy::all",
-  "-Dclippy::correctness",
-  "-Aclippy::if-same-then-else",
-  "-Asuspicious_double_ref_op",
-  "-Dclippy::complexity",
-  "-Aclippy::zero-prefixed-literal",     # 00_1000_000
-  "-Aclippy::type_complexity",           # raison d'etre
-  "-Aclippy::nonminimal-bool",           # maybe
-  "-Aclippy::borrowed-box",              # Reasonable to fix this one
-  "-Aclippy::too-many-arguments",        # (Turning this on would lead to)
-  "-Aclippy::unnecessary_cast",          # Types may change
-  "-Aclippy::identity-op",               # One case where we do 0 +
-  "-Aclippy::useless_conversion",        # Types may change
-  "-Aclippy::unit_arg",                  # styalistic.
-  "-Aclippy::option-map-unit-fn",        # styalistic
-  "-Aclippy::bind_instead_of_map",       # styalistic
-  "-Aclippy::erasing_op",                # E.g. 0 * DOLLARS
-  "-Aclippy::eq_op",                     # In tests we test equality.
-  "-Aclippy::while_immutable_condition", # false positives
-  "-Aclippy::needless_option_as_deref",  # false positives
-  "-Aclippy::derivable_impls",           # false positives
-  "-Aclippy::stable_sort_primitive",     # prefer stable sort
-  "-Aclippy::extra-unused-type-parameters", # stylistic
-  "-Aclippy::default_constructed_unit_structs", # stylistic
+	"-Aclippy::all",
+	"-Dclippy::correctness",
+	"-Aclippy::if-same-then-else",
+	"-Asuspicious_double_ref_op",
+	"-Dclippy::complexity",
+	"-Aclippy::zero-prefixed-literal",            # 00_1000_000
+	"-Aclippy::type_complexity",                  # raison d'etre
+	"-Aclippy::nonminimal-bool",                  # maybe
+	"-Aclippy::borrowed-box",                     # Reasonable to fix this one
+	"-Aclippy::too-many-arguments",               # (Turning this on would lead to)
+	"-Aclippy::unnecessary_cast",                 # Types may change
+	"-Aclippy::identity-op",                      # One case where we do 0 +
+	"-Aclippy::useless_conversion",               # Types may change
+	"-Aclippy::unit_arg",                         # styalistic.
+	"-Aclippy::option-map-unit-fn",               # styalistic
+	"-Aclippy::bind_instead_of_map",              # styalistic
+	"-Aclippy::erasing_op",                       # E.g. 0 * DOLLARS
+	"-Aclippy::eq_op",                            # In tests we test equality.
+	"-Aclippy::while_immutable_condition",        # false positives
+	"-Aclippy::needless_option_as_deref",         # false positives
+	"-Aclippy::derivable_impls",                  # false positives
+	"-Aclippy::stable_sort_primitive",            # prefer stable sort
+	"-Aclippy::extra-unused-type-parameters",     # stylistic
+	"-Aclippy::default_constructed_unit_structs", # stylistic
 ]
 
 [env]

.config/lychee.toml

@@ -15,36 +15,36 @@ accept = [
 	200,
 
 	# Rate limited - GitHub likes to throw this.
-	429
+	429,
 ]
 
-exclude_path = [ "./target" ]
+exclude_path = ["./target"]
 
 exclude = [
-  # Place holders (no need to fix these):
-  "http://visitme/",
-  "https://visitme/",
-  
-  # TODO <https://github.com/paritytech/polkadot-sdk/issues/134>
-  "https://docs.substrate.io/main-docs/build/custom-rpc/#public-rpcs",
-  "https://docs.substrate.io/rustdocs/latest/sp_api/macro.decl_runtime_apis.html",
-  "https://github.com/ipfs/js-ipfs-bitswap/blob/",
-  "https://github.com/paritytech/polkadot-sdk/substrate/frame/timestamp",
-  "https://github.com/paritytech/substrate/frame/fast-unstake",
-  "https://github.com/zkcrypto/bls12_381/blob/e224ad4ea1babfc582ccd751c2bf128611d10936/src/test-data/mod.rs",
-  "https://polkadot.network/the-path-of-a-parachain-block/",
-  "https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results",
-  "https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html",
-  "https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html#-6.-practical-results",
-  "https://research.web3.foundation/en/latest/polkadot/networking/3-avail-valid.html#topology",
-  "https://research.web3.foundation/en/latest/polkadot/NPoS/3.%20Balancing.html",
-  "https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html",
-  "https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#inflation-model",
-  "https://research.web3.foundation/en/latest/polkadot/slashing/npos.html",
-  "https://research.web3.foundation/en/latest/polkadot/Token%20Economics.html#inflation-model",
-  "https://rpc.polkadot.io/",
-  "https://w3f.github.io/parachain-implementers-guide/node/approval/approval-distribution.html",
-  "https://w3f.github.io/parachain-implementers-guide/node/index.html",
-  "https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html",
-  "https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html",
+	# Place holders (no need to fix these):
+	"http://visitme/",
+	"https://visitme/",
+
+	# TODO <https://github.com/paritytech/polkadot-sdk/issues/134>
+	"https://docs.substrate.io/main-docs/build/custom-rpc/#public-rpcs",
+	"https://docs.substrate.io/rustdocs/latest/sp_api/macro.decl_runtime_apis.html",
+	"https://github.com/ipfs/js-ipfs-bitswap/blob/",
+	"https://github.com/paritytech/polkadot-sdk/substrate/frame/timestamp",
+	"https://github.com/paritytech/substrate/frame/fast-unstake",
+	"https://github.com/zkcrypto/bls12_381/blob/e224ad4ea1babfc582ccd751c2bf128611d10936/src/test-data/mod.rs",
+	"https://polkadot.network/the-path-of-a-parachain-block/",
+	"https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results",
+	"https://research.web3.foundation/en/latest/polkadot/NPoS/3.%20Balancing.html",
+	"https://research.web3.foundation/en/latest/polkadot/Token%20Economics.html#inflation-model",
+	"https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html",
+	"https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html#-6.-practical-results",
+	"https://research.web3.foundation/en/latest/polkadot/networking/3-avail-valid.html#topology",
+	"https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html",
+	"https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#inflation-model",
+	"https://research.web3.foundation/en/latest/polkadot/slashing/npos.html",
+	"https://rpc.polkadot.io/",
+	"https://w3f.github.io/parachain-implementers-guide/node/approval/approval-distribution.html",
+	"https://w3f.github.io/parachain-implementers-guide/node/index.html",
+	"https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html",
+	"https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html",
 ]

.config/taplo.toml

@@ -0,0 +1,33 @@
+# all options https://taplo.tamasfe.dev/configuration/formatter-options.html
+
+# ignore zombienet as they do some deliberate custom toml stuff
+exclude = [
+	"cumulus/zombienet/**",
+	"polkadot/node/malus/integrationtests/**",
+	"polkadot/zombienet_tests/**",
+	"substrate/zombienet/**",
+]
+
+# global rules
+[formatting]
+reorder_arrays = true
+inline_table_expand = false
+array_auto_expand = false
+array_auto_collapse = false
+indent_string = "	"         # tab
+
+# don't re-order order-dependent deb package metadata
+[[rule]]
+include = ["polkadot/Cargo.toml"]
+keys = ["package.metadata.deb"]
+
+[rule.formatting]
+reorder_arrays = false
+
+# don't re-order order-dependent rustflags
+[[rule]]
+include = [".cargo/config.toml"]
+keys = ["build", "target.'cfg(feature = \"cargo-clippy\")'"]
+
+[rule.formatting]
+reorder_arrays = false

.config/zepter.yaml

@@ -19,18 +19,15 @@ workflows:
         '--left-side-outside-workspace=ignore',
         # Some features imply that they activate a specific dependency as non-optional. Otherwise the default behaviour with a `?` is used.
         '--feature-enables-dep=try-runtime:frame-try-runtime,runtime-benchmarks:frame-benchmarking',
-        # Actually modify the files and not just report the issues:
+        # Auxillary flags:
         '--offline',
         '--locked',
         '--show-path',
         '--quiet',
       ]
-      # Format the features into canonical format:
-    - ['format', 'features', '--offline', '--locked', '--quiet']
   # Same as `check`, but with the `--fix` flag.
   default:
     - [ $check.0, '--fix' ]
-    - [ $check.1, '--fix' ]
 
 # Will be displayed when any workflow fails:
 help:

.github/review-bot.yml

@@ -9,7 +9,7 @@ rules:
         - ^\.config/nextest.toml
         - ^\.cargo/.*
       exclude: 
-        - ^./gitlab/pipeline/zombienet.*
+        - ^\.gitlab/pipeline/zombienet.*
     minApprovals: 2
     type: basic
     teams:

.github/workflows/build-and-attach-release-runtimes.yml

@@ -3,7 +3,7 @@ name: Build and Attach Runtimes to Releases/RC
 on:
   release:
     types:
-      - created
+      - published
 
 env:
   PROFILE: production
@@ -44,12 +44,6 @@ jobs:
         runtime_dir: ${{ matrix.runtime.path }}
         profile: ${{ env.PROFILE }}
 
-    - name: Build Summary
-      run: |
-        echo "${{ steps.srtool_build.outputs.json }}" | jq . > ${{ matrix.runtime.name }}-srtool-digest.json
-        cat ${{ matrix.runtime.name }}-srtool-digest.json
-        echo "Runtime location: ${{ steps.srtool_build.outputs.wasm }}"
-
     - name: Set up paths and runtime names
       id: setup
       run: |

.github/workflows/check-publish.yml

@@ -10,10 +10,7 @@ on:
 
 jobs:
   check-publish:
-    strategy:
-      matrix:
-        os: ["ubuntu-latest"]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
@@ -23,7 +20,7 @@ jobs:
           cache-on-failure: true
 
       - name: install parity-publish
-        run: cargo install parity-publish --profile dev
+        run: cargo install parity-publish@0.3.0
 
       - name: parity-publish check
         run: parity-publish check --allow-unpublished

.github/workflows/claim-crates.yml

@@ -18,7 +18,7 @@ jobs:
           cache-on-failure: true
 
       - name: install parity-publish
-        run: cargo install parity-publish@0.2.0
+        run: cargo install parity-publish@0.3.0
 
       - name: parity-publish claim
         env:

.github/workflows/gitspiegel-trigger.yml

@@ -13,8 +13,19 @@ on:
       - unlocked
       - ready_for_review
       - reopened
+  # the job doesn't check out any code, so it is relatively safe to run it on any event
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - unlocked
+      - ready_for_review
+      - reopened
   merge_group:
 
+# drop all permissions for GITHUB_TOKEN
+permissions: {}
+
 jobs:
   sync:
     runs-on: ubuntu-latest

.github/workflows/merge-queue.yml

@@ -0,0 +1,24 @@
+name: Merge-Queue
+
+on:
+  merge_group:
+
+jobs:
+  trigger-merge-queue-action:
+    runs-on: ubuntu-latest
+    environment: master
+    steps:
+      - name: Generate token
+        id: app_token
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
+        with:
+          app_id: ${{ secrets.REVIEW_APP_ID }}
+          private_key: ${{ secrets.REVIEW_APP_KEY }}
+      - name: Add Merge Queue status check
+        uses: billyjbryant/create-status-check@3e6fa0ac599d10d9588cf9516ca4330ef669b858 # v2
+        with:
+          authToken: ${{ steps.app_token.outputs.token }}
+          context: 'review-bot'
+          description: 'PRs for merge queue gets approved'
+          state: 'success'
+          sha: ${{ github.event.merge_group.head_commit.id }}