Merge branch 'develop' into ag_taplo

Author: Ad96el

.cargo-deny.toml

@@ -17,6 +17,7 @@ ignore = [
   { id = "RUSTSEC-2024-0370", reason = "`proc-macro-error` is unmaintained but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
   { id = "RUSTSEC-2024-0384", reason = "`instant` is unmaintained but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
   { id = "RUSTSEC-2024-0388", reason = "`derivative` is unmaintained but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
+  { id = "RUSTSEC-2024-0421", reason = "`idna` has a security vulnerability but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
 ]
 yanked = "deny"
 

.github/workflows/check-docs-pr.yml

@@ -0,0 +1,43 @@
+name: Docs PR Check
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  check-docs-pr:
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Check for Skip Label
+        run: |
+          if gh pr view ${{ github.event.pull_request.number }} --json labels --jq '.labels | .[].name' | grep -q 'ci-skip-docs-pr'; then
+            echo "SKIP_DOCS_PR_CHECK=true" >> $GITHUB_ENV
+          else
+            echo "SKIP_DOCS_PR_CHECK=false" >> $GITHUB_ENV
+          fi
+
+      - name: Ensure Linked Docs PR
+        if: env.SKIP_DOCS_PR_CHECK == 'false'
+        env:
+          DOCS_REPO: KILTprotocol/docs
+          PR_NO: ${{ github.event.pull_request.number }}
+        run: |
+          DOCS_PRS=$(gh pr list --repo $DOCS_REPO --json number,body,title --jq '.[]')
+
+          MATCHING_PR=$(echo "$DOCS_PRS" | jq -r "select(.body | contains(\"#${PR_NO}\") or .title | contains(\"#${PR_NO}\"))")
+
+          if [ -z "$MATCHING_PR" ]; then
+            echo "Please link a docs PR for code PR #${PR_NO} or apply the 'ci-skip-docs-pr' label."
+            exit 1
+          else
+            echo "Matching docs PR found for code PR #${PR_NOPR_NO}."
+          fi

.gitlab-ci.yml

@@ -21,6 +21,7 @@ build-production-wasm:
     - export AUTHORIZE_UPGRADE_PREFIX=0x02
     - export AUTHORIZE_UPGRADE_CHECK_VERSION=true
     - export VERBOSE=true
+    - export BUILD_OPTS="--features metadata-hash"
     - cp -r * /build
     - /srtool/build build
     - subwasm meta --format=json+scale /out/${RUNTIME}_runtime.compact.wasm > /out/${RUNTIME}-metadata.json
@@ -78,12 +79,9 @@ build-docker-images:
     DOCKER_HUB_DIP_PROVIDER_TEMPLATE: "kiltprotocol/dip-provider-node-template"
     DOCKER_HUB_DIP_CONSUMER_TEMPLATE: "kiltprotocol/dip-consumer-node-template"
   before_script:
-    - aws --version
     - docker --version
   script:
     - echo -n $CI_REGISTRY_TOKEN | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
-    - aws ecr get-login-password | docker login --username AWS --password-stdin $AWS_REGISTRY
-    - ./.maintain/docker-auth-config.sh
 
     - ./.maintain/build-image.sh build
     - "if [[ ! -z ${CI_COMMIT_BRANCH} ]]; then ./.maintain/push-image.sh build ${CI_COMMIT_SHORT_SHA}; fi"

.maintain/build-image.sh

@@ -7,10 +7,10 @@ target_tag=$1
 # Build the builder image and push it in the background
 docker build \
     --target builder \
-    --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
-    -t $AWS_REGISTRY/kilt-parachain/collator:builder \
+    --cache-from $CI_REGISTRY/$ORGANIZATION/kilt-node:builder \
+    -t $CI_REGISTRY/$ORGANIZATION/kilt-node:builder \
     . &
-docker push $AWS_REGISTRY/kilt-parachain/collator:builder &
+docker push $CI_REGISTRY/$ORGANIZATION/kilt-node:builder &
 
 wait
 
@@ -21,19 +21,19 @@ build_and_tag() {
     local cache_image=$3
 
     docker build \
-        --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
-        --cache-from $AWS_REGISTRY/$cache_image:$target_tag \
+        --cache-from $CI_REGISTRY/$ORGANIZATION/kilt-node:builder \
+        --cache-from $CI_REGISTRY/$ORGANIZATION/$cache_image:$target_tag \
         --build-arg NODE_TYPE=$node_type \
         -t local/$image_name:$target_tag \
         .
 }
 
-build_and_tag "kilt-parachain" "kilt-node" "kilt-parachain/collator" &
+build_and_tag "kilt-parachain" "kilt-node" "kilt-node" &
 
-build_and_tag "standalone-node" "standalone-node" "kilt/prototype-chain" &
+build_and_tag "standalone-node" "standalone-node" "standalone-node" &
 
-build_and_tag "dip-provider-node-template" "dip-provider-node-template" "kilt-parachain/collator" &
+build_and_tag "dip-provider-node-template" "dip-provider-node-template" "kilt-node" &
 
-build_and_tag "dip-consumer-node-template" "dip-consumer-node-template" "kilt-parachain/collator" &
+build_and_tag "dip-consumer-node-template" "dip-consumer-node-template" "kilt-node" &
 
 wait

.maintain/docker-auth-config.sh

@@ -21,10 +21,4 @@ tag_and_push local/kilt-node:$source_tag ${DOCKER_HUB_PARACHAIN}:$target_tag
 tag_and_push local/$PROVIDER_BIN_NAME:$source_tag ${DOCKER_HUB_DIP_PROVIDER_TEMPLATE}:$target_tag
 tag_and_push local/$CONSUMER_BIN_NAME:$source_tag ${DOCKER_HUB_DIP_CONSUMER_TEMPLATE}:$target_tag
 
-# Tag and push to AWS
-tag_and_push local/standalone-node:$source_tag $AWS_REGISTRY/standalone-node:$target_tag
-tag_and_push local/kilt-node:$source_tag $AWS_REGISTRY/kilt-node:$target_tag
-tag_and_push local/$PROVIDER_BIN_NAME:$source_tag $AWS_REGISTRY/$PROVIDER_BIN_NAME:$target_tag
-tag_and_push local/$CONSUMER_BIN_NAME:$source_tag $AWS_REGISTRY/$CONSUMER_BIN_NAME:$target_tag
-
 wait