feat: bump substrate deps to polkadot-sdk 1.6 (#4504)

Co-authored-by: Assem Hasna <[email protected]> Co-authored-by: Alastair Holmes <[email protected]>
chainflip-io · Feb 19, 2024 · 4a0a97b · 4a0a97b
1 parent cb12b67
commit 4a0a97b
Show file tree

Hide file tree

Showing 141 changed files with 3,160 additions and 3,092 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -32,25 +32,17 @@ tree --no-default-features --depth 1 --edges=features,normal
 # The `cf-audit` command is configured to ignore the following advisories:
 # Vulnerabilities:
 # - RUSTSEC-2022-0093: This advisory is related to ed25519-dalek's public api design, which we don't expose.
-# - RUSTSEC-2023-0052: This advisory comes from webpki, a dependency of ethers-rs. CPU denial of service in certificate path building. We don't use this functionality.
 # Unsound:
 # - RUSTSEC-2021-0145: This advisory only affects the windows platform. It's a transitive dependency of `substrate`.
 # Unmaintained:
 # - RUSTSEC-2020-0168: This advisory comes from `mach`, which is unmaintained but not a security issue. It's a dependency of `subxt`.
-# - RUSTSEC-2021-0059: This is a transitive dependency of libp2p and will be fixed in an upcoming release.
-# - RUSTSEC-2021-0060: This is a transitive dependency of libp2p and will be fixed in an upcoming release.
 # - RUSTSEC-2021-0139: This advisory comes from `ansi_term`, which is unmaintained but not a security issue. It's a dependency of `subxt`.
 # - RUSTSEC-2022-0061: This advisory is related to the deprecated `parity-wasm`, not a security issue. It's a dependency of `substrate`.
-# - RUSTSEC-2023-0074: Related to zerocopy, this is a transitive dependency. We can update this when we update substrate.
 cf-audit = '''
 audit -D unmaintained -D unsound
     --ignore RUSTSEC-2022-0093
-    --ignore RUSTSEC-2023-0052
-    --ignore RUSTSEC-2021-0145
-    --ignore RUSTSEC-2020-0168
-    --ignore RUSTSEC-2021-0059
-    --ignore RUSTSEC-2021-0060
     --ignore RUSTSEC-2021-0139
+    --ignore RUSTSEC-2020-0168
     --ignore RUSTSEC-2022-0061
-    --ignore RUSTSEC-2023-0074
+    --ignore RUSTSEC-2021-0145
 '''
diff --git a/.github/workflows/_01_pre_check.yml b/.github/workflows/_01_pre_check.yml
@@ -11,7 +11,7 @@ jobs:
   cargo-fmt:
     runs-on: [hetzner]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-20.04"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-20.04-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -25,7 +25,7 @@ jobs:
   audit:
     runs-on: [hetzner]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-20.04"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-20.04-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -38,7 +38,7 @@ jobs:
   cargo-clippy:
     runs-on: [hetzner]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-20.04"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-20.04-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -53,7 +53,7 @@ jobs:
   lint-bouncer:
     runs-on: [hetzner]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-20.04"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-20.04-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/_10_test.yml b/.github/workflows/_10_test.yml
@@ -12,7 +12,7 @@ jobs:
   unit-tests:
     runs-on: [hetzner]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-20.04"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-20.04-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/_11_coverage.yml b/.github/workflows/_11_coverage.yml
@@ -4,7 +4,7 @@ on:
       test_features:
         description: Features to enable in tests
         type: string
-        default: 'runtime-benchmarks,slow-tests'
+        default: "runtime-benchmarks,slow-tests"
 
 env:
   FORCE_COLOR: 1
@@ -17,7 +17,7 @@ jobs:
   unit-tests:
     runs-on: [hetzner]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-20.04"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-20.04-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -36,7 +36,7 @@ jobs:
   coverage:
     runs-on: [hetzner]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-20.04"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-20.04-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/_20_build.yml b/.github/workflows/_20_build.yml
@@ -29,7 +29,7 @@ jobs:
       matrix:
         ubuntu_version: [20.04, 22.04]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-${{ matrix.ubuntu_version }}-27"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-${{ matrix.ubuntu_version }}-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/_25_package.yml b/.github/workflows/_25_package.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         ubuntu_version: [20.04, 22.04]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-${{ matrix.ubuntu_version }}-27"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-${{ matrix.ubuntu_version }}-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ci-benchmarks.yml b/.github/workflows/ci-benchmarks.yml
@@ -13,7 +13,7 @@ jobs:
         ubuntu_version: [20.04]
         profile: [release, production]
     container:
-      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2023-07-31-ubuntu-${{ matrix.ubuntu_version }}-27"
+      image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-${{ matrix.ubuntu_version }}-44"
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/docker-build-rust-base.yml b/.github/workflows/docker-build-rust-base.yml
@@ -28,7 +28,10 @@ jobs:
 
       - name: Get toolchain version
         id: toolchain
-        run: echo "rust_toolchain=$(grep 'channel' rust-toolchain.toml | sed -n -e 's/^.*channel = "\(.*\)".*$/\1/p')" >> $GITHUB_OUTPUT
+        run: |
+          RUST_TOOLCHAIN=$(grep 'channel' rust-toolchain.toml | sed -n -e 's/^.*channel = "\(.*\)".*$/\1/p')
+          echo "Found Rust Toolchain: $RUST_TOOLCHAIN"
+          echo "rust_toolchain=$RUST_TOOLCHAIN" >> $GITHUB_OUTPUT
 
       - name: Set Image Tags
         id: image_tags
@@ -39,6 +42,9 @@ jobs:
             echo "image_tag=${{ steps.toolchain.outputs.rust_toolchain }}-ubuntu-${{ matrix.ubuntu_version }}" >> $GITHUB_OUTPUT
           fi
 
+      - name: Debug | Check Docker Image Tag
+        run: echo "Docker Image Tag output ${{ steps.image_tags.outputs.image_tag }}"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3