merge master and resolve conflicts (v8)

* master: (61 commits) OpenGov in Westend and Rococo (#1177) Associated type Hasher for `QueryPreimage`, `StorePreimage` and `Bounded` (#1720) Migrate polkadot-primitives to v6 (#1543) genesis-builder: implemented for all runtimes (#1492) `BlockId` removal: `tx-pool` refactor (#1678) Bump directories from 4.0.1 to 5.0.1 (#1656) Allow debug_assertions in short-benchmarks CI job (#1711) chainHead/storage: Fix storage iteration using the query key (#1665) Implement more useful traits in `Slot` type (#1595) Make downloads in parallel and give more time to complete (#1699) Bump actions/checkout from 4.0.0 to 4.1.0 (#1688) contracts: Fix incorrect storage alias in mirgration (#1687) Fix documentation about justification and `finalized == true` requirement (#1607) tweak pallet macro (genesis_config etc) to cater for RA users as well. (#1689) Uncoupling pallet-xcm from frame-system's RuntimeCall (#1684) Bump aes-gcm from 0.10.2 to 0.10.3 (#1681) docs / Update PR template to reflect monorepo (#1674) update contributing guide and ui-tests scripts (#1668) pallet epm: add `TrimmingStatus` to the mined solution (#1659) Update HRMP pallet benchmarking to use benchmarks v2 (#1676) ...
paritytech · Sep 27, 2023 · 6fb4b7f · 6fb4b7f
2 parents 5e7655f + 69ed308
commit 6fb4b7f
Show file tree

Hide file tree

Showing 449 changed files with 16,542 additions and 10,454 deletions.
diff --git a/cumulus/.github/ISSUE_TEMPLATE/blank.md → .github/ISSUE_TEMPLATE/blank.md b/cumulus/.github/ISSUE_TEMPLATE/blank.md → .github/ISSUE_TEMPLATE/blank.md
diff --git a/substrate/.github/ISSUE_TEMPLATE/bug.yaml → .github/ISSUE_TEMPLATE/bug_report.yaml b/substrate/.github/ISSUE_TEMPLATE/bug.yaml → .github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,6 +1,7 @@
 name: Bug Report
 description: Let us know about an issue you experienced with this software
-# labels: ["some existing label","another one"]
+labels: [ I2-bug, I10-unconfirmed ]
+
 body:
   - type: checkboxes
     attributes:
@@ -20,7 +21,7 @@ body:
     id: bug
     attributes:
       label: Description of bug
-      # description: What seems to be the problem?
+      description: What seems to be the problem?
       # placeholder: Describe the problem.
     validations:
       required: true

diff --git a/substrate/.github/ISSUE_TEMPLATE/config.yml → .github/ISSUE_TEMPLATE/config.yml b/substrate/.github/ISSUE_TEMPLATE/config.yml → .github/ISSUE_TEMPLATE/config.yml
diff --git a/...trate/.github/ISSUE_TEMPLATE/feature.yaml → .github/ISSUE_TEMPLATE/feature.yaml b/...trate/.github/ISSUE_TEMPLATE/feature.yaml → .github/ISSUE_TEMPLATE/feature.yaml
@@ -1,6 +1,6 @@
 name: Feature Request
 description: Submit your requests and suggestions to improve!
-labels: ["J0-enhancement"]
+labels: [ I5-enhancement ]
 body:
   - type: checkboxes
     id: existing

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
@@ -14,7 +14,7 @@ jobs:
       NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - uses: actions/setup-node@v3.8.1
         with:
           node-version: "18.x"

diff --git a/.github/workflows/check-markdown.yml b/.github/workflows/check-markdown.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - uses: actions/setup-node@v3.8.1
         with:

diff --git a/.github/workflows/check-prdoc.yml b/.github/workflows/check-prdoc.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Checkout repo
         if: ${{ !contains(steps.get-labels.outputs.labels, 'R0') }}
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
 
       - name: PRdoc check for PR#${{ github.event.pull_request.number }}
         if: ${{ !contains(steps.get-labels.outputs.labels, 'R0') }}

diff --git a/.github/workflows/fmt-check.yml b/.github/workflows/fmt-check.yml
@@ -16,7 +16,7 @@ jobs:
     container:
       image: paritytech/ci-unified:bullseye-1.70.0-2023-05-23-v20230706
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - name: Cargo fmt
         run: cargo +nightly fmt --all -- --check
diff --git a/.github/workflows/release-50_publish-docker.yml b/.github/workflows/release-50_publish-docker.yml
@@ -79,7 +79,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       #TODO: this step will be needed when automated triggering will work
         #this step runs only if the workflow is triggered automatically when new release is published
@@ -117,7 +117,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - name: Get artifacts from cache
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
@@ -196,10 +196,10 @@ jobs:
           ./docker/scripts/build-injected.sh
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.CUMULUS_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.CUMULUS_DOCKERHUB_TOKEN }}
 
       - name: Push Container image for ${{ env.BINARY }}
         id: docker_push
@@ -239,10 +239,10 @@ jobs:
     needs: fetch-latest-debian-package-version
     steps:
       - name: Checkout sources
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # v2.1.0
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
 
       - name: Cache Docker layers
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
@@ -255,8 +255,8 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.POLKADOT_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.POLKADOT_DOCKERHUB_TOKEN }}
 
       - name: Fetch values
         id: fetch-data
@@ -266,7 +266,7 @@ jobs:
 
       - name: Build and push
         id:   docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #  v5.0.0
         with:
           push: true
           file: docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ variables:
   RUSTY_CACHIER_COMPRESSION_METHOD: zstd
   NEXTEST_FAILURE_OUTPUT: immediate-final
   NEXTEST_SUCCESS_OUTPUT: final
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.67"
+  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.68"
   DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
 
 default:

diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml
@@ -127,7 +127,7 @@ build-implementers-guide:
     - .kubernetes-env
     - .common-refs
     - .run-immediately
-    # - .collect-artifacts
+    - .collect-artifacts
   # git depth is set on purpose: https://github.com/paritytech/polkadot/issues/6284
   variables:
     GIT_STRATEGY: clone

diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml
@@ -16,6 +16,8 @@ publish-rustdoc:
   needs:
     - job: build-rustdoc
       artifacts: true
+    - job: build-implementers-guide
+      artifacts: true
   script:
     # If $CI_COMMIT_REF_NAME doesn't match one of $RUSTDOCS_DEPLOY_REFS space-separated values, we
     # exit immediately.
@@ -34,15 +36,21 @@ publish-rustdoc:
     - git fetch origin gh-pages
     # Save README and docs
     - cp -r ./crate-docs/ /tmp/doc/
+    - cp -r ./artifacts/book/ /tmp/
     - cp README.md /tmp/doc/
     # we don't need to commit changes because we copy docs to /tmp
     - git checkout gh-pages --force
+    # Enable if docs needed for other refs
     # Install `index-tpl-crud` and generate index.html based on RUSTDOCS_DEPLOY_REFS
-    - which index-tpl-crud &> /dev/null || yarn global add @substrate/index-tpl-crud
-    - index-tpl-crud upsert ./index.html ${CI_COMMIT_REF_NAME}
+    # - which index-tpl-crud &> /dev/null || yarn global add @substrate/index-tpl-crud
+    # - index-tpl-crud upsert ./index.html ${CI_COMMIT_REF_NAME}
     # Ensure the destination dir doesn't exist.
     - rm -rf ${CI_COMMIT_REF_NAME}
+    - rm -rf book/
     - mv -f /tmp/doc ${CI_COMMIT_REF_NAME}
+    # dir for implementors guide
+    - mkdir -p book
+    - mv /tmp/book/html/* book/
     # Upload files
     - git add --all
     # `git commit` has an exit code of > 0 if there is nothing to commit.

diff --git a/.gitlab/pipeline/short-benchmarks.yml b/.gitlab/pipeline/short-benchmarks.yml
@@ -5,7 +5,7 @@
 
 # run short-benchmarks for relay chain runtimes from polkadot
 
-short-benchmark-polkadot: &short-bench
+short-benchmark-westend: &short-bench
   stage: short-benchmarks
   extends:
     - .docker-env
@@ -14,22 +14,18 @@ short-benchmark-polkadot: &short-bench
     - job: build-short-benchmark
       artifacts: true
   variables:
-    RUNTIME: polkadot
+    RUNTIME: westend
+    # Enable debug assertions since we are running optimized builds for testing
+    # but still want to have debug assertions.
+    RUSTFLAGS: "-C debug-assertions -D warnings"
+    RUST_BACKTRACE: "full"
+    WASM_BUILD_NO_COLOR: 1
+    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
   tags:
     - benchmark
   script:
     - ./artifacts/polkadot benchmark pallet --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
-short-benchmark-kusama:
-  <<: *short-bench
-  variables:
-    RUNTIME: kusama
-
-short-benchmark-westend:
-  <<: *short-bench
-  variables:
-    RUNTIME: westend
-
 # run short-benchmarks for system parachain runtimes from cumulus
 
 .short-benchmark-cumulus: &short-bench-cumulus
@@ -42,6 +38,12 @@ short-benchmark-westend:
       artifacts: true
   variables:
     RUNTIME_CHAIN: benchmarked-runtime-chain
+    # Enable debug assertions since we are running optimized builds for testing
+    # but still want to have debug assertions.
+    RUSTFLAGS: "-C debug-assertions -D warnings"
+    RUST_BACKTRACE: "full"
+    WASM_BUILD_NO_COLOR: 1
+    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
   tags:
     - benchmark
   script:

diff --git a/.gitlab/pipeline/test.yml b/.gitlab/pipeline/test.yml
@@ -314,8 +314,8 @@ node-bench-regression-guard:
       --compare-with artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
   after_script: [""]
 
-# if this fails (especially after rust version upgrade) run
-# ./substrate/.maintain/update-rust-stable.sh <rust_version>
+# if this fails run `bot update-ui` in the Pull Request or "./scripts/update-ui-tests.sh" locally
+# see ./docs/CONTRIBUTING.md#ui-tests
 test-frame-ui:
   stage: test
   extends:

diff --git a/.gitlab/pipeline/zombienet/cumulus.yml b/.gitlab/pipeline/zombienet/cumulus.yml
@@ -5,7 +5,7 @@
   before_script:
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE}"
-    - echo "${RELAY_IMAGE}"
+    - echo "${POLKADOT_IMAGE}"
     - echo "${COL_IMAGE}"
     - echo "${GH_DIR}"
     - echo "${LOCAL_DIR}"

diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml
@@ -110,7 +110,7 @@ zombienet-polkadot-smoke-0001-parachains-smoke-test:
     - .zombienet-polkadot-common
   before_script:
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
-    - export COL_IMAGE="docker.io/paritypr/colander:4519" # The collator image is fixed
+    - export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
     - echo "Zombienet Tests Config"
     - echo "gh-dir ${GH_DIR}"
     - echo "local-dir ${LOCAL_DIR}"
@@ -127,12 +127,12 @@ zombienet-polkadot-smoke-0002-parachains-parachains-upgrade-smoke:
     - .zombienet-polkadot-common
   before_script:
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
-    - export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
+    - export CUMULUS_IMAGE="docker.io/paritypr/polkadot-parachain-debug:${DOCKER_IMAGES_VERSION}"
     - echo "Zombienet Tests Config"
     - echo "gh-dir ${GH_DIR}"
     - echo "local-dir ${LOCAL_DIR}"
     - echo "polkadot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
-    - echo "colander image ${COL_IMAGE}"
+    - echo "polkadot-parachain image ${CUMULUS_IMAGE}"
     - echo "malus image ${MALUS_IMAGE}"
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
@@ -193,27 +193,3 @@ zombienet-polkadot-malus-0001-dispute-valid:
     - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
       --local-dir="${LOCAL_DIR}/integrationtests"
       --test="0001-dispute-valid-block.zndsl"
-
-zombienet-polkadot-async-backing-compatibility:
-  extends:
-    - .zombienet-polkadot-common
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
-      --local-dir="${LOCAL_DIR}/async_backing"
-      --test="001-async-backing-compatibility.zndsl"
-
-zombienet-polkadot-async-backing-runtime-upgrade:
-  extends:
-    - .zombienet-polkadot-common
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
-      --local-dir="${LOCAL_DIR}/async_backing"
-      --test="002-async-backing-runtime-upgrade.zndsl"
-
-zombienet-polkadot-async-backing-collator-mix:
-  extends:
-    - .zombienet-polkadot-common
-  script:
-    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
-      --local-dir="${LOCAL_DIR}/async_backing"
-      --test="003-async-backing-collator-mix.zndsl"