Merge pull request #876 from KILTprotocol/release-1.15.2

Release 1.15.2

Author: Ad96el

.cargo-deny.toml

@@ -15,6 +15,9 @@ ignore = [
   { id = "RUSTSEC-2024-0336", reason = "`rustls` vulnerability. Re-verify upon next polkadot-sdk updates." },
   { id = "RUSTSEC-2024-0344", reason = "`curve25519-dalek` vulnerability. Re-verify upon next polkadot-sdk updates." },
   { 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"
 

.cargo/config.toml

@@ -0,0 +1,97 @@
+# Unfortunately we cannot add any lints based on `cfg(test)` nor `cfg(feature = "feat")`: https://github.com/rust-lang/cargo/issues/8170.
+# Hence, we can only define lints that are applied codebase-wide (including tests), and lints that are applied only to runtime code.
+
+# Codebase-wide lints.
+[target.'cfg(all())']
+rustflags = [
+  # We need to deny warnings here instead of with the `RUSTFLAGS` env since the env variable would completely override these settings -> https://github.com/rust-lang/cargo/issues/5376.
+  "-Dwarnings",
+  "-Wclippy::as_underscore",
+  "-Wclippy::assertions_on_result_states",
+  "-Wclippy::branches_sharing_code",
+  "-Wclippy::clear_with_drain",
+  "-Wclippy::clone_on_ref_ptr",
+  "-Wclippy::collection_is_never_read",
+  "-Wclippy::derive_partial_eq_without_eq",
+  "-Wclippy::else_if_without_else",
+  "-Wclippy::empty_drop",
+  "-Wclippy::empty_structs_with_brackets",
+  "-Wclippy::equatable_if_let",
+  "-Wclippy::if_then_some_else_none",
+  "-Wclippy::impl_trait_in_params",
+  "-Wclippy::iter_on_empty_collections",
+  "-Wclippy::iter_on_single_items",
+  "-Wclippy::iter_with_drain",
+  "-Wclippy::needless_collect",
+  "-Wclippy::needless_pass_by_ref_mut",
+  "-Wclippy::negative_feature_names",
+  "-Wclippy::option_if_let_else",
+  "-Wclippy::or_fun_call",
+  "-Wclippy::pub_without_shorthand",
+  "-Wclippy::redundant_clone",
+  "-Wclippy::redundant_type_annotations",
+  "-Wclippy::ref_patterns",
+  "-Wclippy::rest_pat_in_fully_bound_structs",
+  "-Wclippy::suspicious_operation_groupings",
+  "-Wclippy::tests_outside_test_module",
+  "-Wclippy::type_repetition_in_bounds",
+  "-Wclippy::unnecessary_self_imports",
+  "-Wclippy::unnecessary_struct_initialization",
+  "-Wclippy::unneeded_field_pattern",
+  "-Wclippy::unused_peekable",
+  "-Wclippy::useless_let_if_seq",
+  "-Wclippy::wildcard_dependencies",
+  # TODO: Add after upgrading to 1.76
+  # "-Wclippy::infinite_loop",
+  # TODO: Add after upgrading to 1.77
+  #"-Wclippy::empty_enum_variants_with_brackets"
+  # TODO: Add after upgrading to 1.80
+  #"-Wclippy::renamed_function_params"
+  # TODO: Add after upgrading to 1.81
+  #"-Wclippy::cfg_not_test"
+  #"-Wclippy::allow_attributes",
+  # "-Wclippy::allow_attributes_without_reason",
+  # TODO: Add after upgrading to 1.83
+  #"-Wclippy::unused_trait_names"
+]
+
+# Deployment runtime lints.
+[target.'cfg(target_arch = "wasm32")']
+rustflags = [
+  "-Dclippy::arithmetic_side_effects",
+  "-Dclippy::as_conversions",
+  "-Dclippy::assertions_on_result_states",
+  "-Dclippy::cast_possible_wrap",
+  "-Dclippy::dbg_macro",
+  "-Dclippy::expect_used",
+  "-Dclippy::float_arithmetic",
+  "-Dclippy::float_cmp_const",
+  "-Dclippy::index_refutable_slice",
+  "-Dclippy::indexing_slicing",
+  "-Dclippy::lossy_float_literal",
+  "-Dclippy::modulo_arithmetic",
+  "-Dclippy::panic",
+  "-Dclippy::string_slice",
+  "-Dclippy::todo",
+  "-Dclippy::unimplemented",
+  "-Dclippy::unreachable",
+  "-Dclippy::unwrap_used",
+  "-Funsafe_code",
+  "-Wclippy::alloc_instead_of_core",
+  "-Wclippy::decimal_literal_representation",
+  "-Wclippy::default_numeric_fallback",
+  "-Wclippy::error_impl_error",
+  "-Wclippy::integer_division",
+  "-Wclippy::let_underscore_must_use",
+  "-Wclippy::let_underscore_untyped",
+  "-Wclippy::missing_const_for_fn",
+  "-Wclippy::mixed_read_write_in_expression",
+  "-Wclippy::print_stderr",
+  "-Wclippy::print_stdout",
+  "-Wclippy::shadow_reuse",
+  "-Wclippy::shadow_same",
+  "-Wclippy::shadow_unrelated",
+  "-Wclippy::str_to_string",
+  "-Wclippy::string_slice",
+  "-Wclippy::string_to_string",
+]

.github/workflows/check-code.yml

@@ -39,16 +39,19 @@ jobs:
     env:
       # Configured by the Docker image. We can't change this unless the image does it.
       CARGO_HOME: /usr/local/cargo
-      RUSTFLAGS: -D warnings
       SKIP_WASM_BUILD: 1
     needs: get-commit-head
     if: ${{ !contains(needs.get-commit-head.outputs.headCommitMsg, 'ci-skip-rust') }}
 
     strategy:
       matrix:
-        features:
-          -
-          - --all-features
+        cargo-flags:
+          # Generic clippy checks for all features
+          - --all-targets --all-features
+          # Generic clippy checks for no features (catches some missing `no_std`-only lints)
+          - --all-targets
+          # Clippy lints specifically for all runtime code, excluding all test and binary crates
+          - --target wasm32-unknown-unknown --no-default-features --workspace --exclude kilt-parachain --exclude standalone-node --exclude xcm-integration-tests --exclude 'dip-provider*' --exclude 'dip-consumer*'
       fail-fast: false
 
     steps:
@@ -63,11 +66,11 @@ jobs:
             ${{ env.CARGO_HOME }}/registry/index/
             ${{ env.CARGO_HOME }}/registry/cache/
             ${{ env.CARGO_HOME }}/git/db/
-          key: ${{ github.job }}-${{ github.ref }}-${{ matrix.features }}-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ github.job }}-${{ github.ref }}-${{ matrix.cargo-flags }}-${{ hashFiles('**/Cargo.lock') }}
           save-always: true
 
       - name: Run `cargo clippy`
-        run: cargo clippy --all-targets --locked ${{ matrix.features }}
+        run: cargo clippy --locked --no-deps ${{ matrix.cargo-flags }}
 
   cargo-fmt:
     name: Check formatting

.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

@@ -20,6 +20,8 @@ build-production-wasm:
     - export PARACHAIN_PALLET_ID=0x50
     - 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
@@ -77,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

.maintain/media/kilt.png

@@ -13,8 +13,8 @@
 {{/each}}
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(clippy::as_conversions)]
 
 use frame_support::{traits::Get, weights::Weight};
 use sp_std::marker::PhantomData;