Merge branch 'master' into dependabot/cargo/known_good_semver-8acf82e340

.github/scripts/common/lib.sh

@@ -264,3 +264,41 @@ function check_gpg() {
     echo "Checking GPG Signature for $1"
     gpg --no-tty --verify -q $1.asc $1
 }
+
+# GITHUB_REF will typically be like:
+# - refs/heads/release-v1.2.3
+# - refs/heads/release-polkadot-v1.2.3-rc2
+# This function extracts the version
+function get_version_from_ghref() {
+  GITHUB_REF=$1
+  stripped=${GITHUB_REF#refs/heads/release-}
+  re="v([0-9]+\.[0-9]+\.[0-9]+)"
+  if [[ $stripped =~ $re ]]; then
+    echo ${BASH_REMATCH[0]};
+    return 0
+  else
+    return 1
+  fi
+}
+
+# Get latest rc tag based on the release version and product
+function get_latest_rc_tag() {
+  version=$1
+  product=$2
+
+  if [[ "$product" == "polkadot" ]]; then
+    last_rc=$(git tag -l "$version-rc*" | sort -V | tail -n 1)
+  elif [[ "$product" == "polkadot-parachain"  ]]; then
+    last_rc=$(git tag -l "polkadot-parachains-$version-rc*" | sort -V | tail -n 1)
+  fi
+  echo "${last_rc}"
+}
+
+# Increment rc tag number based on the value of a suffix of the current rc tag
+function increment_rc_tag() {
+  last_rc=$1
+
+  suffix=$(echo "$last_rc" | grep -Eo '[0-9]+$')
+  ((suffix++))
+  echo $suffix
+}

.github/workflows/check-licenses.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   check-licenses:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       LICENSES: "'Apache-2.0' 'GPL-3.0-only' 'GPL-3.0-or-later WITH Classpath-exception-2.0'"
       NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/notif-burnin-label.yml

@@ -0,0 +1,24 @@
+name: Notify DevOps when burn-in label applied
+on:
+  pull_request:
+    types: [labeled]
+
+jobs:
+  notify-devops:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        channel:
+          - name: 'Team: DevOps'
+            room: '!lUslSijLMgNcEKcAiE:parity.io'
+
+    steps:
+      - name: Send Matrix message to ${{ matrix.channel.name }}
+        if: startsWith(github.event.label.name, 'A0-')
+        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
+        with:
+          room_id: ${{ matrix.channel.room }}
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: m.parity.io
+          message: |
+            @room Burn-in request received for [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})

.github/workflows/release-10_rc-automation.yml

@@ -0,0 +1,112 @@
+name: Release - RC automation
+on:
+  push:
+    branches:
+      # Catches release-polkadot-v1.2.3, release-v1.2.3-rc1, etc
+      - release-v[0-9]+.[0-9]+.[0-9]+*
+      - release-cumulus-v[0-9]+*
+      - release-polkadot-v[0-9]+*
+
+  workflow_dispatch:
+
+jobs:
+  tag_rc:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        channel:
+          - name: "RelEng: Polkadot Release Coordination"
+            room: '!cqAmzdIcbOFwrdrubV:parity.io'
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          fetch-depth: 0
+
+      - name: Get release product
+        id: get_rel_product
+        shell: bash
+        run: |
+          current_branch=$(git branch --show-current)
+          echo "Current branch: $current_branch"
+          if [[ "$current_branch" =~ "release-polkadot" ]]; then
+            echo "product=polkadot" >> $GITHUB_OUTPUT
+          elif [[ "$current_branch" =~ "release-cumulus" ]]; then
+            echo "product=polkadot-parachain" >> $GITHUB_OUTPUT
+          fi
+
+
+      - name: Compute next rc tag for polkadot
+        if: ${{ steps.get_rel_product.outputs.product == 'polkadot' }}
+        id: compute_tag_polkadot
+        shell: bash
+        run: |
+          . ./.github/scripts/common/lib.sh
+
+          # Get last rc tag if exists, else set it to {version}-rc1
+          version=$(get_version_from_ghref ${GITHUB_REF})
+          echo "$version"
+          echo "version=$version" >> $GITHUB_OUTPUT
+
+          last_rc=$(get_latest_rc_tag $version polkadot)
+
+          if [ -n "$last_rc" ]; then
+            suffix=$(increment_rc_tag $last_rc)
+            echo "new_tag=$version-rc$suffix" >> $GITHUB_OUTPUT
+            echo "first_rc=false" >> $GITHUB_OUTPUT
+          else
+            echo "new_tag=$version-rc1" >> $GITHUB_OUTPUT
+            echo "first_rc=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Compute next rc tag for polkadot-parachain
+        if: ${{ steps.get_rel_product.outputs.product == 'polkadot-parachain' }}
+        id: compute_tag_cumulus
+        shell: bash
+        run: |
+          . ./.github/scripts/common/lib.sh
+
+          # Get last rc tag if exists, else set it to polkadot-parachains-{version}-rc1
+          version=$(get_version_from_ghref ${GITHUB_REF})
+          echo "$version"
+          echo "version=$version" >> $GITHUB_OUTPUT
+
+          last_rc=$(get_latest_rc_tag $version polkadot-parachain)
+          if [ -n "$last_rc" ]; then
+            suffix=$(increment_rc_tag $last_rc)
+            echo "new_tag=polkadot-parachains-$version-rc$suffix" >> $GITHUB_OUTPUT
+            echo "first_rc=false" >> $GITHUB_OUTPUT
+          else
+            echo "new_tag=polkadot-parachain-$version-rc1" >> $GITHUB_OUTPUT
+            echo "first_rc=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Apply new tag
+        uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
+        with:
+          # We can't use the normal GITHUB_TOKEN for the following reason:
+          # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
+          # RELEASE_BRANCH_TOKEN requires public_repo OAuth scope
+          repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
+          tag: ${{ steps.compute_tag_polkadot.outputs.new_tag || steps.compute_tag_cumulus.outputs.new_tag }}
+
+      # - id: create-issue
+      #   uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
+      #   # Only create the issue if it's the first release candidate
+      #   if: steps.compute_tag.outputs.first_rc == 'true'
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #     VERSION: ${{ steps.compute_tag.outputs.version }}
+      #   with:
+      #     filename: .github/ISSUE_TEMPLATE/release.md
+
+      - name: Send Matrix message to ${{ matrix.channel.name }}
+        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
+        # if: steps.create-issue.outputs.url != ''
+        with:
+          room_id: ${{ matrix.channel.room }}
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: m.parity.io
+          message: |
+            Release process for polkadot ${{ steps.compute_tag_polkadot.outputs.new_tag || steps.compute_tag_cumulus.outputs.new_tag }} has been started.<br/>

.github/workflows/release-99_notif-published.yml

@@ -0,0 +1,61 @@
+name: Release - Announce release to Matrix rooms
+on:
+  release:
+    types:
+      - published
+      - prereleased
+
+jobs:
+  ping_matrix:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        channel:
+          # Internal
+          - name: 'RelEng: Cumulus Release Coordination'
+            room: '!NAEMyPAHWOiOQHsvus:parity.io'
+            pre-releases: true
+          - name: "RelEng: Polkadot Release Coordination"
+            room: '!cqAmzdIcbOFwrdrubV:parity.io'
+            pre-release: true
+          - name: 'General: Rust, Polkadot, Substrate'
+            room: '!aJymqQYtCjjqImFLSb:parity.io'
+            pre-release: false
+          - name: 'Team: DevOps'
+            room: '!lUslSijLMgNcEKcAiE:parity.io'
+            pre-release: true
+
+         # External
+          - name: 'Ledger <> Polkadot Coordination'
+            room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
+            pre-release: true
+
+          # Public
+          # - name: '#KusamaValidatorLounge:polkadot.builders'
+          #   room: '!LhjZccBOqFNYKLdmbb:polkadot.builders'
+          #   pre-releases: false
+          # - name: '#kusama-announcements:matrix.parity.io'
+          #   room: '!FMwxpQnYhRCNDRsYGI:matrix.parity.io'
+          #   pre-release: false
+          # - name: '#polkadotvalidatorlounge:web3.foundation'
+          #   room: '!NZrbtteFeqYKCUGQtr:matrix.parity.io'
+          #   pre-release: false
+          # - name: '#polkadot-announcements:matrix.parity.io'
+          #   room: '!UqHPWiCBGZWxrmYBkF:matrix.parity.io'
+          #   pre-release: false
+
+    steps:
+      - name: Matrix notification to ${{ matrix.channel.name }}
+        if: github.event.release.prerelease == false || matrix.channel.pre-release
+        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
+        with:
+          room_id: ${{ matrix.channel.room }}
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: m.parity.io
+          message: |
+            A (pre)release has been ${{github.event.action}} in **${{github.event.repository.full_name}}:**<br/>
+            Release version: [${{github.event.release.tag_name}}](${{github.event.release.html_url}})
+
+            -----
+
+            ${{github.event.release.body}}

bridges/primitives/test-utils/Cargo.toml

@@ -12,7 +12,7 @@ bp-parachains = { path = "../parachains", default-features = false }
 bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
-ed25519-dalek = { version = "2.0", default-features = false }
+ed25519-dalek = { version = "2.1", default-features = false }
 finality-grandpa = { version = "0.16.2", default-features = false }
 sp-application-crypto = { path = "../../../substrate/primitives/application-crypto", default-features = false }
 sp-consensus-grandpa = { path = "../../../substrate/primitives/consensus/grandpa", default-features = false }

bridges/zombienet/helpers/native-assets-balance-increased.js

@@ -0,0 +1,20 @@
+async function run(nodeName, networkInfo, args) {
+    const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName];
+    const api = await zombie.connect(wsUri, userDefinedTypes);
+
+    const accountAddress = args[0];
+    const initialAccountData = await api.query.system.account(accountAddress);
+    const initialAccountBalance = initialAccountData.data['free'];
+    while (true) {
+        const accountData = await api.query.system.account(accountAddress);
+        const accountBalance = accountData.data['free'];
+        if (accountBalance > initialAccountBalance) {
+            return accountBalance;
+        }
+
+        // else sleep and retry
+        await new Promise((resolve) => setTimeout(resolve, 12000));
+    }
+}
+
+module.exports = { run }

bridges/zombienet/run-tests.sh

@@ -14,6 +14,9 @@ export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_B
 export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH
 export ZOMBIENET_BINARY_PATH=~/local_bridge_testing/bin/zombienet-linux
 
+# check if `wait` supports -p flag
+if [ `printf "$BASH_VERSION\n5.1" | sort -V | head -n 1` = "5.1" ]; then IS_BASH_5_1=1; else IS_BASH_5_1=0; fi
+
 # bridge configuration
 export LANE_ID="00000002"
 
@@ -66,12 +69,19 @@ do
     # wait until all tests are completed
     relay_exited=0
     for n in `seq 1 $TEST_COPROCS_COUNT`; do
-        wait -n -p COPROC_PID
-        exit_code=$?
-        coproc_name=${TEST_COPROCS[$COPROC_PID, 0]}
-        coproc_log=${TEST_COPROCS[$COPROC_PID, 1]}
-        coproc_stdout=$(cat $coproc_log)
-        relay_exited=$(expr "${coproc_name}" == "relay")
+        if [ "$IS_BASH_5_1" -eq 1 ]; then
+            wait -n -p COPROC_PID
+            exit_code=$?
+            coproc_name=${TEST_COPROCS[$COPROC_PID, 0]}
+            coproc_log=${TEST_COPROCS[$COPROC_PID, 1]}
+            coproc_stdout=$(cat $coproc_log)
+            relay_exited=$(expr "${coproc_name}" == "relay")
+        else
+            wait -n
+            exit_code=$?
+            coproc_name="<unknown>"
+            coproc_stdout="<unknown>"
+        fi
         echo "Process $coproc_name has finished with exit code: $exit_code"
 
         # if exit code is not zero, exit

bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl

@@ -1,8 +1,8 @@
-Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub
+Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
 Network: ../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
 Creds: config
 
-# step 1: initialize Westend asset hub
+# step 1: initialize Westend AH
 asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "init-asset-hub-westend-local" within 240 seconds
 asset-hub-westend-collator1: js-script ../helpers/wait-hrmp-channel-opened.js with "1002" within 400 seconds
 
@@ -12,15 +12,23 @@ bridge-hub-westend-collator1: run ../scripts/invoke-script.sh with "init-bridge-
 # step 3: relay is started elsewhere - let's wait until with-Rococo GRANPDA pallet is initialized at Westend
 bridge-hub-westend-collator1: js-script ../helpers/best-finalized-header-at-bridged-chain.js with "Rococo,0" within 400 seconds
 
-# step 2: send WOC to Rococo
+# step 4: send WND to //Alice on Rococo AH
+# (that's a required part of a sibling 0001-asset-transfer-works-westend-to-rococo.zndsl test)
 asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "reserve-transfer-assets-from-asset-hub-westend-local" within 60 seconds
 
-# step 3: elsewhere Rococo has sent ROC to //Alice - let's wait for it
+# step 5: elsewhere Rococo has sent ROC to //Alice - let's wait for it
 asset-hub-westend-collator1: js-script ../helpers/wrapped-assets-balance.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY,0,Rococo" within 600 seconds
 
-# step 4: check that the relayer //Charlie is rewarded by both our AH and target AH
+# step 6: check that the relayer //Charlie is rewarded by both our AH and target AH
 bridge-hub-westend-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x6268726f,BridgedChain,0" within 300 seconds
 bridge-hub-westend-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x6268726F,ThisChain,0" within 300 seconds
 
+# step 7: send wROC back to Alice at Rococo AH
+asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "withdraw-reserve-assets-from-asset-hub-westend-local" within 60 seconds
+
+# step 8: elsewhere Rococo has sent wWND to //Alice - let's wait for it
+# (we wait until //Alice account increases here - there are no other transactionc that may increase it)
+asset-hub-westend-collator1: js-script ../helpers/native-assets-balance-increased.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY" within 600 seconds
+
 # wait until other network test has completed OR exit with an error too
 asset-hub-westend-collator1: run ../scripts/sync-exit.sh within 600 seconds