Merge branch 'master' into shawntabrizi-vesting-treasury

paritytech · Oct 7, 2024 · 2b216c0 · 2b216c0
2 parents 62a3676 + fe0bfb7
commit 2b216c0
Show file tree

Hide file tree

Showing 109 changed files with 3,608 additions and 921 deletions.
diff --git a/.github/workflows/build-publish-images.yml b/.github/workflows/build-publish-images.yml
@@ -15,7 +15,6 @@ env:
   COMMIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
 
 jobs:
-
   #
   #
   #
@@ -24,7 +23,7 @@ jobs:
     if: contains(github.event.label.name, 'GHA-migration') || contains(github.event.pull_request.labels.*.name, 'GHA-migration')
     uses: ./.github/workflows/reusable-preflight.yml
 
-### Build ########################
+  ### Build ########################
 
   #
   #
@@ -240,7 +239,7 @@ jobs:
         with:
           # tldr: we need to checkout the branch HEAD explicitly because of our dynamic versioning approach while building the substrate binary
           # see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589
-          ref:  ${{ github.head_ref || github.ref_name }}
+          ref: ${{ github.head_ref || github.ref_name }}
       - name: build
         run: |
           mkdir -p ./artifacts/substrate/
@@ -299,14 +298,14 @@ jobs:
           path: artifacts.tar
           retention-days: 1
 
-### Publish ########################
+  ### Publish ########################
 
   #
   #
   #
   build-push-image-test-parachain:
     needs: [preflight, build-test-parachain]
-    runs-on: arc-runners-polkadot-sdk
+    runs-on: ${{ needs.preflight.outputs.RUNNER_DEFAULT }}
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -330,7 +329,7 @@ jobs:
   #
   build-push-image-polkadot-debug:
     needs: [preflight, build-linux-stable]
-    runs-on: arc-runners-polkadot-sdk
+    runs-on: ${{ needs.preflight.outputs.RUNNER_DEFAULT }}
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -349,13 +348,12 @@ jobs:
           image-name: "europe-docker.pkg.dev/parity-ci-2024/temp-images/polkadot-debug"
           dockerfile: "docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile"
 
-
   #
   #
   #
   build-push-image-colander:
     needs: [preflight, build-test-collators]
-    runs-on: arc-runners-polkadot-sdk
+    runs-on: ${{ needs.preflight.outputs.RUNNER_DEFAULT }}
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -374,13 +372,12 @@ jobs:
           image-name: "europe-docker.pkg.dev/parity-ci-2024/temp-images/colander"
           dockerfile: "docker/dockerfiles/collator_injected.Dockerfile"
 
-
   #
   #
   #
   build-push-image-malus:
     needs: [preflight, build-malus]
-    runs-on: arc-runners-polkadot-sdk
+    runs-on: ${{ needs.preflight.outputs.RUNNER_DEFAULT }}
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -399,13 +396,12 @@ jobs:
           image-name: "europe-docker.pkg.dev/parity-ci-2024/temp-images/malus"
           dockerfile: "docker/dockerfiles/malus_injected.Dockerfile"
 
-
   #
   #
   #
   build-push-image-substrate-pr:
     needs: [preflight, build-linux-substrate]
-    runs-on: arc-runners-polkadot-sdk
+    runs-on: ${{ needs.preflight.outputs.RUNNER_DEFAULT }}
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -424,15 +420,20 @@ jobs:
           image-name: "europe-docker.pkg.dev/parity-ci-2024/temp-images/substrate"
           dockerfile: "docker/dockerfiles/substrate_injected.Dockerfile"
 
-
   #
   #
   #
   # unlike other images, bridges+zombienet image is based on Zombienet image that pulls required binaries
   # from other fresh images (polkadot and cumulus)
   build-push-image-bridges-zombienet-tests:
-    needs: [preflight, build-linux-stable, build-linux-stable-cumulus, prepare-bridges-zombienet-artifacts]
-    runs-on: arc-runners-polkadot-sdk
+    needs:
+      [
+        preflight,
+        build-linux-stable,
+        build-linux-stable-cumulus,
+        prepare-bridges-zombienet-artifacts,
+      ]
+    runs-on: ${{ needs.preflight.outputs.RUNNER_DEFAULT }}
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -443,38 +444,37 @@ jobs:
           name: build-linux-stable-${{ needs.preflight.outputs.SOURCE_REF_NAME }}
       - name: tar
         run: |
-         tar -xvf artifacts.tar
-         rm artifacts.tar
+          tar -xvf artifacts.tar
+          rm artifacts.tar
 
       - uses: actions/[email protected]
         with:
           name: build-linux-stable-cumulus-${{ needs.preflight.outputs.SOURCE_REF_NAME }}
       - name: tar
         run: |
-         tar -xvf artifacts.tar
-         rm artifacts.tar
+          tar -xvf artifacts.tar
+          rm artifacts.tar
 
       - uses: actions/[email protected]
         with:
           name: prepare-bridges-zombienet-artifacts-${{ needs.preflight.outputs.SOURCE_REF_NAME }}
       - name: tar
         run: |
-         tar -xvf artifacts.tar
-         rm artifacts.tar
+          tar -xvf artifacts.tar
+          rm artifacts.tar
 
       - name: build and push image
         uses: ./.github/actions/build-push-image
         with:
           image-name: "europe-docker.pkg.dev/parity-ci-2024/temp-images/bridges-zombienet-tests"
           dockerfile: "docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile"
 
-
   #
   #
   #
   build-push-image-polkadot-parachain-debug:
     needs: [preflight, build-linux-stable-cumulus]
-    runs-on: arc-runners-polkadot-sdk
+    runs-on: ${{ needs.preflight.outputs.RUNNER_DEFAULT }}
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -491,4 +491,4 @@ jobs:
         uses: ./.github/actions/build-push-image
         with:
           image-name: "europe-docker.pkg.dev/parity-ci-2024/temp-images/polkadot-parachain-debug"
-          dockerfile: "docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile"
+          dockerfile: "docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile"
diff --git a/.github/workflows/check-getting-started.yml b/.github/workflows/check-getting-started.yml
@@ -6,7 +6,7 @@ name: Check the getting-started.sh script
 #
 # There are two jobs inside.
 # One for systems that can run in a docker container, and one for macOS.
-# 
+#
 # Each job consists of:
 # 1. Some necessary prerequisites for the workflow itself.
 # 2. A first pass of the script, which will install dependencies and clone a template.
@@ -24,10 +24,10 @@ name: Check the getting-started.sh script
 on:
   pull_request:
     paths:
-      - '.github/workflows/check-getting-started.yml'
-      - 'scripts/getting-started.sh'
+      - ".github/workflows/check-getting-started.yml"
+      - "scripts/getting-started.sh"
   schedule:
-    - cron: '0 5 * * *'
+    - cron: "0 5 * * *"
   workflow_dispatch:
 
 concurrency:
@@ -60,7 +60,7 @@ jobs:
             container: opensuse/tumbleweed
             template: solochain
             shell: sh
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: parity-large
     container: ${{ matrix.container }}:latest
     steps:
       # A minimal amount of prerequisites required before we can run the actual getting-started script,
@@ -116,7 +116,7 @@ jobs:
           expect "start with one of the templates" {
             send "y\r"
           }
-          
+
           expect -re "(.)\\) ${{ matrix.template }} template" {
             send "$expect_out(1,string)\r"
           }
@@ -150,7 +150,7 @@ jobs:
           expect "start with one of the templates" {
             send "y\r"
           }
-          
+
           expect -re "(.)\\) ${{ matrix.template }} template" {
             send "$expect_out(1,string)\r"
             expect "directory already exists" {}
@@ -227,7 +227,7 @@ jobs:
           expect "start with one of the templates" {
             send "y\r"
           }
-          
+
           expect -re "(.)\\) ${{ matrix.template }} template" {
             send "$expect_out(1,string)\r"
           }
@@ -267,7 +267,7 @@ jobs:
           expect "start with one of the templates" {
             send "y\r"
           }
-          
+
           expect -re "(.)\\) ${{ matrix.template }} template" {
             send "$expect_out(1,string)\r"
             expect "directory already exists" {}

diff --git a/.github/workflows/check-runtime-migration.yml b/.github/workflows/check-runtime-migration.yml
@@ -50,54 +50,59 @@ jobs:
             package: westend-runtime
             wasm: westend_runtime.compact.compressed.wasm
             uri: "wss://try-runtime-westend.polkadot.io:443"
-            subcommand_extra_args: "--no-weight-warnings"
+            subcommand_extra_args: "--no-weight-warnings --blocktime 6000"
             command_extra_args: ""
           - network: rococo
             package: rococo-runtime
             wasm: rococo_runtime.compact.compressed.wasm
             uri: "wss://try-runtime-rococo.polkadot.io:443"
-            subcommand_extra_args: "--no-weight-warnings"
+            subcommand_extra_args: "--no-weight-warnings --blocktime 6000"
             command_extra_args: ""
           - network: asset-hub-westend
             package: asset-hub-westend-runtime
             wasm: asset_hub_westend_runtime.compact.compressed.wasm
             uri: "wss://westend-asset-hub-rpc.polkadot.io:443"
-            subcommand_extra_args: ""
+            subcommand_extra_args: " --blocktime 6000"
             command_extra_args: ""
           - network: "asset-hub-rococo"
             package: "asset-hub-rococo-runtime"
             wasm: "asset_hub_rococo_runtime.compact.compressed.wasm"
             uri: "wss://rococo-asset-hub-rpc.polkadot.io:443"
-            subcommand_extra_args: ""
+            subcommand_extra_args: " --blocktime 6000"
             command_extra_args: ""
           - network: "bridge-hub-westend"
             package: "bridge-hub-westend-runtime"
             wasm: "bridge_hub_westend_runtime.compact.compressed.wasm"
             uri: "wss://westend-bridge-hub-rpc.polkadot.io:443"
+            subcommand_extra_args: " --blocktime 6000"
           - network: "bridge-hub-rococo"
             package: "bridge-hub-rococo-runtime"
             wasm: "bridge_hub_rococo_runtime.compact.compressed.wasm"
             uri: "wss://rococo-bridge-hub-rpc.polkadot.io:443"
+            subcommand_extra_args: " --blocktime 6000"
           - network: "contracts-rococo"
             package: "contracts-rococo-runtime"
             wasm: "contracts_rococo_runtime.compact.compressed.wasm"
             uri: "wss://rococo-contracts-rpc.polkadot.io:443"
+            subcommand_extra_args: " --blocktime 6000"
           - network: "collectives-westend"
             package: "collectives-westend-runtime"
             wasm: "collectives_westend_runtime.compact.compressed.wasm"
             uri: "wss://westend-collectives-rpc.polkadot.io:443"
             command_extra_args: "--disable-spec-name-check"
+            subcommand_extra_args: " --blocktime 6000"
           - network: "coretime-rococo"
             package: "coretime-rococo-runtime"
             wasm: "coretime_rococo_runtime.compact.compressed.wasm"
             uri: "wss://rococo-coretime-rpc.polkadot.io:443"
+            subcommand_extra_args: " --blocktime 6000"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Download CLI
         run: |
-          curl -sL https://github.com/paritytech/try-runtime-cli/releases/download/v0.7.0/try-runtime-x86_64-unknown-linux-musl -o try-runtime
+          curl -sL https://github.com/paritytech/try-runtime-cli/releases/download/v0.8.0/try-runtime-x86_64-unknown-linux-musl -o try-runtime
           chmod +x ./try-runtime
           echo "Using try-runtime-cli version:"
           ./try-runtime --version

diff --git a/.github/workflows/cmd.yml b/.github/workflows/cmd.yml
@@ -231,9 +231,9 @@ jobs:
           fi
 
           if [[ $BODY == "/cmd bench"* ]]; then
-              echo "RUNNER=arc-runners-polkadot-sdk-benchmark" >> $GITHUB_OUTPUT
+              echo "RUNNER=parity-weights" >> $GITHUB_OUTPUT
           elif [[ $BODY == "/cmd update-ui"* ]]; then
-              echo "RUNNER=arc-runners-polkadot-sdk-beefy" >> $GITHUB_OUTPUT
+              echo "RUNNER=parity-large" >> $GITHUB_OUTPUT
           else
               echo "RUNNER=ubuntu-latest" >> $GITHUB_OUTPUT
           fi

diff --git a/.github/workflows/command-backport.yml b/.github/workflows/command-backport.yml
@@ -10,6 +10,7 @@ permissions:
   contents: write # so it can comment
   pull-requests: write # so it can create pull requests
   issues: write
+  actions: write # It may have to backport changes to the CI as well.
 
 jobs:
   backport:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -29,7 +29,7 @@ jobs:
         env:
           SKIP_WASM_BUILD: 1
   test-doc:
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: ${{ needs.preflight.outputs.RUNNER }}
     needs: [preflight]
     container:
       image: ${{ needs.preflight.outputs.IMAGE }}

diff --git a/.github/workflows/release-50_publish-docker.yml b/.github/workflows/release-50_publish-docker.yml
@@ -348,7 +348,7 @@ jobs:
 
       - name: Build and push
         id:   docker_build
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 #  v6.7.0
+        uses: docker/build-push-action@32945a339266b759abcbdc89316275140b0fc960 #  v6.8.0
         with:
           push: true
           file: docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile

diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
@@ -157,7 +157,6 @@ jobs:
   node-bench-regression-guard:
     timeout-minutes: 20
     if: always() && !cancelled()
-    # runs-on: arc-runners-polkadot-sdk
     runs-on: ubuntu-latest
     needs: [preflight, cargo-check-benches]
     steps:

diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml
@@ -1,7 +1,7 @@
 .zombienet-refs:
   extends: .build-refs
   variables:
-    ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.112"
+    ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.113"
     PUSHGATEWAY_URL: "http://zombienet-prometheus-pushgateway.managed-monitoring:9091/metrics/job/zombie-metrics"
     DEBUG: "zombie,zombie::network-node,zombie::kube::client::logs"
     ZOMBIE_PROVIDER: "k8s"

diff --git a/Cargo.lock b/Cargo.lock