diff --git a/.cargo/config.toml b/.cargo/config.toml
index 66b28b3485d8..4796a2c26965 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -29,4 +29,5 @@ rustflags = [
"-Aclippy::needless_option_as_deref", # false positives
"-Aclippy::derivable_impls", # false positives
"-Aclippy::stable_sort_primitive", # prefer stable sort
+ "-Aclippy::extra-unused-type-parameters", # stylistic
]
diff --git a/.github/workflows/burnin-label-notification.yml b/.github/workflows/burnin-label-notification.yml
index 5b9fbcab9662..536f8fa2a3f6 100644
--- a/.github/workflows/burnin-label-notification.yml
+++ b/.github/workflows/burnin-label-notification.yml
@@ -6,12 +6,19 @@ on:
jobs:
notify-devops:
runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ channel:
+ - name: 'Team: DevOps'
+ room: '!lUslSijLMgNcEKcAiE:parity.io'
+
steps:
- - name: Notify devops
- if: github.event.label.name == 'A1-needsburnin'
- uses: s3krit/matrix-message-action@v0.0.3
+ - name: Send Matrix message to ${{ matrix.channel.name }}
+ if: startsWith(github.event.label.name, 'A1-')
+ uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
with:
- room_id: ${{ secrets.POLKADOT_DEVOPS_MATRIX_ROOM_ID }}
- access_token: ${{ secrets.POLKADOT_DEVOPS_MATRIX_ACCESS_TOKEN }}
- message: "@room Burn-in request received for the following PR: ${{ github.event.pull_request.html_url }}"
- server: "matrix.parity.io"
+ room_id: ${{ matrix.channel.room }}
+ access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+ server: m.parity.io
+ message: |
+ @room Burn-in request received for the following PR: ${{ github.event.pull_request.html_url }}
diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index a4c8d5d97424..1e654f7b3070 100644
--- a/.github/workflows/check-licenses.yml
+++ b/.github/workflows/check-licenses.yml
@@ -8,8 +8,8 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout sources
- uses: actions/checkout@v3.3.0
- - uses: actions/setup-node@v3.7.0
+ uses: actions/checkout@v3
+ - uses: actions/setup-node@v3.8.1
with:
node-version: '18.x'
registry-url: 'https://npm.pkg.github.com'
diff --git a/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_candidate.yml
index be12406317fa..54a937a7819a 100644
--- a/.github/workflows/release-10_candidate.yml
+++ b/.github/workflows/release-10_candidate.yml
@@ -7,6 +7,12 @@ on:
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@v3
@@ -33,6 +39,7 @@ jobs:
echo "new_tag=$version-rc1" >> $GITHUB_OUTPUT
echo "first_rc=true" >> $GITHUB_OUTPUT
fi
+
- name: Apply new tag
uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
with:
@@ -41,6 +48,7 @@ jobs:
# RELEASE_BRANCH_TOKEN requires public_repo OAuth scope
repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
tag: ${{ steps.compute_tag.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
@@ -50,11 +58,14 @@ jobs:
VERSION: ${{ steps.compute_tag.outputs.version }}
with:
filename: .github/ISSUE_TEMPLATE/release.md
- - name: Send Matrix message
- uses: s3krit/matrix-message-action@v0.0.3
+
+ - 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: ${{ secrets.INTERNAL_POLKADOT_MATRIX_ROOM_ID }}
- access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
- server: "matrix.parity.io"
- message: "Release process for polkadot ${{ steps.compute_tag.outputs.version }} has been started. Tracking issue: ${{ steps.create-issue.outputs.url }}"
+ 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.outputs.version }} has been started.
+ Tracking issue: ${{ steps.create-issue.outputs.url }}
diff --git a/.github/workflows/release-30_publish-draft-release.yml b/.github/workflows/release-30_publish-draft-release.yml
index 475943666335..206b1871d80a 100644
--- a/.github/workflows/release-30_publish-draft-release.yml
+++ b/.github/workflows/release-30_publish-draft-release.yml
@@ -40,7 +40,7 @@ jobs:
- name: Build ${{ matrix.runtime }} runtime
id: srtool_build
- uses: chevdor/srtool-actions@v0.7.0
+ uses: chevdor/srtool-actions@v0.8.0
with:
image: paritytech/srtool
chain: ${{ matrix.runtime }}
@@ -181,11 +181,19 @@ jobs:
post_to_matrix:
runs-on: ubuntu-latest
needs: publish-draft-release
+ strategy:
+ matrix:
+ channel:
+ - name: "RelEng: Polkadot Release Coordination"
+ room: '!cqAmzdIcbOFwrdrubV:parity.io'
+
steps:
- - name: Internal polkadot channel
- uses: s3krit/matrix-message-action@v0.0.3
+ - name: Send Matrix message to ${{ matrix.channel.name }}
+ uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
with:
- room_id: ${{ secrets.INTERNAL_POLKADOT_MATRIX_ROOM_ID }}
- access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
- message: "**New version of polkadot tagged**: ${{ github.ref }}
Draft release created: ${{ needs.publish-draft-release.outputs.release_url }}"
- server: "matrix.parity.io"
+ room_id: ${{ matrix.channel.room }}
+ access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+ server: m.parity.io
+ message: |
+ **New version of polkadot tagged**: ${{ github.ref }}
+ Draft release created: ${{ needs.publish-draft-release.outputs.release_url }}
diff --git a/.github/workflows/release-40_publish-rc-image.yml b/.github/workflows/release-40_publish-rc-image.yml
new file mode 100644
index 000000000000..3d91c5b8c682
--- /dev/null
+++ b/.github/workflows/release-40_publish-rc-image.yml
@@ -0,0 +1,132 @@
+name: Release - Publish RC Container image
+# see https://github.com/paritytech/release-engineering/issues/97#issuecomment-1651372277
+
+on:
+ workflow_dispatch:
+ inputs:
+ release_id:
+ description: |
+ Release ID.
+ You can find it using the command:
+ curl -s \
+ -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/$OWNER/$REPO/releases | \
+ jq '.[] | { name: .name, id: .id }'
+ required: true
+ type: string
+ registry:
+ description: "Container registry"
+ required: true
+ type: string
+ default: docker.io
+ owner:
+ description: Owner of the container image repo
+ required: true
+ type: string
+ default: parity
+
+env:
+ RELEASE_ID: ${{ inputs.release_id }}
+ ENGINE: docker
+ REGISTRY: ${{ inputs.registry }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ DOCKER_OWNER: ${{ inputs.owner || github.repository_owner }}
+ REPO: ${{ github.repository }}
+
+jobs:
+ fetch-artifacts:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout sources
+ uses: actions/checkout@v3
+
+ - name: Fetch all artifacts
+ run: |
+ . ./scripts/ci/common/lib.sh
+ fetch_release_artifacts
+
+ - name: Cache the artifacts
+ uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+ with:
+ key: artifacts-${{ github.sha }}
+ path: |
+ ./release-artifacts/**/*
+
+ build-container:
+ runs-on: ubuntu-latest
+ needs: fetch-artifacts
+
+ strategy:
+ matrix:
+ binary: ["polkadot", "staking-miner"]
+
+ steps:
+ - name: Checkout sources
+ uses: actions/checkout@v3
+
+ - name: Get artifacts from cache
+ uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+ with:
+ key: artifacts-${{ github.sha }}
+ fail-on-cache-miss: true
+ path: |
+ ./release-artifacts/**/*
+
+ - name: Check sha256 ${{ matrix.binary }}
+ working-directory: ./release-artifacts
+ run: |
+ . ../scripts/ci/common/lib.sh
+
+ echo "Checking binary ${{ matrix.binary }}"
+ check_sha256 ${{ matrix.binary }} && echo "OK" || echo "ERR"
+
+ - name: Check GPG ${{ matrix.binary }}
+ working-directory: ./release-artifacts
+ run: |
+ . ../scripts/ci/common/lib.sh
+ import_gpg_keys
+ check_gpg ${{ matrix.binary }}
+
+ - name: Fetch commit and tag
+ id: fetch_refs
+ run: |
+ release=release-${{ inputs.release_id }} && \
+ echo "release=${release}" >> $GITHUB_OUTPUT
+
+ commit=$(git rev-parse --short HEAD) && \
+ echo "commit=${commit}" >> $GITHUB_OUTPUT
+
+ tag=$(git name-rev --tags --name-only $(git rev-parse HEAD)) && \
+ [ "${tag}" != "undefined" ] && echo "tag=${tag}" >> $GITHUB_OUTPUT || \
+ echo "No tag, doing without"
+
+ - name: Build Injected Container image for ${{ matrix.binary }}
+ env:
+ BIN_FOLDER: ./release-artifacts
+ BINARY: ${{ matrix.binary }}
+ TAGS: ${{join(steps.fetch_refs.outputs.*, ',')}}
+ run: |
+ echo "Building container for ${{ matrix.binary }}"
+ ./scripts/ci/dockerfiles/build-injected.sh
+
+ - name: Login to Dockerhub
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+ - name: Push Container image for ${{ matrix.binary }}
+ id: docker_push
+ env:
+ BINARY: ${{ matrix.binary }}
+ run: |
+ $ENGINE images | grep ${BINARY}
+ $ENGINE push --all-tags ${REGISTRY}/${DOCKER_OWNER}/${BINARY}
+
+ - name: Check version for the published image for ${{ matrix.binary }}
+ env:
+ BINARY: ${{ matrix.binary }}
+ RELEASE_TAG: ${{ steps.fetch_refs.outputs.release }}
+ run: |
+ echo "Checking tag ${RELEASE_TAG} for image ${REGISTRY}/${DOCKER_OWNER}/${BINARY}"
+ $ENGINE run -i ${REGISTRY}/${DOCKER_OWNER}/${BINARY}:${RELEASE_TAG} --version
diff --git a/.github/workflows/release-50_publish-docker-release.yml b/.github/workflows/release-50_publish-docker-release.yml
index a6bf19162a46..81e5caa718f3 100644
--- a/.github/workflows/release-50_publish-docker-release.yml
+++ b/.github/workflows/release-50_publish-docker-release.yml
@@ -30,7 +30,7 @@ jobs:
uses: docker/build-push-action@v4
with:
push: true
- file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
+ file: scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
tags: |
parity/polkadot:latest
parity/polkadot:${{ github.event.release.tag_name }}
diff --git a/.github/workflows/release-51_publish-docker-manual.yml b/.github/workflows/release-51_publish-docker-manual.yml
index 0c973d33b71c..919769f8700d 100644
--- a/.github/workflows/release-51_publish-docker-manual.yml
+++ b/.github/workflows/release-51_publish-docker-manual.yml
@@ -37,7 +37,7 @@ jobs:
uses: docker/build-push-action@v4
with:
push: true
- file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
+ file: scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
tags: |
parity/polkadot:latest
parity/polkadot:${{ github.event.inputs.version }}
diff --git a/.github/workflows/release-99_bot.yml b/.github/workflows/release-99_bot.yml
index 370ab9653109..5d45c0d44eda 100644
--- a/.github/workflows/release-99_bot.yml
+++ b/.github/workflows/release-99_bot.yml
@@ -21,17 +21,29 @@ jobs:
- name: '#polkadot-announcements:matrix.parity.io'
room: '!UqHPWiCBGZWxrmYBkF:matrix.parity.io'
pre-release: false
+ - name: "RelEng: Polkadot Release Coordination"
+ room: '!cqAmzdIcbOFwrdrubV:parity.io'
+ pre-release: true
- name: 'Ledger <> Polkadot Coordination'
room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
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
runs-on: ubuntu-latest
steps:
- name: Send Matrix message to ${{ matrix.channel.name }}
if: github.event.release.prerelease == false || matrix.channel.pre-release
- uses: s3krit/matrix-message-action@v0.0.3
+ uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
with:
room_id: ${{ matrix.channel.room }}
- access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
- server: "m.parity.io"
- message: "***Polkadot ${{github.event.release.tag_name}} has been released!***
${{github.event.release.html_url}}
${{github.event.release.body}}
"
+ access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+ server: m.parity.io
+ message: |
+ ***Polkadot ${{github.event.release.tag_name}} has been released!***
+ ${{github.event.release.html_url}}
+ ${{github.event.release.body}}
diff --git a/.gitignore b/.gitignore
index 0c6913dac340..61ef9e91a55e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@ polkadot.*
!polkadot.service
.DS_Store
.env
+
+artifacts
+release-artifacts
+release.json
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5056012e588e..b2d91e61da94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,12 +33,12 @@ variables:
GIT_STRATEGY: fetch
GIT_DEPTH: 100
CI_SERVER_NAME: "GitLab CI"
- CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
+ CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.55"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.65"
default:
cache: {}
@@ -159,31 +159,39 @@ default:
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
.build-push-image:
+ variables:
+ CI_IMAGE: "${BUILDAH_IMAGE}"
+
+ REGISTRY: "docker.io"
+ DOCKER_OWNER: "paritypr"
+ DOCKER_USER: "${PARITYPR_USER}"
+ DOCKER_PASS: "${PARITYPR_PASS}"
+ IMAGE: "${REGISTRY}/${DOCKER_OWNER}/${IMAGE_NAME}"
+
+ ENGINE: "${BUILDAH_COMMAND}"
+ BUILDAH_FORMAT: "docker"
+ SKIP_IMAGE_VALIDATION: 1
+
+ PROJECT_ROOT: "."
+ BIN_FOLDER: "./artifacts"
+ VCS_REF: "${CI_COMMIT_SHA}"
+
before_script:
- !reference [.common-before-script, before_script]
- test -s ./artifacts/VERSION || exit 1
- test -s ./artifacts/EXTRATAG || exit 1
- - VERSION="$(cat ./artifacts/VERSION)"
+ - export VERSION="$(cat ./artifacts/VERSION)"
- EXTRATAG="$(cat ./artifacts/EXTRATAG)"
- echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
script:
- test "$DOCKER_USER" -a "$DOCKER_PASS" ||
( echo "no docker credentials provided"; exit 1 )
- - cd ./artifacts
- - $BUILDAH_COMMAND build
- --format=docker
- --build-arg VCS_REF="${CI_COMMIT_SHA}"
- --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
- --build-arg IMAGE_NAME="${IMAGE_NAME}"
- --tag "$IMAGE_NAME:$VERSION"
- --tag "$IMAGE_NAME:$EXTRATAG"
- --file ${DOCKERFILE} .
- # The job will success only on the protected branch
+ - TAGS="${VERSION},${EXTRATAG}" scripts/ci/dockerfiles/build-injected.sh
- echo "$DOCKER_PASS" |
- buildah login --username "$DOCKER_USER" --password-stdin docker.io
+ buildah login --username "$DOCKER_USER" --password-stdin "${REGISTRY}"
- $BUILDAH_COMMAND info
- - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$VERSION"
- - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$EXTRATAG"
+ - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE:$VERSION"
+ - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE:$EXTRATAG"
after_script:
- buildah logout --all
@@ -225,7 +233,7 @@ include:
file: /common/timestamp.yml
- project: parity/infrastructure/ci_cd/shared
ref: main
- file: /common/ci-unified.yml
+ file: /common/ci-unified.yml
#### stage: .post
diff --git a/Cargo.lock b/Cargo.lock
index b164cc0120ea..3271f6671401 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,6 +21,15 @@ dependencies = [
"gimli",
]
+[[package]]
+name = "addr2line"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
[[package]]
name = "adler"
version = "1.0.2"
@@ -39,7 +48,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
]
[[package]]
@@ -48,7 +57,7 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"rand_core 0.6.4",
]
@@ -59,7 +68,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
dependencies = [
"crypto-common",
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
]
[[package]]
@@ -96,20 +105,6 @@ dependencies = [
"cpufeatures",
]
-[[package]]
-name = "aes-gcm"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da"
-dependencies = [
- "aead 0.3.2",
- "aes 0.6.0",
- "cipher 0.2.5",
- "ctr 0.6.0",
- "ghash 0.3.1",
- "subtle",
-]
-
[[package]]
name = "aes-gcm"
version = "0.9.4"
@@ -164,37 +159,58 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
"once_cell",
"version_check",
]
[[package]]
name = "ahash"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
dependencies = [
"cfg-if",
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
"once_cell",
"version_check",
]
[[package]]
name = "aho-corasick"
-version = "0.7.18"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
[[package]]
name = "always-assert"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf688625d06217d5b1bb0ea9d9c44a1635fd0ee3534466388d18203174f4d11"
+checksum = "4436e0292ab1bb631b42973c61205e704475fe8126af845c8d923c0996328127"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
[[package]]
name = "anes"
@@ -228,15 +244,15 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
[[package]]
name = "anstyle-parse"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
dependencies = [
"utf8parse",
]
@@ -262,15 +278,15 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.69"
+version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
[[package]]
name = "approx"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
dependencies = [
"num-traits",
]
@@ -291,9 +307,9 @@ dependencies = [
[[package]]
name = "arbitrary"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d47fbf90d5149a107494b15a7dc8d69b351be2db3bb9691740e88ec17fd880"
+checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
[[package]]
name = "arc-swap"
@@ -301,6 +317,164 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+[[package]]
+name = "ark-bls12-381"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
+dependencies = [
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+ "itertools",
+ "num-traits",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ed-on-bls12-381-bandersnatch"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "digest 0.10.7",
+ "itertools",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "rustc_version",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "ark-secret-scalar"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "ark-transcript",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-serialize-derive",
+ "ark-std",
+ "digest 0.10.7",
+ "num-bigint",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "ark-transcript"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "sha3",
+]
+
[[package]]
name = "array-bytes"
version = "6.1.0"
@@ -309,9 +483,9 @@ checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd"
[[package]]
name = "arrayref"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
[[package]]
name = "arrayvec"
@@ -321,9 +495,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "asn1-rs"
@@ -338,14 +512,14 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
- "time 0.3.17",
+ "time 0.3.25",
]
[[package]]
name = "asn1-rs"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
dependencies = [
"asn1-rs-derive 0.4.0",
"asn1-rs-impl",
@@ -354,7 +528,7 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
- "time 0.3.17",
+ "time 0.3.25",
]
[[package]]
@@ -394,13 +568,14 @@ dependencies = [
[[package]]
name = "assert_cmd"
-version = "2.0.4"
+version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e"
+checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6"
dependencies = [
+ "anstyle",
"bstr",
"doc-comment",
- "predicates",
+ "predicates 3.0.3",
"predicates-core",
"predicates-tree",
"wait-timeout",
@@ -414,39 +589,40 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
[[package]]
name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
dependencies = [
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
"event-listener",
"futures-core",
]
[[package]]
name = "async-io"
-version = "1.6.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
dependencies = [
- "concurrent-queue 1.2.2",
+ "async-lock",
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
"futures-lite",
- "libc",
"log",
- "once_cell",
"parking",
"polling",
+ "rustix 0.37.23",
"slab",
- "socket2",
+ "socket2 0.4.9",
"waker-fn",
- "winapi",
]
[[package]]
name = "async-lock"
-version = "2.4.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
dependencies = [
"event-listener",
]
@@ -459,38 +635,38 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "async-trait"
-version = "0.1.68"
+version = "0.1.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "asynchronous-codec"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182"
+checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568"
dependencies = [
"bytes",
"futures-sink",
"futures-util",
"memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
]
[[package]]
name = "atomic-waker"
-version = "1.0.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
[[package]]
name = "atty"
@@ -511,24 +687,45 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.67"
+version = "0.3.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
dependencies = [
- "addr2line",
+ "addr2line 0.20.0",
"cc",
"cfg-if",
"libc",
- "miniz_oxide 0.6.2",
- "object",
+ "miniz_oxide",
+ "object 0.31.1",
"rustc-demangle",
]
+[[package]]
+name = "bandersnatch_vrfs"
+version = "0.0.1"
+source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "dleq_vrf",
+ "fflonk",
+ "merlin 3.0.0",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "ring 0.1.0",
+ "sha2 0.10.7",
+ "zeroize",
+]
+
[[package]]
name = "base-x"
-version = "0.2.8"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
[[package]]
name = "base16ct"
@@ -544,27 +741,36 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "base64"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "base64ct"
-version = "1.5.2"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "basic-toml"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6"
+dependencies = [
+ "serde",
+]
[[package]]
name = "beef"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736"
+checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
dependencies = [
"serde",
]
@@ -572,7 +778,7 @@ dependencies = [
[[package]]
name = "binary-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"hash-db",
"log",
@@ -593,19 +799,19 @@ version = "0.65.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cexpr",
"clang-sys",
"lazy_static",
"lazycell",
"peeking_take_while",
- "prettyplease",
+ "prettyplease 0.2.12",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -614,6 +820,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
[[package]]
name = "bitvec"
version = "1.0.1"
@@ -632,7 +844,7 @@ version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -642,33 +854,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
dependencies = [
"arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq 0.2.4",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.2.6",
]
[[package]]
name = "blake2s_simd"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4"
+checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f"
dependencies = [
"arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq 0.1.5",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.2.6",
]
[[package]]
name = "blake3"
-version = "1.3.1"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f"
+checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
dependencies = [
"arrayref",
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
"cc",
"cfg-if",
- "constant_time_eq 0.1.5",
- "digest 0.10.6",
+ "constant_time_eq 0.3.0",
+ "digest 0.10.7",
]
[[package]]
@@ -689,16 +901,16 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
]
[[package]]
name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
]
[[package]]
@@ -755,13 +967,13 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
[[package]]
name = "bstr"
-version = "0.2.17"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
dependencies = [
- "lazy_static",
"memchr",
- "regex-automata",
+ "regex-automata 0.3.4",
+ "serde",
]
[[package]]
@@ -775,9 +987,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "byte-slice-cast"
@@ -793,9 +1005,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
[[package]]
name = "bytemuck"
-version = "1.13.0"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
[[package]]
name = "byteorder"
@@ -820,26 +1032,20 @@ dependencies = [
"pkg-config",
]
-[[package]]
-name = "cache-padded"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
-
[[package]]
name = "camino"
-version = "1.1.2"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
dependencies = [
"serde",
]
[[package]]
name = "cargo-platform"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
+checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
dependencies = [
"serde",
]
@@ -852,7 +1058,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
dependencies = [
"camino",
"cargo-platform",
- "semver 1.0.16",
+ "semver 1.0.18",
"serde",
"serde_json",
"thiserror",
@@ -866,11 +1072,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.0.79"
+version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
dependencies = [
"jobserver",
+ "libc",
]
[[package]]
@@ -895,9 +1102,9 @@ dependencies = [
[[package]]
name = "cfg-expr"
-version = "0.15.1"
+version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9"
+checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
dependencies = [
"smallvec",
]
@@ -941,22 +1148,24 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.19"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
- "libc",
- "num-integer",
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
"num-traits",
- "time 0.1.44",
+ "time 0.1.45",
+ "wasm-bindgen",
"winapi",
]
[[package]]
name = "ciborium"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
dependencies = [
"ciborium-io",
"ciborium-ll",
@@ -965,15 +1174,15 @@ dependencies = [
[[package]]
name = "ciborium-io"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
[[package]]
name = "ciborium-ll"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
dependencies = [
"ciborium-io",
"half",
@@ -998,7 +1207,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
]
[[package]]
@@ -1007,7 +1216,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
]
[[package]]
@@ -1031,9 +1240,9 @@ dependencies = [
[[package]]
name = "clang-sys"
-version = "1.3.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
dependencies = [
"glob",
"libc",
@@ -1042,15 +1251,15 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.2.23"
+version = "3.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
dependencies = [
"atty",
- "bitflags",
- "clap_derive 3.2.18",
+ "bitflags 1.3.2",
+ "clap_derive 3.2.25",
"clap_lex 0.2.4",
- "indexmap",
+ "indexmap 1.9.3",
"once_cell",
"strsim",
"termcolor",
@@ -1059,33 +1268,32 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.2.5"
+version = "4.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819"
+checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
dependencies = [
"clap_builder",
- "clap_derive 4.2.0",
+ "clap_derive 4.3.12",
"once_cell",
]
[[package]]
name = "clap_builder"
-version = "4.2.5"
+version = "4.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
+checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
dependencies = [
"anstream",
"anstyle",
- "bitflags",
- "clap_lex 0.4.1",
+ "clap_lex 0.5.0",
"strsim",
]
[[package]]
name = "clap_derive"
-version = "3.2.18"
+version = "3.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
dependencies = [
"heck",
"proc-macro-error",
@@ -1096,14 +1304,14 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.2.0"
+version = "4.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -1117,15 +1325,15 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "coarsetime"
-version = "0.1.22"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46"
+checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354"
dependencies = [
"libc",
"once_cell",
@@ -1145,9 +1353,9 @@ dependencies = [
[[package]]
name = "color-eyre"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ebf286c900a6d5867aeff75cfee3192857bb7f24b547d4f0df2ed6baa812c90"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
dependencies = [
"backtrace",
"eyre",
@@ -1164,15 +1372,29 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "comfy-table"
-version = "7.0.0"
+version = "7.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e1f7e5d046697d34b593bdba8ee31f4649366e452a2ccabb3baf3511e503d1"
+checksum = "9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b"
dependencies = [
"strum",
"strum_macros",
"unicode-width",
]
+[[package]]
+name = "common"
+version = "0.1.0"
+source = "git+https://github.com/w3f/ring-proof#0e948f3c28cbacecdd3020403c4841c0eb339213"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "fflonk",
+ "merlin 3.0.0",
+]
+
[[package]]
name = "common-path"
version = "1.0.0"
@@ -1181,52 +1403,65 @@ checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
[[package]]
name = "concurrent-queue"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
-dependencies = [
- "cache-padded",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "console"
-version = "0.15.5"
+version = "0.15.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
dependencies = [
"encode_unicode",
"lazy_static",
"libc",
"unicode-width",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
name = "const-oid"
-version = "0.9.2"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
+
+[[package]]
+name = "const-random"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e"
+dependencies = [
+ "const-random-macro",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
+dependencies = [
+ "getrandom 0.2.10",
+ "once_cell",
+ "proc-macro-hack",
+ "tiny-keccak",
+]
[[package]]
name = "constant_time_eq"
-version = "0.1.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
[[package]]
name = "constant_time_eq"
-version = "0.2.4"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
[[package]]
name = "convert_case"
@@ -1236,9 +1471,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "core-foundation"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1246,9 +1481,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "core2"
@@ -1261,9 +1496,18 @@ dependencies = [
[[package]]
name = "cpp_demangle"
-version = "0.3.4"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "cpp_demangle"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931ab2a3e6330a07900b8e7ca4e106cdcbb93f2b9a52df55e54ee53d8305b55d"
+checksum = "ee34052ee3d93d6d8f3e6f81d85c47921f6653a19a7b70e939e3e602d893a674"
dependencies = [
"cfg-if",
]
@@ -1280,19 +1524,13 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.1"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
dependencies = [
"libc",
]
-[[package]]
-name = "cpuid-bool"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
-
[[package]]
name = "cranelift-bforest"
version = "0.95.1"
@@ -1393,18 +1631,18 @@ dependencies = [
[[package]]
name = "crc"
-version = "3.0.0"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
+checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
dependencies = [
"crc-catalog",
]
[[package]]
name = "crc-catalog"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff"
+checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
[[package]]
name = "crc32fast"
@@ -1425,7 +1663,7 @@ dependencies = [
"atty",
"cast",
"ciborium",
- "clap 3.2.23",
+ "clap 3.2.25",
"criterion-plot",
"itertools",
"lazy_static",
@@ -1451,9 +1689,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.5"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -1461,9 +1699,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
dependencies = [
"cfg-if",
"crossbeam-epoch",
@@ -1472,22 +1710,22 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.5"
+version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
+ "autocfg",
"cfg-if",
"crossbeam-utils",
- "lazy_static",
- "memoffset 0.6.4",
+ "memoffset 0.9.0",
"scopeguard",
]
[[package]]
name = "crossbeam-queue"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -1495,9 +1733,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
]
@@ -1514,7 +1752,7 @@ version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"rand_core 0.6.4",
"subtle",
"zeroize",
@@ -1526,7 +1764,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"rand_core 0.6.4",
"subtle",
"zeroize",
@@ -1538,7 +1776,7 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"rand_core 0.6.4",
"typenum",
]
@@ -1549,17 +1787,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
- "generic-array 0.14.6",
- "subtle",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"subtle",
]
@@ -1569,29 +1797,10 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"subtle",
]
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ctr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
-dependencies = [
- "cipher 0.2.5",
-]
-
[[package]]
name = "ctr"
version = "0.8.0"
@@ -1638,23 +1847,37 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-rc.1"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16"
+checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2"
dependencies = [
"cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.7",
"fiat-crypto",
- "packed_simd_2",
"platforms",
+ "rustc_version",
"subtle",
"zeroize",
]
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
+]
+
[[package]]
name = "cxx"
-version = "1.0.80"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
+checksum = "f68e12e817cb19eaab81aaec582b4052d07debd3c3c6b083b9d361db47c7dc9d"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1664,9 +1887,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.80"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
+checksum = "e789217e4ab7cf8cc9ce82253180a9fe331f35f5d339f0ccfe0270b39433f397"
dependencies = [
"cc",
"codespan-reporting",
@@ -1674,31 +1897,31 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 1.0.109",
+ "syn 2.0.28",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.80"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"
+checksum = "78a19f4c80fd9ab6c882286fa865e92e07688f4387370a209508014ead8751d0"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.80"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
+checksum = "b8fcfa71f66c8563c4fa9dd2bb68368d50267856f831ac5d85367e0805f9606c"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.28",
]
[[package]]
name = "darling"
-version = "0.14.2"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
dependencies = [
"darling_core",
"darling_macro",
@@ -1706,9 +1929,9 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.14.2"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
dependencies = [
"fnv",
"ident_case",
@@ -1720,26 +1943,39 @@ dependencies = [
[[package]]
name = "darling_macro"
-version = "0.14.2"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [
"darling_core",
"quote",
"syn 1.0.109",
]
+[[package]]
+name = "dashmap"
+version = "5.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.0",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.8",
+]
+
[[package]]
name = "data-encoding"
-version = "2.3.2"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
name = "data-encoding-macro"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca"
+checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99"
dependencies = [
"data-encoding",
"data-encoding-macro-internal",
@@ -1747,9 +1983,9 @@ dependencies = [
[[package]]
name = "data-encoding-macro-internal"
-version = "0.1.10"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
+checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772"
dependencies = [
"data-encoding",
"syn 1.0.109",
@@ -1766,9 +2002,9 @@ dependencies = [
[[package]]
name = "der"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f"
+checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
dependencies = [
"const-oid",
"pem-rfc7468",
@@ -1801,11 +2037,11 @@ dependencies = [
[[package]]
name = "der-parser"
-version = "8.1.0"
+version = "8.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
dependencies = [
- "asn1-rs 0.5.1",
+ "asn1-rs 0.5.2",
"displaydoc",
"nom",
"num-bigint",
@@ -1813,6 +2049,12 @@ dependencies = [
"rusticata-macros",
]
+[[package]]
+name = "deranged"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
+
[[package]]
name = "derivative"
version = "2.2.0"
@@ -1881,9 +2123,9 @@ dependencies = [
[[package]]
name = "diff"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
[[package]]
name = "difflib"
@@ -1906,16 +2148,16 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
]
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
"const-oid",
"crypto-common",
"subtle",
@@ -1942,9 +2184,9 @@ dependencies = [
[[package]]
name = "dirs-sys"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
dependencies = [
"libc",
"redox_users",
@@ -1964,20 +2206,36 @@ dependencies = [
[[package]]
name = "displaydoc"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.28",
]
[[package]]
name = "dissimilar"
-version = "1.0.3"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd"
+checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
+
+[[package]]
+name = "dleq_vrf"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-secret-scalar",
+ "ark-serialize",
+ "ark-std",
+ "ark-transcript",
+ "arrayvec 0.7.4",
+ "rand_core 0.6.4",
+ "zeroize",
+]
[[package]]
name = "dlmalloc"
@@ -1996,18 +2254,18 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "docify"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6491709f76fb7ceb951244daf624d480198b427556084391d6e3c33d3ae74b9"
+checksum = "029de870d175d11969524d91a3fb2cbf6d488b853bff99d41cf65e533ac7d9d2"
dependencies = [
"docify_macros",
]
[[package]]
name = "docify_macros"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc5338a9f72ce29a81377d9039798fcc926fb471b2004666caf48e446dffbbf"
+checksum = "cac43324656a1b05eb0186deb51f27d2d891c704c37f34de281ef6297ba193e5"
dependencies = [
"common-path",
"derive-syn-parse",
@@ -2015,8 +2273,9 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.16",
+ "syn 2.0.28",
"termcolor",
+ "toml 0.7.6",
"walkdir",
]
@@ -2028,9 +2287,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
[[package]]
name = "dtoa"
-version = "1.0.2"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
[[package]]
name = "dyn-clonable"
@@ -2055,9 +2314,9 @@ dependencies = [
[[package]]
name = "dyn-clone"
-version = "1.0.4"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
+checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272"
[[package]]
name = "ecdsa"
@@ -2065,7 +2324,7 @@ version = "0.14.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
dependencies = [
- "der 0.6.0",
+ "der 0.6.1",
"elliptic-curve 0.12.3",
"rfc6979 0.3.1",
"signature 1.6.4",
@@ -2073,12 +2332,12 @@ dependencies = [
[[package]]
name = "ecdsa"
-version = "0.16.7"
+version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
dependencies = [
"der 0.7.7",
- "digest 0.10.6",
+ "digest 0.10.7",
"elliptic-curve 0.13.5",
"rfc6979 0.4.0",
"signature 2.1.0",
@@ -2094,6 +2353,16 @@ dependencies = [
"signature 1.6.4",
]
+[[package]]
+name = "ed25519"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
+dependencies = [
+ "pkcs8 0.10.2",
+ "signature 2.1.0",
+]
+
[[package]]
name = "ed25519-dalek"
version = "1.0.1"
@@ -2101,10 +2370,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
dependencies = [
"curve25519-dalek 3.2.0",
- "ed25519",
+ "ed25519 1.5.3",
"rand 0.7.3",
"serde",
- "sha2 0.9.8",
+ "sha2 0.9.9",
+ "zeroize",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
+dependencies = [
+ "curve25519-dalek 4.0.0",
+ "ed25519 2.2.2",
+ "serde",
+ "sha2 0.10.7",
"zeroize",
]
@@ -2118,15 +2400,15 @@ dependencies = [
"hashbrown 0.12.3",
"hex",
"rand_core 0.6.4",
- "sha2 0.9.8",
+ "sha2 0.9.9",
"zeroize",
]
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "elliptic-curve"
@@ -2136,10 +2418,10 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
dependencies = [
"base16ct 0.1.1",
"crypto-bigint 0.4.9",
- "der 0.6.0",
- "digest 0.10.6",
+ "der 0.6.1",
+ "digest 0.10.7",
"ff 0.12.1",
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"group 0.12.1",
"hkdf",
"pem-rfc7468",
@@ -2158,13 +2440,13 @@ checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
dependencies = [
"base16ct 0.2.0",
"crypto-bigint 0.5.2",
- "digest 0.10.6",
+ "digest 0.10.7",
"ff 0.13.0",
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"group 0.13.0",
"pkcs8 0.10.2",
"rand_core 0.6.4",
- "sec1 0.7.1",
+ "sec1 0.7.3",
"subtle",
"zeroize",
]
@@ -2177,9 +2459,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
-version = "0.8.30"
+version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
"cfg-if",
]
@@ -2213,28 +2495,28 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "enumn"
-version = "0.1.8"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76"
+checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "env_logger"
-version = "0.7.1"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
dependencies = [
"atty",
- "humantime 1.3.0",
+ "humantime",
"log",
"regex",
"termcolor",
@@ -2242,12 +2524,12 @@ dependencies = [
[[package]]
name = "env_logger"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
dependencies = [
- "atty",
- "humantime 2.1.0",
+ "humantime",
+ "is-terminal",
"log",
"regex",
"termcolor",
@@ -2259,11 +2541,17 @@ version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
[[package]]
name = "erased-serde"
-version = "0.3.20"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd"
+checksum = "da96524cc884f6558f1769b6c46686af2fe8e8b4cd253bd5a3cdba8181b8e070"
dependencies = [
"serde",
]
@@ -2280,20 +2568,9 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
dependencies = [
"errno-dragonfly",
"libc",
@@ -2312,9 +2589,9 @@ dependencies = [
[[package]]
name = "event-listener"
-version = "2.5.1"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "exit-future"
@@ -2365,14 +2642,14 @@ dependencies = [
"fs-err",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "eyre"
-version = "0.6.5"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
dependencies = [
"indenter",
"once_cell",
@@ -2392,13 +2669,19 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
[[package]]
name = "fastrand"
-version = "1.7.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
dependencies = [
"instant",
]
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
[[package]]
name = "fatality"
version = "0.0.6"
@@ -2416,7 +2699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd"
dependencies = [
"expander 0.0.4",
- "indexmap",
+ "indexmap 1.9.3",
"proc-macro-crate",
"proc-macro2",
"quote",
@@ -2469,6 +2752,19 @@ dependencies = [
"subtle",
]
+[[package]]
+name = "fflonk"
+version = "0.1.0"
+source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "merlin 3.0.0",
+]
+
[[package]]
name = "fiat-crypto"
version = "0.1.20"
@@ -2477,24 +2773,24 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
[[package]]
name = "file-per-thread-logger"
-version = "0.1.4"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126"
+checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
dependencies = [
- "env_logger 0.7.1",
+ "env_logger 0.10.0",
"log",
]
[[package]]
name = "filetime"
-version = "0.2.17"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
- "windows-sys 0.36.1",
+ "redox_syscall 0.2.16",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2539,21 +2835,19 @@ dependencies = [
[[package]]
name = "fixedbitset"
-version = "0.4.0"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.22"
+version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
dependencies = [
- "cfg-if",
"crc32fast",
- "libc",
"libz-sys",
- "miniz_oxide 0.4.4",
+ "miniz_oxide",
]
[[package]]
@@ -2574,16 +2868,16 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
]
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
@@ -2597,7 +2891,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-support-procedural",
@@ -2622,12 +2916,12 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"Inflector",
"array-bytes",
"chrono",
- "clap 4.2.5",
+ "clap 4.3.19",
"comfy-table",
"frame-benchmarking",
"frame-support",
@@ -2670,18 +2964,18 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2698,7 +2992,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
@@ -2727,7 +3021,7 @@ dependencies = [
[[package]]
name = "frame-remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-recursion",
"futures",
@@ -2739,6 +3033,7 @@ dependencies = [
"sp-core",
"sp-io",
"sp-runtime",
+ "sp-state-machine",
"spinners",
"substrate-rpc-client",
"tokio",
@@ -2748,10 +3043,11 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"aquamarine",
- "bitflags",
+ "bitflags 1.3.2",
+ "docify",
"environmental",
"frame-metadata",
"frame-support-procedural",
@@ -2763,12 +3059,14 @@ dependencies = [
"paste",
"scale-info",
"serde",
+ "serde_json",
"smallvec",
"sp-api",
"sp-arithmetic",
"sp-core",
"sp-core-hashing-proc-macro",
"sp-debug-derive",
+ "sp-genesis-builder",
"sp-inherents",
"sp-io",
"sp-runtime",
@@ -2783,7 +3081,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"Inflector",
"cfg-expr",
@@ -2795,35 +3093,35 @@ dependencies = [
"proc-macro-warning",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "frame-support-test"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-executive",
@@ -2850,7 +3148,7 @@ dependencies = [
[[package]]
name = "frame-support-test-pallet"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
@@ -2863,7 +3161,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"cfg-if",
"frame-support",
@@ -2882,7 +3180,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2897,7 +3195,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2906,7 +3204,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2917,9 +3215,9 @@ dependencies = [
[[package]]
name = "fs-err"
-version = "2.6.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0"
+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
[[package]]
name = "fs2"
@@ -2933,21 +3231,14 @@ dependencies = [
[[package]]
name = "fs4"
-version = "0.6.3"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea55201cc351fdb478217c0fb641b59813da9b4efe4c414a9d8f989a657d149"
+checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
dependencies = [
- "libc",
- "rustix 0.35.13",
- "winapi",
+ "rustix 0.38.6",
+ "windows-sys 0.48.0",
]
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
[[package]]
name = "funty"
version = "2.0.0"
@@ -3005,16 +3296,16 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
"futures-core",
"futures-io",
"memchr",
"parking",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
"waker-fn",
]
@@ -3026,7 +3317,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -3036,7 +3327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd"
dependencies = [
"futures-io",
- "rustls 0.20.7",
+ "rustls 0.20.8",
"webpki 0.22.0",
]
@@ -3071,7 +3362,7 @@ dependencies = [
"futures-sink",
"futures-task",
"memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
"pin-utils",
"slab",
]
@@ -3088,7 +3379,7 @@ dependencies = [
[[package]]
name = "generate-bags"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"chrono",
"frame-election-provider-support",
@@ -3110,9 +3401,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -3142,25 +3433,15 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
]
-[[package]]
-name = "ghash"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
-dependencies = [
- "opaque-debug 0.3.0",
- "polyval 0.4.5",
-]
-
[[package]]
name = "ghash"
version = "0.4.4"
@@ -3183,26 +3464,26 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.27.0"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
dependencies = [
"fallible-iterator",
- "indexmap",
+ "indexmap 1.9.3",
"stable_deref_trait",
]
[[package]]
name = "glob"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
-version = "0.4.8"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"
+checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006"
dependencies = [
"aho-corasick",
"bstr",
@@ -3235,9 +3516,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.17"
+version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
dependencies = [
"bytes",
"fnv",
@@ -3245,7 +3526,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http",
- "indexmap",
+ "indexmap 1.9.3",
"slab",
"tokio",
"tokio-util",
@@ -3260,16 +3541,16 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
[[package]]
name = "handlebars"
-version = "4.2.2"
+version = "4.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b"
+checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d"
dependencies = [
"log",
"pest",
"pest_derive",
- "quick-error 2.0.1",
"serde",
"serde_json",
+ "thiserror",
]
[[package]]
@@ -3302,14 +3583,24 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+dependencies = [
+ "ahash 0.8.3",
+ "allocator-api2",
]
[[package]]
name = "heck"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
@@ -3322,9 +3613,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
[[package]]
name = "hex"
@@ -3363,16 +3654,6 @@ dependencies = [
"digest 0.9.0",
]
-[[package]]
-name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac 0.10.1",
- "digest 0.9.0",
-]
-
[[package]]
name = "hmac"
version = "0.11.0"
@@ -3389,7 +3670,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -3399,7 +3680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
dependencies = [
"digest 0.9.0",
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"hmac 0.8.1",
]
@@ -3428,9 +3709,9 @@ dependencies = [
[[package]]
name = "http"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
dependencies = [
"bytes",
"fnv",
@@ -3445,20 +3726,20 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
"bytes",
"http",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
]
[[package]]
name = "http-range-header"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
[[package]]
name = "httparse"
-version = "1.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
name = "httpdate"
@@ -3466,15 +3747,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error 1.2.3",
-]
-
[[package]]
name = "humantime"
version = "2.1.0"
@@ -3483,9 +3755,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
-version = "0.14.20"
+version = "0.14.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
dependencies = [
"bytes",
"futures-channel",
@@ -3497,8 +3769,8 @@ dependencies = [
"httparse",
"httpdate",
"itoa",
- "pin-project-lite 0.2.9",
- "socket2",
+ "pin-project-lite 0.2.10",
+ "socket2 0.4.9",
"tokio",
"tower-service",
"tracing",
@@ -3507,35 +3779,59 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.23.0"
+version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
dependencies = [
"http",
"hyper",
"log",
- "rustls 0.20.7",
+ "rustls 0.20.8",
"rustls-native-certs",
"tokio",
- "tokio-rustls 0.23.2",
+ "tokio-rustls 0.23.4",
"webpki-roots",
]
[[package]]
name = "hyper-rustls"
-version = "0.24.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
dependencies = [
+ "futures-util",
"http",
"hyper",
"log",
- "rustls 0.21.2",
+ "rustls 0.21.6",
"rustls-native-certs",
"tokio",
"tokio-rustls 0.24.1",
]
+[[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows 0.48.0",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -3555,9 +3851,9 @@ dependencies = [
[[package]]
name = "idna"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@@ -3575,9 +3871,9 @@ dependencies = [
[[package]]
name = "if-watch"
-version = "3.0.0"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e"
+checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f"
dependencies = [
"async-io",
"core-foundation",
@@ -3589,7 +3885,7 @@ dependencies = [
"rtnetlink",
"system-configuration",
"tokio",
- "windows",
+ "windows 0.34.0",
]
[[package]]
@@ -3648,22 +3944,33 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
[[package]]
name = "indexmap"
-version = "1.9.1"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
"serde",
]
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+]
+
[[package]]
name = "indicatif"
-version = "0.17.3"
+version = "0.17.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729"
+checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
dependencies = [
"console",
+ "instant",
"number_prefix",
"portable-atomic",
"unicode-width",
@@ -3675,7 +3982,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
]
[[package]]
@@ -3689,9 +3996,9 @@ dependencies = [
[[package]]
name = "integer-encoding"
-version = "3.0.2"
+version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8"
+checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
[[package]]
name = "integer-sqrt"
@@ -3723,17 +4030,11 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi 0.3.2",
"libc",
"windows-sys 0.48.0",
]
@@ -3746,48 +4047,56 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1"
[[package]]
name = "ipconfig"
-version = "0.3.0"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
dependencies = [
- "socket2",
+ "socket2 0.5.3",
"widestring",
- "winapi",
- "winreg 0.7.0",
+ "windows-sys 0.48.0",
+ "winreg 0.50.0",
]
[[package]]
name = "ipnet"
-version = "2.7.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
[[package]]
name = "is-terminal"
-version = "0.4.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes 1.0.10",
- "rustix 0.37.18",
+ "hermit-abi 0.3.2",
+ "rustix 0.38.6",
"windows-sys 0.48.0",
]
+[[package]]
+name = "is_executable"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
+dependencies = [
+ "winapi",
+]
+
[[package]]
name = "itertools"
-version = "0.10.3"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
[[package]]
name = "itoa"
-version = "1.0.4"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "jobserver"
@@ -3800,9 +4109,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.62"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
@@ -3843,7 +4152,7 @@ dependencies = [
"soketto",
"thiserror",
"tokio",
- "tokio-rustls 0.23.2",
+ "tokio-rustls 0.23.4",
"tokio-util",
"tracing",
"webpki-roots",
@@ -3856,7 +4165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b"
dependencies = [
"anyhow",
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
"async-lock",
"async-trait",
"beef",
@@ -3885,7 +4194,7 @@ checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad"
dependencies = [
"async-trait",
"hyper",
- "hyper-rustls 0.23.0",
+ "hyper-rustls 0.23.2",
"jsonrpsee-core",
"jsonrpsee-types",
"rustc-hash",
@@ -3964,22 +4273,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
dependencies = [
"cfg-if",
- "ecdsa 0.16.7",
+ "ecdsa 0.16.8",
"elliptic-curve 0.13.5",
"once_cell",
- "sha2 0.10.2",
+ "sha2 0.10.7",
]
[[package]]
name = "keccak"
-version = "0.1.0"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+dependencies = [
+ "cpufeatures",
+]
[[package]]
name = "kusama-runtime"
version = "0.9.43"
dependencies = [
+ "binary-merkle-tree",
"bitvec",
"frame-benchmarking",
"frame-election-provider-support",
@@ -3998,6 +4311,8 @@ dependencies = [
"pallet-babe",
"pallet-bags-list",
"pallet-balances",
+ "pallet-beefy",
+ "pallet-beefy-mmr",
"pallet-bounties",
"pallet-child-bounties",
"pallet-collective",
@@ -4013,6 +4328,7 @@ dependencies = [
"pallet-indices",
"pallet-membership",
"pallet-message-queue",
+ "pallet-mmr",
"pallet-multisig",
"pallet-nis",
"pallet-nomination-pools",
@@ -4054,6 +4370,7 @@ dependencies = [
"serde_json",
"smallvec",
"sp-api",
+ "sp-application-crypto",
"sp-arithmetic",
"sp-authority-discovery",
"sp-block-builder",
@@ -4070,6 +4387,7 @@ dependencies = [
"sp-session",
"sp-staking",
"sp-std",
+ "sp-storage",
"sp-tracing",
"sp-transaction-pool",
"sp-trie",
@@ -4163,15 +4481,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.142"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libflate"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0"
+checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18"
dependencies = [
"adler32",
"crc32fast",
@@ -4189,20 +4507,14 @@ dependencies = [
[[package]]
name = "libloading"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
dependencies = [
"cfg-if",
"winapi",
]
-[[package]]
-name = "libm"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
-
[[package]]
name = "libp2p"
version = "0.51.3"
@@ -4212,7 +4524,7 @@ dependencies = [
"bytes",
"futures",
"futures-timer",
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
"instant",
"libp2p-allow-block-list",
"libp2p-connection-limits",
@@ -4317,7 +4629,7 @@ dependencies = [
"libp2p-identity",
"libp2p-swarm",
"log",
- "lru 0.10.0",
+ "lru 0.10.1",
"quick-protobuf",
"quick-protobuf-codec",
"smallvec",
@@ -4332,13 +4644,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1"
dependencies = [
"bs58",
- "ed25519-dalek",
+ "ed25519-dalek 1.0.1",
"log",
"multiaddr",
"multihash",
"quick-protobuf",
"rand 0.8.5",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"thiserror",
"zeroize",
]
@@ -4349,7 +4661,7 @@ version = "0.43.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff"
dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
"asynchronous-codec",
"bytes",
"either",
@@ -4363,7 +4675,7 @@ dependencies = [
"log",
"quick-protobuf",
"rand 0.8.5",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"smallvec",
"thiserror",
"uint",
@@ -4386,7 +4698,7 @@ dependencies = [
"log",
"rand 0.8.5",
"smallvec",
- "socket2",
+ "socket2 0.4.9",
"tokio",
"trust-dns-proto",
"void",
@@ -4421,7 +4733,7 @@ dependencies = [
"once_cell",
"quick-protobuf",
"rand 0.8.5",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"snow",
"static_assertions",
"thiserror",
@@ -4463,7 +4775,7 @@ dependencies = [
"parking_lot 0.12.1",
"quinn-proto",
"rand 0.8.5",
- "rustls 0.20.7",
+ "rustls 0.20.8",
"thiserror",
"tokio",
]
@@ -4528,7 +4840,7 @@ dependencies = [
"libc",
"libp2p-core",
"log",
- "socket2",
+ "socket2 0.4.9",
"tokio",
]
@@ -4543,8 +4855,8 @@ dependencies = [
"libp2p-core",
"libp2p-identity",
"rcgen 0.10.0",
- "ring",
- "rustls 0.20.7",
+ "ring 0.16.20",
+ "rustls 0.20.8",
"thiserror",
"webpki 0.22.0",
"x509-parser 0.14.0",
@@ -4645,12 +4957,12 @@ dependencies = [
[[package]]
name = "libsecp256k1"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37"
+checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
dependencies = [
"arrayref",
- "base64 0.13.0",
+ "base64 0.13.1",
"digest 0.9.0",
"hmac-drbg",
"libsecp256k1-core",
@@ -4658,7 +4970,7 @@ dependencies = [
"libsecp256k1-gen-genmult",
"rand 0.8.5",
"serde",
- "sha2 0.9.8",
+ "sha2 0.9.9",
"typenum",
]
@@ -4693,9 +5005,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.3"
+version = "1.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
dependencies = [
"cc",
"pkg-config",
@@ -4704,18 +5016,18 @@ dependencies = [
[[package]]
name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9"
dependencies = [
"cc",
]
[[package]]
name = "linked-hash-map"
-version = "0.5.4"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linked_hash_set"
@@ -4728,36 +5040,36 @@ dependencies = [
[[package]]
name = "linregress"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52"
+checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45"
dependencies = [
"nalgebra",
]
[[package]]
name = "linux-raw-sys"
-version = "0.0.46"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
[[package]]
name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
-version = "0.3.6"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
[[package]]
name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
dependencies = [
"autocfg",
"scopeguard",
@@ -4775,20 +5087,20 @@ dependencies = [
[[package]]
name = "lru"
-version = "0.9.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17"
+checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
dependencies = [
"hashbrown 0.13.2",
]
[[package]]
name = "lru"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e"
+checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
dependencies = [
- "hashbrown 0.13.2",
+ "hashbrown 0.14.0",
]
[[package]]
@@ -4831,49 +5143,50 @@ dependencies = [
[[package]]
name = "macro_magic"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614b1304ab7877b499925b4dcc5223ff480f2646ad4db1ee7065badb8d530439"
+checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9"
dependencies = [
"macro_magic_core",
"macro_magic_macros",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "macro_magic_core"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d72c1b662d07b8e482c80d3a7fc4168e058b3bef4c573e94feb714b670f406"
+checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00"
dependencies = [
+ "const-random",
"derive-syn-parse",
"macro_magic_core_macros",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "macro_magic_core_macros"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d7d9e6e234c040dafc745c7592738d56a03ad04b1fa04ab60821deb597466a"
+checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "macro_magic_macros"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd19f13cfd2bfbd83692adfef8c244fe5109b3eb822a1fb4e0a6253b406cd81"
+checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a"
dependencies = [
"macro_magic_core",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -4894,7 +5207,7 @@ version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
]
[[package]]
@@ -4903,46 +5216,47 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
]
[[package]]
name = "matches"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "matrixmultiply"
-version = "0.3.2"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84"
+checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77"
dependencies = [
+ "autocfg",
"rawpointer",
]
[[package]]
name = "md-5"
-version = "0.10.4"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d"
+checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
name = "memchr"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memfd"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb"
+checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
dependencies = [
- "rustix 0.36.7",
+ "rustix 0.37.23",
]
[[package]]
@@ -4956,9 +5270,9 @@ dependencies = [
[[package]]
name = "memoffset"
-version = "0.6.4"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
dependencies = [
"autocfg",
]
@@ -4981,6 +5295,15 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "memory-db"
version = "0.32.0"
@@ -5002,6 +5325,18 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "merlin"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
+dependencies = [
+ "byteorder",
+ "keccak",
+ "rand_core 0.6.4",
+ "zeroize",
+]
+
[[package]]
name = "mick-jaeger"
version = "0.1.8"
@@ -5015,9 +5350,9 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minimal-lexical"
@@ -5027,39 +5362,28 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
-dependencies = [
- "adler",
- "autocfg",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
]
[[package]]
name = "mio"
-version = "0.8.5"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
- "log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "mmr-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"futures",
"log",
@@ -5078,7 +5402,7 @@ dependencies = [
[[package]]
name = "mmr-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"anyhow",
"jsonrpsee",
@@ -5093,24 +5417,24 @@ dependencies = [
[[package]]
name = "mockall"
-version = "0.11.3"
+version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326"
+checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
dependencies = [
"cfg-if",
"downcast",
"fragile",
"lazy_static",
"mockall_derive",
- "predicates",
+ "predicates 2.1.5",
"predicates-tree",
]
[[package]]
name = "mockall_derive"
-version = "0.11.3"
+version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0"
+checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
dependencies = [
"cfg-if",
"proc-macro2",
@@ -5158,9 +5482,9 @@ dependencies = [
"blake2s_simd",
"blake3",
"core2",
- "digest 0.10.6",
+ "digest 0.10.7",
"multihash-derive",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"sha3",
"unsigned-varint",
]
@@ -5201,9 +5525,9 @@ dependencies = [
[[package]]
name = "nalgebra"
-version = "0.32.1"
+version = "0.32.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a"
+checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
dependencies = [
"approx",
"matrixmultiply",
@@ -5217,9 +5541,9 @@ dependencies = [
[[package]]
name = "nalgebra-macros"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
+checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
dependencies = [
"proc-macro2",
"quote",
@@ -5232,7 +5556,16 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146"
dependencies = [
- "clap 3.2.23",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "names"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
+dependencies = [
+ "clap 3.2.25",
"rand 0.8.5",
]
@@ -5261,7 +5594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 1.3.2",
"byteorder",
"libc",
"netlink-packet-core",
@@ -5270,9 +5603,9 @@ dependencies = [
[[package]]
name = "netlink-packet-utils"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e"
+checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34"
dependencies = [
"anyhow",
"byteorder",
@@ -5297,9 +5630,9 @@ dependencies = [
[[package]]
name = "netlink-sys"
-version = "0.8.3"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027"
+checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411"
dependencies = [
"bytes",
"futures",
@@ -5310,14 +5643,14 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.24.1"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
- "memoffset 0.6.4",
+ "memoffset 0.6.5",
]
[[package]]
@@ -5326,7 +5659,7 @@ version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.7.1",
@@ -5342,13 +5675,12 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]]
name = "nom"
-version = "7.1.0"
+version = "7.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
dependencies = [
"memchr",
"minimal-lexical",
- "version_check",
]
[[package]]
@@ -5357,6 +5689,16 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
[[package]]
name = "num-bigint"
version = "0.4.3"
@@ -5370,28 +5712,28 @@ dependencies = [
[[package]]
name = "num-complex"
-version = "0.4.0"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
dependencies = [
"num-traits",
]
[[package]]
name = "num-format"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b"
+checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
"itoa",
]
[[package]]
name = "num-integer"
-version = "0.1.44"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg",
"num-traits",
@@ -5411,20 +5753,20 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.14"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
-version = "1.13.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi 0.3.2",
"libc",
]
@@ -5436,13 +5778,22 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "object"
-version = "0.30.3"
+version = "0.30.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
dependencies = [
"crc32fast",
"hashbrown 0.13.2",
- "indexmap",
+ "indexmap 1.9.3",
+ "memchr",
+]
+
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
"memchr",
]
@@ -5461,14 +5812,14 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
dependencies = [
- "asn1-rs 0.5.1",
+ "asn1-rs 0.5.2",
]
[[package]]
name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "oorandom"
@@ -5490,9 +5841,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl-probe"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "orchestra"
@@ -5537,24 +5888,21 @@ dependencies = [
[[package]]
name = "os_str_bytes"
-version = "6.0.0"
+version = "6.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
+checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
[[package]]
-name = "output_vt100"
-version = "0.1.2"
+name = "overload"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
-dependencies = [
- "winapi",
-]
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "owo-colors"
-version = "3.2.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]]
name = "p256"
@@ -5564,7 +5912,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
dependencies = [
"ecdsa 0.14.8",
"elliptic-curve 0.12.3",
- "sha2 0.10.2",
+ "sha2 0.10.7",
]
[[package]]
@@ -5575,23 +5923,13 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
dependencies = [
"ecdsa 0.14.8",
"elliptic-curve 0.12.3",
- "sha2 0.10.2",
-]
-
-[[package]]
-name = "packed_simd_2"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
-dependencies = [
- "cfg-if",
- "libm",
+ "sha2 0.10.7",
]
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5606,7 +5944,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
@@ -5622,7 +5960,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
@@ -5636,7 +5974,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5660,8 +5998,10 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
+ "aquamarine",
+ "docify",
"frame-benchmarking",
"frame-election-provider-support",
"frame-support",
@@ -5680,7 +6020,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list-remote-tests"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-election-provider-support",
"frame-remote-externalities",
@@ -5699,7 +6039,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5714,7 +6054,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
@@ -5733,7 +6073,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"binary-merkle-tree",
@@ -5757,7 +6097,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5775,7 +6115,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5794,7 +6134,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5811,7 +6151,7 @@ dependencies = [
[[package]]
name = "pallet-conviction-voting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -5828,7 +6168,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5846,7 +6186,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5869,7 +6209,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5882,7 +6222,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5901,7 +6241,7 @@ dependencies = [
[[package]]
name = "pallet-fast-unstake"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"docify",
"frame-benchmarking",
@@ -5920,7 +6260,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5943,7 +6283,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5959,7 +6299,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5979,7 +6319,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5996,7 +6336,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6013,7 +6353,7 @@ dependencies = [
[[package]]
name = "pallet-message-queue"
version = "7.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6032,7 +6372,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6049,7 +6389,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6065,7 +6405,7 @@ dependencies = [
[[package]]
name = "pallet-nis"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6081,11 +6421,12 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
"log",
+ "pallet-balances",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -6093,12 +6434,13 @@ dependencies = [
"sp-runtime",
"sp-staking",
"sp-std",
+ "sp-tracing",
]
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6118,7 +6460,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-runtime-api"
version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"pallet-nomination-pools",
"parity-scale-codec",
@@ -6129,7 +6471,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
@@ -6146,7 +6488,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6170,7 +6512,7 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6187,7 +6529,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6202,50 +6544,68 @@ dependencies = [
[[package]]
name = "pallet-ranked-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-recovery"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
- "log",
"parity-scale-codec",
"scale-info",
- "sp-arithmetic",
- "sp-core",
"sp-io",
"sp-runtime",
"sp-std",
]
[[package]]
-name = "pallet-recovery"
+name = "pallet-referenda"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
+ "assert_matches",
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
+ "serde",
+ "sp-arithmetic",
"sp-io",
"sp-runtime",
"sp-std",
]
[[package]]
-name = "pallet-referenda"
+name = "pallet-salary"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
- "assert_matches",
"frame-benchmarking",
"frame-support",
"frame-system",
"log",
"parity-scale-codec",
"scale-info",
- "serde",
"sp-arithmetic",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-std",
@@ -6254,8 +6614,9 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
+ "docify",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -6271,7 +6632,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
@@ -6292,7 +6653,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6308,12 +6669,11 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
- "hex-literal 0.3.4",
"log",
"parity-scale-codec",
"rand_chacha 0.2.2",
@@ -6327,7 +6687,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6350,18 +6710,18 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"log",
"sp-arithmetic",
@@ -6370,7 +6730,7 @@ dependencies = [
[[package]]
name = "pallet-staking-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6379,7 +6739,7 @@ dependencies = [
[[package]]
name = "pallet-state-trie-migration"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6396,7 +6756,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6411,7 +6771,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6429,7 +6789,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6448,7 +6808,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-support",
"frame-system",
@@ -6464,7 +6824,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -6480,7 +6840,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -6492,7 +6852,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6509,7 +6869,7 @@ dependencies = [
[[package]]
name = "pallet-uniques"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6524,7 +6884,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6540,7 +6900,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6555,7 +6915,7 @@ dependencies = [
[[package]]
name = "pallet-whitelist"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6618,9 +6978,9 @@ dependencies = [
[[package]]
name = "parity-db"
-version = "0.4.8"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4890dcb9556136a4ec2b0c51fa4a08c8b733b829506af8fff2e853f3a065985b"
+checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8"
dependencies = [
"blake2",
"crc32fast",
@@ -6638,11 +6998,11 @@ dependencies = [
[[package]]
name = "parity-scale-codec"
-version = "3.6.1"
+version = "3.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967"
+checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64"
dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
"bitvec",
"byte-slice-cast",
"bytes",
@@ -6653,9 +7013,9 @@ dependencies = [
[[package]]
name = "parity-scale-codec-derive"
-version = "3.6.1"
+version = "3.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110"
+checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -6677,9 +7037,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
[[package]]
name = "parking"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
[[package]]
name = "parking_lot"
@@ -6689,7 +7049,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [
"instant",
"lock_api",
- "parking_lot_core 0.8.5",
+ "parking_lot_core 0.8.6",
]
[[package]]
@@ -6699,34 +7059,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.6",
+ "parking_lot_core 0.9.8",
]
[[package]]
name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
dependencies = [
"cfg-if",
"instant",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"winapi",
]
[[package]]
name = "parking_lot_core"
-version = "0.9.6"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
+ "redox_syscall 0.3.5",
"smallvec",
- "windows-sys 0.42.0",
+ "windows-targets 0.48.1",
]
[[package]]
@@ -6737,9 +7097,9 @@ checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156"
[[package]]
name = "paste"
-version = "1.0.7"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "pbkdf2"
@@ -6756,7 +7116,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -6767,11 +7127,11 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
[[package]]
name = "pem"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
]
[[package]]
@@ -6785,24 +7145,25 @@ dependencies = [
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pest"
-version = "2.1.3"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
dependencies = [
+ "thiserror",
"ucd-trie",
]
[[package]]
name = "pest_derive"
-version = "2.1.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
dependencies = [
"pest",
"pest_generator",
@@ -6810,56 +7171,56 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.1.3"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.28",
]
[[package]]
name = "pest_meta"
-version = "2.1.3"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
dependencies = [
- "maplit",
+ "once_cell",
"pest",
- "sha-1 0.8.2",
+ "sha2 0.10.7",
]
[[package]]
name = "petgraph"
-version = "0.6.0"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
+checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
dependencies = [
"fixedbitset",
- "indexmap",
+ "indexmap 1.9.3",
]
[[package]]
name = "pin-project"
-version = "1.0.12"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.28",
]
[[package]]
@@ -6870,9 +7231,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "pin-utils"
@@ -6886,7 +7247,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
dependencies = [
- "der 0.6.0",
+ "der 0.6.1",
"spki 0.6.0",
]
@@ -6902,9 +7263,9 @@ dependencies = [
[[package]]
name = "pkg-config"
-version = "0.3.22"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "platforms"
@@ -6922,8 +7283,11 @@ dependencies = [
"polkadot-cli",
"polkadot-core-primitives",
"polkadot-node-core-pvf",
+ "polkadot-node-core-pvf-common",
+ "polkadot-node-core-pvf-execute-worker",
"polkadot-node-core-pvf-prepare-worker",
"polkadot-overseer",
+ "substrate-build-script-utils",
"substrate-rpc-client",
"tempfile",
"tikv-jemallocator",
@@ -6935,7 +7299,7 @@ name = "polkadot-approval-distribution"
version = "0.9.43"
dependencies = [
"assert_matches",
- "env_logger 0.9.0",
+ "env_logger 0.9.3",
"futures",
"futures-timer",
"log",
@@ -6961,9 +7325,10 @@ dependencies = [
name = "polkadot-availability-bitfield-distribution"
version = "0.9.43"
dependencies = [
+ "always-assert",
"assert_matches",
"bitvec",
- "env_logger 0.9.0",
+ "env_logger 0.9.3",
"futures",
"futures-timer",
"log",
@@ -6992,7 +7357,7 @@ dependencies = [
"fatality",
"futures",
"futures-timer",
- "lru 0.9.0",
+ "lru 0.11.0",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -7017,12 +7382,12 @@ name = "polkadot-availability-recovery"
version = "0.9.43"
dependencies = [
"assert_matches",
- "env_logger 0.9.0",
+ "env_logger 0.9.3",
"fatality",
"futures",
"futures-timer",
"log",
- "lru 0.9.0",
+ "lru 0.11.0",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -7045,12 +7410,10 @@ dependencies = [
name = "polkadot-cli"
version = "0.9.43"
dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
"frame-benchmarking-cli",
"futures",
"log",
- "polkadot-node-core-pvf-execute-worker",
- "polkadot-node-core-pvf-prepare-worker",
"polkadot-node-metrics",
"polkadot-performance-test",
"polkadot-service",
@@ -7075,10 +7438,9 @@ dependencies = [
name = "polkadot-collator-protocol"
version = "0.9.43"
dependencies = [
- "always-assert",
"assert_matches",
"bitvec",
- "env_logger 0.9.0",
+ "env_logger 0.9.3",
"fatality",
"futures",
"futures-timer",
@@ -7091,12 +7453,14 @@ dependencies = [
"polkadot-node-subsystem-util",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
+ "sc-keystore",
"sc-network",
"sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"thiserror",
+ "tokio-util",
"tracing-gum",
]
@@ -7122,9 +7486,9 @@ dependencies = [
"fatality",
"futures",
"futures-timer",
- "indexmap",
+ "indexmap 1.9.3",
"lazy_static",
- "lru 0.9.0",
+ "lru 0.11.0",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -7175,6 +7539,7 @@ dependencies = [
"rand 0.8.5",
"rand_chacha 0.3.1",
"sc-network",
+ "sc-network-common",
"sp-application-crypto",
"sp-authority-discovery",
"sp-consensus-babe",
@@ -7218,6 +7583,7 @@ dependencies = [
name = "polkadot-node-collation-generation"
version = "0.9.43"
dependencies = [
+ "assert_matches",
"futures",
"parity-scale-codec",
"polkadot-erasure-coding",
@@ -7228,6 +7594,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"sp-core",
+ "sp-keyring",
"sp-maybe-compressed-blob",
"thiserror",
"tracing-gum",
@@ -7245,8 +7612,8 @@ dependencies = [
"futures-timer",
"kvdb",
"kvdb-memorydb",
- "lru 0.9.0",
- "merlin",
+ "lru 0.11.0",
+ "merlin 2.0.1",
"parity-scale-codec",
"parking_lot 0.12.1",
"polkadot-node-jaeger",
@@ -7278,7 +7645,7 @@ version = "0.9.43"
dependencies = [
"assert_matches",
"bitvec",
- "env_logger 0.9.0",
+ "env_logger 0.9.3",
"futures",
"futures-timer",
"kvdb",
@@ -7359,6 +7726,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-test-helpers",
"polkadot-node-subsystem-util",
+ "polkadot-overseer",
"polkadot-parachain",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
@@ -7418,7 +7786,7 @@ dependencies = [
"futures-timer",
"kvdb",
"kvdb-memorydb",
- "lru 0.9.0",
+ "lru 0.11.0",
"parity-scale-codec",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -7452,6 +7820,31 @@ dependencies = [
"tracing-gum",
]
+[[package]]
+name = "polkadot-node-core-prospective-parachains"
+version = "0.9.43"
+dependencies = [
+ "assert_matches",
+ "bitvec",
+ "fatality",
+ "futures",
+ "parity-scale-codec",
+ "polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-node-subsystem-test-helpers",
+ "polkadot-node-subsystem-types",
+ "polkadot-node-subsystem-util",
+ "polkadot-primitives",
+ "polkadot-primitives-test-helpers",
+ "sc-keystore",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-keyring",
+ "sp-keystore",
+ "thiserror",
+ "tracing-gum",
+]
+
[[package]]
name = "polkadot-node-core-provisioner"
version = "0.9.43"
@@ -7466,7 +7859,6 @@ dependencies = [
"polkadot-node-subsystem-util",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
- "rand 0.8.5",
"sp-application-crypto",
"sp-keystore",
"thiserror",
@@ -7486,6 +7878,7 @@ dependencies = [
"parity-scale-codec",
"pin-project",
"polkadot-core-primitives",
+ "polkadot-node-core-pvf",
"polkadot-node-core-pvf-common",
"polkadot-node-core-pvf-execute-worker",
"polkadot-node-core-pvf-prepare-worker",
@@ -7549,7 +7942,6 @@ dependencies = [
"sp-externalities",
"sp-io",
"sp-tracing",
- "substrate-build-script-utils",
"tempfile",
"tokio",
"tracing-gum",
@@ -7602,7 +7994,7 @@ version = "0.9.43"
dependencies = [
"async-trait",
"futures",
- "lru 0.9.0",
+ "lru 0.11.0",
"polkadot-node-metrics",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -7666,6 +8058,7 @@ version = "0.9.43"
dependencies = [
"async-channel",
"async-trait",
+ "bitvec",
"derive_more",
"fatality",
"futures",
@@ -7762,7 +8155,7 @@ dependencies = [
"assert_matches",
"async-trait",
"derive_more",
- "env_logger 0.9.0",
+ "env_logger 0.9.3",
"fatality",
"futures",
"futures-channel",
@@ -7772,7 +8165,7 @@ dependencies = [
"kvdb-shared-tests",
"lazy_static",
"log",
- "lru 0.9.0",
+ "lru 0.11.0",
"parity-db",
"parity-scale-codec",
"parking_lot 0.11.2",
@@ -7805,7 +8198,7 @@ dependencies = [
"femme",
"futures",
"futures-timer",
- "lru 0.9.0",
+ "lru 0.11.0",
"orchestra",
"parking_lot 0.12.1",
"polkadot-node-metrics",
@@ -7842,7 +8235,7 @@ dependencies = [
name = "polkadot-performance-test"
version = "0.9.43"
dependencies = [
- "env_logger 0.9.0",
+ "env_logger 0.9.3",
"kusama-runtime",
"log",
"polkadot-erasure-coding",
@@ -8013,6 +8406,7 @@ dependencies = [
"sp-session",
"sp-staking",
"sp-std",
+ "sp-storage",
"sp-tracing",
"sp-transaction-pool",
"sp-trie",
@@ -8107,7 +8501,7 @@ name = "polkadot-runtime-parachains"
version = "0.9.43"
dependencies = [
"assert_matches",
- "bitflags",
+ "bitflags 1.3.2",
"bitvec",
"derive_more",
"frame-benchmarking",
@@ -8162,7 +8556,7 @@ version = "0.9.43"
dependencies = [
"assert_matches",
"async-trait",
- "env_logger 0.9.0",
+ "env_logger 0.9.3",
"frame-benchmarking",
"frame-benchmarking-cli",
"frame-support",
@@ -8170,12 +8564,13 @@ dependencies = [
"frame-system-rpc-runtime-api",
"futures",
"hex-literal 0.4.1",
+ "is_executable",
"kusama-runtime",
"kusama-runtime-constants",
"kvdb",
"kvdb-rocksdb",
"log",
- "lru 0.9.0",
+ "lru 0.11.0",
"mmr-gadget",
"pallet-babe",
"pallet-im-online",
@@ -8203,7 +8598,9 @@ dependencies = [
"polkadot-node-core-chain-selection",
"polkadot-node-core-dispute-coordinator",
"polkadot-node-core-parachains-inherent",
+ "polkadot-node-core-prospective-parachains",
"polkadot-node-core-provisioner",
+ "polkadot-node-core-pvf",
"polkadot-node-core-pvf-checker",
"polkadot-node-core-runtime-api",
"polkadot-node-network-protocol",
@@ -8249,6 +8646,7 @@ dependencies = [
"sc-transaction-pool-api",
"serde",
"serde_json",
+ "serial_test",
"sp-api",
"sp-authority-discovery",
"sp-block-builder",
@@ -8270,7 +8668,6 @@ dependencies = [
"sp-storage",
"sp-timestamp",
"sp-transaction-pool",
- "sp-trie",
"sp-version",
"sp-weights",
"substrate-prometheus-endpoint",
@@ -8285,20 +8682,24 @@ dependencies = [
name = "polkadot-statement-distribution"
version = "0.9.43"
dependencies = [
- "arrayvec 0.5.2",
+ "arrayvec 0.7.4",
"assert_matches",
+ "async-channel",
+ "bitvec",
"fatality",
"futures",
"futures-timer",
- "indexmap",
+ "indexmap 1.9.3",
"parity-scale-codec",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-node-subsystem-test-helpers",
+ "polkadot-node-subsystem-types",
"polkadot-node-subsystem-util",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
+ "rand_chacha 0.3.1",
"sc-keystore",
"sc-network",
"sp-application-crypto",
@@ -8356,7 +8757,7 @@ version = "0.9.43"
dependencies = [
"assert_matches",
"async-trait",
- "clap 4.2.5",
+ "clap 4.3.19",
"color-eyre",
"futures",
"futures-timer",
@@ -8365,6 +8766,7 @@ dependencies = [
"polkadot-node-core-backing",
"polkadot-node-core-candidate-validation",
"polkadot-node-core-dispute-coordinator",
+ "polkadot-node-core-pvf-common",
"polkadot-node-core-pvf-execute-worker",
"polkadot-node-core-pvf-prepare-worker",
"polkadot-node-primitives",
@@ -8376,6 +8778,7 @@ dependencies = [
"rand 0.8.5",
"sp-core",
"sp-keystore",
+ "substrate-build-script-utils",
"tracing-gum",
]
@@ -8500,7 +8903,7 @@ dependencies = [
name = "polkadot-voter-bags"
version = "0.9.43"
dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
"generate-bags",
"kusama-runtime",
"polkadot-runtime",
@@ -8510,15 +8913,18 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.2.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
"cfg-if",
+ "concurrent-queue",
"libc",
"log",
- "wepoll-ffi",
- "winapi",
+ "pin-project-lite 0.2.10",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -8532,17 +8938,6 @@ dependencies = [
"universal-hash 0.4.1",
]
-[[package]]
-name = "polyval"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
-dependencies = [
- "cpuid-bool",
- "opaque-debug 0.3.0",
- "universal-hash 0.4.1",
-]
-
[[package]]
name = "polyval"
version = "0.5.3"
@@ -8569,22 +8964,22 @@ dependencies = [
[[package]]
name = "portable-atomic"
-version = "0.3.19"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b"
+checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e"
[[package]]
name = "pprof"
-version = "0.10.1"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6472bfed9475542ac46c518734a8d06d71b0f6cb2c17f904aa301711a57786f"
+checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059"
dependencies = [
"backtrace",
"cfg-if",
"findshlibs",
"libc",
"log",
- "nix 0.24.1",
+ "nix 0.26.2",
"once_cell",
"parking_lot 0.12.1",
"smallvec",
@@ -8601,9 +8996,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "predicates"
-version = "2.1.0"
+version = "2.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95e5a7689e456ab905c22c2b48225bb921aba7c8dfa58440d68ba13f6222a715"
+checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
dependencies = [
"difflib",
"float-cmp",
@@ -8613,17 +9008,29 @@ dependencies = [
"regex",
]
+[[package]]
+name = "predicates"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9"
+dependencies = [
+ "anstyle",
+ "difflib",
+ "itertools",
+ "predicates-core",
+]
+
[[package]]
name = "predicates-core"
-version = "1.0.2"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451"
+checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
[[package]]
name = "predicates-tree"
-version = "1.0.4"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7"
+checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
dependencies = [
"predicates-core",
"termtree",
@@ -8631,24 +9038,32 @@ dependencies = [
[[package]]
name = "pretty_assertions"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
+checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
dependencies = [
- "ctor",
"diff",
- "output_vt100",
"yansi",
]
[[package]]
name = "prettyplease"
-version = "0.2.4"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058"
+checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
dependencies = [
"proc-macro2",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -8714,6 +9129,12 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
[[package]]
name = "proc-macro-warning"
version = "0.4.1"
@@ -8722,29 +9143,29 @@ checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "proc-macro2"
-version = "1.0.60"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [
"unicode-ident",
]
[[package]]
name = "prometheus"
-version = "0.13.0"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504"
+checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
dependencies = [
"cfg-if",
"fnv",
"lazy_static",
"memchr",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
"thiserror",
]
@@ -8773,40 +9194,31 @@ dependencies = [
[[package]]
name = "prometheus-parse"
-version = "0.2.2"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c996f3caea1c51aa034c0d2dfd8447a12c555f4567b02677ef8a865ac4cce712"
+checksum = "0c2aa5feb83bf4b2c8919eaf563f51dbab41183de73ba2353c0e03cd7b6bd892"
dependencies = [
"chrono",
- "lazy_static",
+ "itertools",
+ "once_cell",
"regex",
]
[[package]]
name = "prost"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
-dependencies = [
- "bytes",
- "prost-derive 0.10.1",
-]
-
-[[package]]
-name = "prost"
-version = "0.11.0"
+version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
dependencies = [
"bytes",
- "prost-derive 0.11.0",
+ "prost-derive",
]
[[package]]
name = "prost-build"
-version = "0.11.1"
+version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb"
+checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
dependencies = [
"bytes",
"heck",
@@ -8815,31 +9227,20 @@ dependencies = [
"log",
"multimap",
"petgraph",
- "prost 0.11.0",
+ "prettyplease 0.1.25",
+ "prost",
"prost-types",
"regex",
+ "syn 1.0.109",
"tempfile",
"which",
]
[[package]]
name = "prost-derive"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.11.0"
+version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
dependencies = [
"anyhow",
"itertools",
@@ -8850,35 +9251,34 @@ dependencies = [
[[package]]
name = "prost-types"
-version = "0.11.1"
+version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
dependencies = [
- "bytes",
- "prost 0.11.0",
+ "prost",
]
[[package]]
name = "psm"
-version = "0.1.16"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"
+checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
dependencies = [
"cc",
]
[[package]]
name = "pyroscope"
-version = "0.5.5"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6636d352280fb587c8716f10e1d61fe88cb002660e0a8b0d3e47de17f3b5aaed"
+checksum = "91ce54d81c50f7fd6442ee671597f661a068ccebd82ed1557775b6791b14aba7"
dependencies = [
"json",
"libc",
"libflate",
"log",
- "names",
- "prost 0.10.4",
+ "names 0.14.0",
+ "prost",
"reqwest",
"thiserror",
"url",
@@ -8887,9 +9287,9 @@ dependencies = [
[[package]]
name = "pyroscope_pprofrs"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14e699bf3e7da41b3a7573d5944d77b1bd96a187aa72f5fa96afb4ed5609cc45"
+checksum = "57add45daa57783490913a5d3d88e3249126971b61ac97ee0c7bac293ef0114a"
dependencies = [
"log",
"pprof",
@@ -8903,12 +9303,6 @@ version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
[[package]]
name = "quick-protobuf"
version = "0.8.1"
@@ -8944,15 +9338,15 @@ dependencies = [
[[package]]
name = "quinn-proto"
-version = "0.9.2"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9"
+checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9"
dependencies = [
"bytes",
"rand 0.8.5",
- "ring",
+ "ring 0.16.20",
"rustc-hash",
- "rustls 0.20.7",
+ "rustls 0.20.8",
"slab",
"thiserror",
"tinyvec",
@@ -8962,9 +9356,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.28"
+version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
dependencies = [
"proc-macro2",
]
@@ -9034,7 +9428,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
]
[[package]]
@@ -9063,26 +9457,23 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.5.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
- "autocfg",
- "crossbeam-deque",
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
-version = "1.9.1"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
- "lazy_static",
"num_cpus",
]
@@ -9093,8 +9484,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
dependencies = [
"pem",
- "ring",
- "time 0.3.17",
+ "ring 0.16.20",
+ "time 0.3.25",
"x509-parser 0.13.2",
"yasna",
]
@@ -9106,8 +9497,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
dependencies = [
"pem",
- "ring",
- "time 0.3.17",
+ "ring 0.16.20",
+ "time 0.3.25",
"yasna",
]
@@ -9117,17 +9508,27 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
]
[[package]]
name = "redox_users"
-version = "0.4.0"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.8",
- "redox_syscall",
+ "getrandom 0.2.10",
+ "redox_syscall 0.2.16",
+ "thiserror",
]
[[package]]
@@ -9145,22 +9546,22 @@ dependencies = [
[[package]]
name = "ref-cast"
-version = "1.0.6"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da"
+checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.6"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
+checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.28",
]
[[package]]
@@ -9177,13 +9578,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.6.0"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax",
+ "regex-automata 0.3.4",
+ "regex-syntax 0.7.4",
]
[[package]]
@@ -9192,20 +9594,37 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.4",
]
[[package]]
name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]]
name = "remote-ext-tests-bags-list"
version = "0.9.43"
dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
"frame-system",
"kusama-runtime",
"kusama-runtime-constants",
@@ -9220,22 +9639,13 @@ dependencies = [
"westend-runtime-constants",
]
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "reqwest"
-version = "0.11.17"
+version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
"bytes",
"encoding_rs",
"futures-core",
@@ -9244,21 +9654,21 @@ dependencies = [
"http",
"http-body",
"hyper",
- "hyper-rustls 0.23.0",
+ "hyper-rustls 0.24.1",
"ipnet",
"js-sys",
"log",
"mime",
"once_cell",
"percent-encoding",
- "pin-project-lite 0.2.9",
- "rustls 0.20.7",
- "rustls-pemfile 1.0.2",
+ "pin-project-lite 0.2.10",
+ "rustls 0.21.6",
+ "rustls-pemfile",
"serde",
"serde_json",
"serde_urlencoded",
"tokio",
- "tokio-rustls 0.23.2",
+ "tokio-rustls 0.24.1",
"tower-service",
"url",
"wasm-bindgen",
@@ -9275,7 +9685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
dependencies = [
"hostname",
- "quick-error 1.2.3",
+ "quick-error",
]
[[package]]
@@ -9299,6 +9709,21 @@ dependencies = [
"subtle",
]
+[[package]]
+name = "ring"
+version = "0.1.0"
+source = "git+https://github.com/w3f/ring-proof#0e948f3c28cbacecdd3020403c4841c0eb339213"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "common",
+ "fflonk",
+ "merlin 3.0.0",
+]
+
[[package]]
name = "ring"
version = "0.16.20"
@@ -9411,6 +9836,7 @@ dependencies = [
"sp-session",
"sp-staking",
"sp-std",
+ "sp-storage",
"sp-tracing",
"sp-transaction-pool",
"sp-trie",
@@ -9439,11 +9865,12 @@ dependencies = [
[[package]]
name = "rpassword"
-version = "7.0.0"
+version = "7.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b763cb66df1c928432cc35053f8bd4cec3335d8559fc16010017d16b3c1680"
+checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
dependencies = [
"libc",
+ "rtoolbox",
"winapi",
]
@@ -9468,11 +9895,21 @@ dependencies = [
"log",
"netlink-packet-route",
"netlink-proto",
- "nix 0.24.1",
+ "nix 0.24.3",
"thiserror",
"tokio",
]
+[[package]]
+name = "rtoolbox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
[[package]]
name = "rtp"
version = "0.6.8"
@@ -9489,9 +9926,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustc-hash"
@@ -9511,7 +9948,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.16",
+ "semver 1.0.18",
]
[[package]]
@@ -9525,43 +9962,42 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.35.13"
+version = "0.36.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
+checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
dependencies = [
- "bitflags",
- "errno 0.2.8",
- "io-lifetimes 0.7.5",
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
"libc",
- "linux-raw-sys 0.0.46",
- "windows-sys 0.42.0",
+ "linux-raw-sys 0.1.4",
+ "windows-sys 0.45.0",
]
[[package]]
name = "rustix"
-version = "0.36.7"
+version = "0.37.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
dependencies = [
- "bitflags",
- "errno 0.2.8",
- "io-lifetimes 1.0.10",
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
"libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.42.0",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
]
[[package]]
name = "rustix"
-version = "0.37.18"
+version = "0.38.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
+checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f"
dependencies = [
- "bitflags",
- "errno 0.3.1",
- "io-lifetimes 1.0.10",
+ "bitflags 2.3.3",
+ "errno",
"libc",
- "linux-raw-sys 0.3.6",
+ "linux-raw-sys 0.4.5",
"windows-sys 0.48.0",
]
@@ -9571,82 +10007,73 @@ version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
"log",
- "ring",
+ "ring 0.16.20",
"sct 0.6.1",
"webpki 0.21.4",
]
[[package]]
name = "rustls"
-version = "0.20.7"
+version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
dependencies = [
"log",
- "ring",
+ "ring 0.16.20",
"sct 0.7.0",
"webpki 0.22.0",
]
[[package]]
name = "rustls"
-version = "0.21.2"
+version = "0.21.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f"
+checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
dependencies = [
"log",
- "ring",
+ "ring 0.16.20",
"rustls-webpki",
"sct 0.7.0",
]
[[package]]
-name = "rustls-native-certs"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 0.2.1",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "0.2.1"
+name = "rustls-native-certs"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
dependencies = [
- "base64 0.13.0",
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
]
[[package]]
name = "rustls-pemfile"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
]
[[package]]
name = "rustls-webpki"
-version = "0.100.1"
+version = "0.101.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
dependencies = [
- "ring",
+ "ring 0.16.20",
"untrusted",
]
[[package]]
name = "rustversion"
-version = "1.0.6"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]]
name = "rw-stream-sink"
@@ -9661,15 +10088,15 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.6"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "safe_arch"
-version = "0.6.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529"
+checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
dependencies = [
"bytemuck",
]
@@ -9686,7 +10113,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"log",
"sp-core",
@@ -9697,7 +10124,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"futures",
@@ -9707,7 +10134,7 @@ dependencies = [
"log",
"multihash",
"parity-scale-codec",
- "prost 0.11.0",
+ "prost",
"prost-build",
"rand 0.8.5",
"sc-client-api",
@@ -9725,7 +10152,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"futures",
"futures-timer",
@@ -9748,7 +10175,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -9763,7 +10190,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"memmap2",
"sc-chain-spec-derive",
@@ -9782,27 +10209,27 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"chrono",
- "clap 4.2.5",
+ "clap 4.3.19",
"fdlimit",
"futures",
"libp2p-identity",
"log",
- "names",
+ "names 0.13.0",
"parity-scale-codec",
"rand 0.8.5",
"regex",
@@ -9832,7 +10259,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"fnv",
"futures",
@@ -9858,7 +10285,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"hash-db",
"kvdb",
@@ -9884,7 +10311,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"futures",
@@ -9909,7 +10336,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"fork-tree",
@@ -9945,7 +10372,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"futures",
"jsonrpsee",
@@ -9967,7 +10394,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"async-channel",
@@ -10001,7 +10428,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"futures",
"jsonrpsee",
@@ -10020,7 +10447,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -10033,9 +10460,9 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
"array-bytes",
"async-trait",
"dyn-clone",
@@ -10074,7 +10501,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"finality-grandpa",
"futures",
@@ -10094,7 +10521,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"futures",
@@ -10117,7 +10544,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -10139,7 +10566,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"sc-allocator",
"sp-maybe-compressed-blob",
@@ -10151,13 +10578,13 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"anyhow",
"cfg-if",
"libc",
"log",
- "rustix 0.36.7",
+ "rustix 0.36.15",
"sc-allocator",
"sc-executor-common",
"sp-runtime-interface",
@@ -10168,7 +10595,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"ansi_term",
"futures",
@@ -10184,7 +10611,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"parking_lot 0.12.1",
@@ -10198,7 +10625,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"async-channel",
@@ -10239,14 +10666,14 @@ dependencies = [
[[package]]
name = "sc-network-bitswap"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-channel",
"cid",
"futures",
"libp2p-identity",
"log",
- "prost 0.11.0",
+ "prost",
"prost-build",
"sc-client-api",
"sc-network",
@@ -10259,10 +10686,10 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
- "bitflags",
+ "bitflags 1.3.2",
"futures",
"libp2p-identity",
"parity-scale-codec",
@@ -10276,9 +10703,9 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
"futures",
"futures-timer",
"libp2p",
@@ -10294,7 +10721,7 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"async-channel",
@@ -10302,7 +10729,7 @@ dependencies = [
"libp2p-identity",
"log",
"parity-scale-codec",
- "prost 0.11.0",
+ "prost",
"prost-build",
"sc-client-api",
"sc-network",
@@ -10315,7 +10742,7 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"async-channel",
@@ -10327,7 +10754,7 @@ dependencies = [
"log",
"mockall",
"parity-scale-codec",
- "prost 0.11.0",
+ "prost",
"prost-build",
"sc-client-api",
"sc-consensus",
@@ -10349,7 +10776,7 @@ dependencies = [
[[package]]
name = "sc-network-transactions"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"futures",
@@ -10367,7 +10794,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"bytes",
@@ -10375,7 +10802,7 @@ dependencies = [
"futures",
"futures-timer",
"hyper",
- "hyper-rustls 0.24.0",
+ "hyper-rustls 0.24.1",
"libp2p",
"log",
"num_cpus",
@@ -10401,7 +10828,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -10410,7 +10837,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"futures",
"jsonrpsee",
@@ -10441,7 +10868,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -10460,7 +10887,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"http",
"jsonrpsee",
@@ -10475,7 +10902,7 @@ dependencies = [
[[package]]
name = "sc-rpc-spec-v2"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"futures",
@@ -10488,6 +10915,7 @@ dependencies = [
"sc-chain-spec",
"sc-client-api",
"sc-transaction-pool-api",
+ "sc-utils",
"serde",
"sp-api",
"sp-blockchain",
@@ -10495,13 +10923,14 @@ dependencies = [
"sp-runtime",
"sp-version",
"thiserror",
+ "tokio",
"tokio-stream",
]
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"directories",
@@ -10565,7 +10994,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"log",
"parity-scale-codec",
@@ -10576,9 +11005,9 @@ dependencies = [
[[package]]
name = "sc-storage-monitor"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
"fs4",
"log",
"sc-client-db",
@@ -10590,7 +11019,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -10609,7 +11038,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"futures",
"libc",
@@ -10628,7 +11057,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"chrono",
"futures",
@@ -10647,7 +11076,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"ansi_term",
"atty",
@@ -10676,18 +11105,18 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"futures",
@@ -10713,7 +11142,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"futures",
@@ -10729,7 +11158,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-channel",
"futures",
@@ -10743,9 +11172,9 @@ dependencies = [
[[package]]
name = "scale-info"
-version = "2.5.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97"
+checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782"
dependencies = [
"bitvec",
"cfg-if",
@@ -10757,9 +11186,9 @@ dependencies = [
[[package]]
name = "scale-info-derive"
-version = "2.5.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e"
+checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -10769,12 +11198,11 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.19"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "lazy_static",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -10783,7 +11211,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d"
dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
"cfg-if",
"hashbrown 0.13.2",
]
@@ -10798,7 +11226,7 @@ dependencies = [
"arrayvec 0.5.2",
"curve25519-dalek 2.1.3",
"getrandom 0.1.16",
- "merlin",
+ "merlin 2.0.1",
"rand 0.7.3",
"rand_core 0.5.1",
"sha2 0.8.2",
@@ -10808,15 +11236,15 @@ dependencies = [
[[package]]
name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "scratch"
-version = "1.0.2"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
[[package]]
name = "sct"
@@ -10824,7 +11252,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
dependencies = [
- "ring",
+ "ring 0.16.20",
"untrusted",
]
@@ -10834,7 +11262,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
- "ring",
+ "ring 0.16.20",
"untrusted",
]
@@ -10857,8 +11285,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
dependencies = [
"base16ct 0.1.1",
- "der 0.6.0",
- "generic-array 0.14.6",
+ "der 0.6.1",
+ "generic-array 0.14.7",
"pkcs8 0.9.0",
"subtle",
"zeroize",
@@ -10866,13 +11294,13 @@ dependencies = [
[[package]]
name = "sec1"
-version = "0.7.1"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
dependencies = [
"base16ct 0.2.0",
"der 0.7.7",
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"pkcs8 0.10.2",
"subtle",
"zeroize",
@@ -10880,18 +11308,18 @@ dependencies = [
[[package]]
name = "secp256k1"
-version = "0.24.2"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3"
+checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
dependencies = [
"secp256k1-sys",
]
[[package]]
name = "secp256k1-sys"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7058dc8eaf3f2810d7828680320acda0b25a288f6d288e19278e249bbf74226b"
+checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
dependencies = [
"cc",
]
@@ -10907,11 +11335,11 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.4.2"
+version = "2.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -10920,9 +11348,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.4.2"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
dependencies = [
"core-foundation-sys",
"libc",
@@ -10939,9 +11367,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.16"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
dependencies = [
"serde",
]
@@ -10960,38 +11388,38 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
[[package]]
name = "serde"
-version = "1.0.164"
+version = "1.0.180"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.164"
+version = "1.0.180"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "serde_fmt"
-version = "1.0.1"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2963a69a2b3918c1dc75a45a18bd3fcd1120e31d3f59deb1b2f9b5d5ffb8baa4"
+checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4"
dependencies = [
"serde",
]
[[package]]
name = "serde_json"
-version = "1.0.96"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
dependencies = [
"itoa",
"ryu",
@@ -11000,9 +11428,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
dependencies = [
"serde",
]
@@ -11020,15 +11448,28 @@ dependencies = [
]
[[package]]
-name = "sha-1"
-version = "0.8.2"
+name = "serial_test"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
+ "dashmap",
+ "futures",
+ "lazy_static",
+ "log",
+ "parking_lot 0.12.1",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
]
[[package]]
@@ -11046,13 +11487,24 @@ dependencies = [
[[package]]
name = "sha-1"
-version = "0.10.0"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -11069,9 +11521,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.9.8"
+version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
dependencies = [
"block-buffer 0.9.0",
"cfg-if",
@@ -11082,22 +11534,22 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.2"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
name = "sha3"
-version = "0.10.0"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f935e31cf406e8c0e96c2815a5516181b7004ae8c5f296293221e9b1e356bd"
+checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
"keccak",
]
@@ -11118,9 +11570,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
[[package]]
name = "signal-hook"
-version = "0.3.14"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
dependencies = [
"libc",
"signal-hook-registry",
@@ -11128,9 +11580,9 @@ dependencies = [
[[package]]
name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
dependencies = [
"libc",
]
@@ -11153,7 +11605,7 @@ version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
"rand_core 0.6.4",
]
@@ -11163,15 +11615,15 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
"rand_core 0.6.4",
]
[[package]]
name = "simba"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4"
+checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
dependencies = [
"approx",
"num-complex",
@@ -11188,15 +11640,18 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
[[package]]
name = "slab"
-version = "0.4.5"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+dependencies = [
+ "autocfg",
+]
[[package]]
name = "slice-group-by"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
+checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
[[package]]
name = "slot-range-helper"
@@ -11220,9 +11675,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]]
name = "snap"
@@ -11232,18 +11687,18 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
[[package]]
name = "snow"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733"
+checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155"
dependencies = [
"aes-gcm 0.9.4",
"blake2",
"chacha20poly1305",
- "curve25519-dalek 4.0.0-rc.1",
+ "curve25519-dalek 4.0.0",
"rand_core 0.6.4",
- "ring",
+ "ring 0.16.20",
"rustc_version",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"subtle",
]
@@ -11257,13 +11712,23 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "socket2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "soketto"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
"bytes",
"flate2",
"futures",
@@ -11277,7 +11742,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"hash-db",
"log",
@@ -11298,7 +11763,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"Inflector",
"blake2",
@@ -11306,13 +11771,13 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "sp-application-crypto"
version = "23.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11325,7 +11790,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "16.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -11339,7 +11804,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11352,7 +11817,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"sp-api",
"sp-inherents",
@@ -11363,7 +11828,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"futures",
"log",
@@ -11381,7 +11846,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"futures",
@@ -11396,7 +11861,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -11413,7 +11878,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -11432,7 +11897,7 @@ dependencies = [
[[package]]
name = "sp-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"lazy_static",
"parity-scale-codec",
@@ -11451,7 +11916,7 @@ dependencies = [
[[package]]
name = "sp-consensus-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"finality-grandpa",
"log",
@@ -11469,7 +11934,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11481,10 +11946,12 @@ dependencies = [
[[package]]
name = "sp-core"
version = "21.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
- "bitflags",
+ "arrayvec 0.7.4",
+ "bandersnatch_vrfs",
+ "bitflags 1.3.2",
"blake2",
"bounded-collections",
"bs58",
@@ -11497,7 +11964,7 @@ dependencies = [
"lazy_static",
"libsecp256k1",
"log",
- "merlin",
+ "merlin 2.0.1",
"parity-scale-codec",
"parking_lot 0.12.1",
"paste",
@@ -11526,12 +11993,12 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "9.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"blake2b_simd",
"byteorder",
- "digest 0.10.6",
- "sha2 0.10.2",
+ "digest 0.10.7",
+ "sha2 0.10.7",
"sha3",
"twox-hash",
]
@@ -11539,17 +12006,17 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "9.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"quote",
"sp-core-hashing",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -11558,17 +12025,17 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "sp-externalities"
version = "0.19.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -11576,10 +12043,21 @@ dependencies = [
"sp-storage",
]
+[[package]]
+name = "sp-genesis-builder"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
+dependencies = [
+ "serde_json",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -11593,11 +12071,10 @@ dependencies = [
[[package]]
name = "sp-io"
version = "23.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"bytes",
- "ed25519",
- "ed25519-dalek",
+ "ed25519-dalek 2.0.0",
"libsecp256k1",
"log",
"parity-scale-codec",
@@ -11618,7 +12095,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "24.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"lazy_static",
"sp-core",
@@ -11629,7 +12106,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.27.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -11641,16 +12118,16 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"thiserror",
- "zstd 0.12.3+zstd.1.5.2",
+ "zstd 0.12.4",
]
[[package]]
name = "sp-metadata-ir"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-metadata",
"parity-scale-codec",
@@ -11661,7 +12138,7 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"ckb-merkle-mountain-range",
"log",
@@ -11679,7 +12156,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11693,7 +12170,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"sp-api",
"sp-core",
@@ -11703,7 +12180,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"backtrace",
"lazy_static",
@@ -11713,7 +12190,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"rustc-hash",
"serde",
@@ -11723,7 +12200,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "24.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"either",
"hash256-std-hasher",
@@ -11745,7 +12222,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "17.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -11763,19 +12240,19 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "11.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"Inflector",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11790,7 +12267,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -11804,7 +12281,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.28.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"hash-db",
"log",
@@ -11825,16 +12302,16 @@ dependencies = [
[[package]]
name = "sp-statement-store"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"aes-gcm 0.10.2",
- "curve25519-dalek 3.2.0",
- "ed25519-dalek",
+ "curve25519-dalek 4.0.0",
+ "ed25519-dalek 2.0.0",
"hkdf",
"parity-scale-codec",
"rand 0.8.5",
"scale-info",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"sp-api",
"sp-application-crypto",
"sp-core",
@@ -11843,18 +12320,18 @@ dependencies = [
"sp-runtime-interface",
"sp-std",
"thiserror",
- "x25519-dalek 2.0.0-pre.1",
+ "x25519-dalek 2.0.0",
]
[[package]]
name = "sp-std"
version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
[[package]]
name = "sp-storage"
version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11867,7 +12344,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -11880,7 +12357,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "10.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -11892,7 +12369,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"sp-api",
"sp-runtime",
@@ -11901,7 +12378,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -11916,9 +12393,9 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "22.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
"hash-db",
"hashbrown 0.13.2",
"lazy_static",
@@ -11939,7 +12416,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "22.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11956,18 +12433,18 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "sp-wasm-interface"
version = "14.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
@@ -11980,7 +12457,7 @@ dependencies = [
[[package]]
name = "sp-weights"
version = "20.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -12016,7 +12493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
dependencies = [
"base64ct",
- "der 0.6.0",
+ "der 0.6.1",
]
[[package]]
@@ -12031,9 +12508,9 @@ dependencies = [
[[package]]
name = "ss58-registry"
-version = "1.36.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284"
+checksum = "bfc443bad666016e012538782d9e3006213a7db43e9fb1dda91657dc06a6fa08"
dependencies = [
"Inflector",
"num-format",
@@ -12055,7 +12532,7 @@ name = "staking-miner"
version = "0.9.43"
dependencies = [
"assert_cmd",
- "clap 4.2.5",
+ "clap 4.3.19",
"exitcode",
"frame-election-provider-support",
"frame-remote-externalities",
@@ -12080,14 +12557,14 @@ dependencies = [
"signal-hook",
"signal-hook-tokio",
"sp-core",
- "sp-io",
"sp-npos-elections",
"sp-runtime",
+ "sp-state-machine",
"sp-version",
"sub-tokens",
"thiserror",
"tokio",
- "tracing-subscriber 0.3.11",
+ "tracing-subscriber 0.3.17",
"westend-runtime",
]
@@ -12115,11 +12592,11 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg_aliases",
"libc",
"parking_lot 0.11.2",
- "parking_lot_core 0.8.5",
+ "parking_lot_core 0.8.6",
"static_init_macro 1.0.2",
"winapi",
]
@@ -12167,9 +12644,9 @@ dependencies = [
[[package]]
name = "strum_macros"
-version = "0.24.0"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
dependencies = [
"heck",
"proc-macro2",
@@ -12184,12 +12661,12 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25"
dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
"crc",
"lazy_static",
"md-5",
"rand 0.8.5",
- "ring",
+ "ring 0.16.20",
"subtle",
"thiserror",
"tokio",
@@ -12214,19 +12691,19 @@ dependencies = [
"hmac 0.11.0",
"pbkdf2 0.8.0",
"schnorrkel",
- "sha2 0.9.8",
+ "sha2 0.9.9",
"zeroize",
]
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -12245,7 +12722,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"hyper",
"log",
@@ -12257,7 +12734,7 @@ dependencies = [
[[package]]
name = "substrate-rpc-client"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
"jsonrpsee",
@@ -12270,7 +12747,7 @@ dependencies = [
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -12287,7 +12764,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"array-bytes",
"async-trait",
@@ -12313,7 +12790,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -12323,18 +12800,18 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"ansi_term",
"build-helper",
@@ -12344,7 +12821,7 @@ dependencies = [
"sp-maybe-compressed-blob",
"strum",
"tempfile",
- "toml 0.7.3",
+ "toml 0.7.6",
"walkdir",
"wasm-opt",
]
@@ -12434,9 +12911,9 @@ dependencies = [
[[package]]
name = "symbolic-common"
-version = "9.2.1"
+version = "10.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "800963ba330b09a2ae4a4f7c6392b81fbc2784099a98c1eac68c3437aa9382b2"
+checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737"
dependencies = [
"debugid",
"memmap2",
@@ -12446,11 +12923,11 @@ dependencies = [
[[package]]
name = "symbolic-demangle"
-version = "9.2.1"
+version = "10.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b940a1fdbc72bb3369e38714efe6cd332dbbe46d093cf03d668b9ac390d1ad0"
+checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489"
dependencies = [
- "cpp_demangle",
+ "cpp_demangle 0.4.2",
"rustc-demangle",
"symbolic-common",
]
@@ -12468,9 +12945,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.16"
+version = "2.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
dependencies = [
"proc-macro2",
"quote",
@@ -12491,11 +12968,11 @@ dependencies = [
[[package]]
name = "system-configuration"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
"system-configuration-sys",
]
@@ -12518,38 +12995,37 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "target-lexicon"
-version = "0.12.5"
+version = "0.12.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
+checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
[[package]]
name = "tempfile"
-version = "3.3.0"
+version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
dependencies = [
"cfg-if",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "fastrand 2.0.0",
+ "redox_syscall 0.3.5",
+ "rustix 0.38.6",
+ "windows-sys 0.48.0",
]
[[package]]
name = "termcolor"
-version = "1.1.2"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
[[package]]
name = "termtree"
-version = "0.2.3"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
name = "test-parachain-adder"
@@ -12568,7 +13044,7 @@ dependencies = [
name = "test-parachain-adder-collator"
version = "0.9.43"
dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
"futures",
"futures-timer",
"log",
@@ -12587,6 +13063,7 @@ dependencies = [
"sp-keyring",
"substrate-test-utils",
"test-parachain-adder",
+ "test-parachain-adder-collator",
"tokio",
]
@@ -12616,7 +13093,7 @@ dependencies = [
name = "test-parachain-undying-collator"
version = "0.9.43"
dependencies = [
- "clap 4.2.5",
+ "clap 4.3.19",
"futures",
"futures-timer",
"log",
@@ -12635,6 +13112,7 @@ dependencies = [
"sp-keyring",
"substrate-test-utils",
"test-parachain-undying",
+ "test-parachain-undying-collator",
"tokio",
]
@@ -12670,22 +13148,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.40"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -12696,10 +13174,11 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
[[package]]
name = "thread_local"
-version = "1.1.4"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
dependencies = [
+ "cfg-if",
"once_cell",
]
@@ -12727,9 +13206,9 @@ dependencies = [
[[package]]
name = "tikv-jemalloc-ctl"
-version = "0.5.0"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1"
+checksum = "619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c"
dependencies = [
"libc",
"paste",
@@ -12738,20 +13217,19 @@ dependencies = [
[[package]]
name = "tikv-jemalloc-sys"
-version = "0.5.2+5.3.0-patched"
+version = "0.5.4+5.3.0-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3"
+checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1"
dependencies = [
"cc",
- "fs_extra",
"libc",
]
[[package]]
name = "tikv-jemallocator"
-version = "0.5.0"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979"
+checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca"
dependencies = [
"libc",
"tikv-jemalloc-sys",
@@ -12759,9 +13237,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.44"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
@@ -12770,10 +13248,11 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.17"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
+checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
dependencies = [
+ "deranged",
"itoa",
"serde",
"time-core",
@@ -12782,15 +13261,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
-version = "0.2.6"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
dependencies = [
"time-core",
]
@@ -12807,7 +13286,7 @@ dependencies = [
"pbkdf2 0.11.0",
"rand 0.8.5",
"rustc-hash",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"thiserror",
"unicode-normalization",
"wasm-bindgen",
@@ -12835,34 +13314,35 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.5.1"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
dependencies = [
"tinyvec_macros",
]
[[package]]
name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.28.0"
+version = "1.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
dependencies = [
"autocfg",
+ "backtrace",
"bytes",
"libc",
"mio",
"num_cpus",
"parking_lot 0.12.1",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
"signal-hook-registry",
- "socket2",
+ "socket2 0.4.9",
"tokio-macros",
"windows-sys 0.48.0",
]
@@ -12875,7 +13355,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -12891,11 +13371,11 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.23.2"
+version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b"
+checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
dependencies = [
- "rustls 0.20.7",
+ "rustls 0.20.8",
"tokio",
"webpki 0.22.0",
]
@@ -12906,27 +13386,27 @@ version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
- "rustls 0.21.2",
+ "rustls 0.21.6",
"tokio",
]
[[package]]
name = "tokio-stream"
-version = "0.1.9"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
dependencies = [
"futures-core",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
"tokio",
"tokio-util",
]
[[package]]
name = "tokio-tungstenite"
-version = "0.17.1"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae"
+checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
dependencies = [
"futures-util",
"log",
@@ -12936,15 +13416,15 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.1"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
dependencies = [
"bytes",
"futures-core",
"futures-io",
"futures-sink",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
"tokio",
"tracing",
]
@@ -12960,9 +13440,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.3"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
dependencies = [
"serde",
"serde_spanned",
@@ -12972,20 +13452,20 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.19.8"
+version = "0.19.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
dependencies = [
- "indexmap",
+ "indexmap 2.0.0",
"serde",
"serde_spanned",
"toml_datetime",
@@ -13005,18 +13485,18 @@ dependencies = [
[[package]]
name = "tower-http"
-version = "0.4.0"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658"
+checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82"
dependencies = [
- "bitflags",
+ "bitflags 2.3.3",
"bytes",
"futures-core",
"futures-util",
"http",
"http-body",
"http-range-header",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
"tower-layer",
"tower-service",
]
@@ -13029,9 +13509,9 @@ checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
[[package]]
name = "tower-service"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
@@ -13041,27 +13521,27 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
"cfg-if",
"log",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.10",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.28",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
"valuable",
@@ -13097,7 +13577,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -13113,9 +13593,9 @@ dependencies = [
[[package]]
name = "tracing-serde"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
dependencies = [
"serde",
"tracing-core",
@@ -13146,13 +13626,13 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.11"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
dependencies = [
- "ansi_term",
- "lazy_static",
"matchers 0.1.0",
+ "nu-ansi-term",
+ "once_cell",
"regex",
"sharded-slab",
"smallvec",
@@ -13202,7 +13682,7 @@ dependencies = [
"lazy_static",
"rand 0.8.5",
"smallvec",
- "socket2",
+ "socket2 0.4.9",
"thiserror",
"tinyvec",
"tokio",
@@ -13232,17 +13712,17 @@ dependencies = [
[[package]]
name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#839cf0c6cdf9febbb5836c7ef79b6f9befb27b5f"
+source = "git+https://github.com/paritytech/substrate?branch=master#51695bb7009ea2e0996eb94ab4dfdc643a076702"
dependencies = [
"async-trait",
- "clap 4.2.5",
+ "clap 4.3.19",
"frame-remote-externalities",
"frame-try-runtime",
"hex",
@@ -13269,15 +13749,16 @@ dependencies = [
"sp-version",
"sp-weights",
"substrate-rpc-client",
- "zstd 0.12.3+zstd.1.5.2",
+ "zstd 0.12.4",
]
[[package]]
name = "trybuild"
-version = "1.0.75"
+version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1212c215a87a183687a7cc7065901b1a98da6b37277d51a1b5faedbb4efd4f3"
+checksum = "a84e0202ea606ba5ebee8507ab2bfbe89b98551ed9b8f0be198109275cff284b"
dependencies = [
+ "basic-toml",
"dissimilar",
"glob",
"once_cell",
@@ -13285,29 +13766,28 @@ dependencies = [
"serde_derive",
"serde_json",
"termcolor",
- "toml 0.5.11",
]
[[package]]
name = "tt-call"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055"
+checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
[[package]]
name = "tungstenite"
-version = "0.17.2"
+version = "0.17.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
"byteorder",
"bytes",
"http",
"httparse",
"log",
"rand 0.8.5",
- "sha-1 0.10.0",
+ "sha-1 0.10.1",
"thiserror",
"url",
"utf-8",
@@ -13320,12 +13800,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8"
dependencies = [
"async-trait",
- "base64 0.13.0",
+ "base64 0.13.1",
"futures",
"log",
"md-5",
"rand 0.8.5",
- "ring",
+ "ring 0.16.20",
"stun",
"thiserror",
"tokio",
@@ -13339,7 +13819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
"cfg-if",
- "digest 0.10.6",
+ "digest 0.10.7",
"rand 0.8.5",
"static_assertions",
]
@@ -13352,15 +13832,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "ucd-trie"
-version = "0.1.3"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
[[package]]
name = "uint"
-version = "0.9.1"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
dependencies = [
"byteorder",
"crunchy",
@@ -13370,36 +13850,36 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.7"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
[[package]]
name = "unicode-normalization"
-version = "0.1.19"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-width"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "unicode-xid"
-version = "0.2.2"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "universal-hash"
@@ -13407,7 +13887,7 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
"subtle",
]
@@ -13441,12 +13921,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
- "idna 0.3.0",
+ "idna 0.4.0",
"percent-encoding",
]
@@ -13464,11 +13944,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
-version = "1.2.2"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
]
[[package]]
@@ -13557,22 +14037,20 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]]
name = "walkdir"
-version = "2.3.2"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
dependencies = [
"same-file",
- "winapi",
"winapi-util",
]
[[package]]
name = "want"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
dependencies = [
- "log",
"try-lock",
]
@@ -13596,9 +14074,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.85"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if",
"serde",
@@ -13608,24 +14086,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.85"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.35"
+version = "0.4.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
dependencies = [
"cfg-if",
"js-sys",
@@ -13635,9 +14113,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.85"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -13645,22 +14123,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.85"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.85"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "wasm-instrument"
@@ -13673,9 +14151,9 @@ dependencies = [
[[package]]
name = "wasm-opt"
-version = "0.112.0"
+version = "0.114.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c"
+checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7"
dependencies = [
"anyhow",
"libc",
@@ -13689,9 +14167,9 @@ dependencies = [
[[package]]
name = "wasm-opt-cxx-sys"
-version = "0.112.0"
+version = "0.114.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445"
+checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa"
dependencies = [
"anyhow",
"cxx",
@@ -13701,9 +14179,9 @@ dependencies = [
[[package]]
name = "wasm-opt-sys"
-version = "0.112.0"
+version = "0.114.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14"
+checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9"
dependencies = [
"anyhow",
"cc",
@@ -13732,7 +14210,7 @@ version = "0.102.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b"
dependencies = [
- "indexmap",
+ "indexmap 1.9.3",
"url",
]
@@ -13745,10 +14223,10 @@ dependencies = [
"anyhow",
"bincode",
"cfg-if",
- "indexmap",
+ "indexmap 1.9.3",
"libc",
"log",
- "object",
+ "object 0.30.4",
"once_cell",
"paste",
"psm",
@@ -13780,14 +14258,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213"
dependencies = [
"anyhow",
- "base64 0.21.0",
+ "base64 0.21.2",
"bincode",
"directories-next",
"file-per-thread-logger",
"log",
- "rustix 0.36.7",
+ "rustix 0.36.15",
"serde",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"toml 0.5.11",
"windows-sys 0.45.0",
"zstd 0.11.2+zstd.1.5.2",
@@ -13807,7 +14285,7 @@ dependencies = [
"cranelift-wasm",
"gimli",
"log",
- "object",
+ "object 0.30.4",
"target-lexicon",
"thiserror",
"wasmparser",
@@ -13825,7 +14303,7 @@ dependencies = [
"cranelift-codegen",
"cranelift-native",
"gimli",
- "object",
+ "object 0.30.4",
"target-lexicon",
"wasmtime-environ",
]
@@ -13839,9 +14317,9 @@ dependencies = [
"anyhow",
"cranelift-entity",
"gimli",
- "indexmap",
+ "indexmap 1.9.3",
"log",
- "object",
+ "object 0.30.4",
"serde",
"target-lexicon",
"thiserror",
@@ -13855,14 +14333,14 @@ version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
dependencies = [
- "addr2line",
+ "addr2line 0.19.0",
"anyhow",
"bincode",
"cfg-if",
- "cpp_demangle",
+ "cpp_demangle 0.3.5",
"gimli",
"log",
- "object",
+ "object 0.30.4",
"rustc-demangle",
"serde",
"target-lexicon",
@@ -13879,9 +14357,9 @@ version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
dependencies = [
- "object",
+ "object 0.30.4",
"once_cell",
- "rustix 0.36.7",
+ "rustix 0.36.15",
]
[[package]]
@@ -13904,7 +14382,7 @@ dependencies = [
"anyhow",
"cc",
"cfg-if",
- "indexmap",
+ "indexmap 1.9.3",
"libc",
"log",
"mach",
@@ -13912,7 +14390,7 @@ dependencies = [
"memoffset 0.8.0",
"paste",
"rand 0.8.5",
- "rustix 0.36.7",
+ "rustix 0.36.15",
"wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-jit-debug",
@@ -13933,9 +14411,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.55"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -13947,7 +14425,7 @@ version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
dependencies = [
- "ring",
+ "ring 0.16.20",
"untrusted",
]
@@ -13957,15 +14435,15 @@ version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
dependencies = [
- "ring",
+ "ring 0.16.20",
"untrusted",
]
[[package]]
name = "webpki-roots"
-version = "0.22.2"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
dependencies = [
"webpki 0.22.0",
]
@@ -13986,17 +14464,17 @@ dependencies = [
"rand 0.8.5",
"rcgen 0.9.3",
"regex",
- "ring",
+ "ring 0.16.20",
"rtcp",
"rtp",
"rustls 0.19.1",
"sdp",
"serde",
"serde_json",
- "sha2 0.10.2",
+ "sha2 0.10.7",
"stun",
"thiserror",
- "time 0.3.17",
+ "time 0.3.25",
"tokio",
"turn",
"url",
@@ -14028,22 +14506,22 @@ dependencies = [
[[package]]
name = "webrtc-dtls"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f"
+checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05"
dependencies = [
"aes 0.6.0",
- "aes-gcm 0.8.0",
+ "aes-gcm 0.10.2",
"async-trait",
"bincode",
"block-modes",
"byteorder",
"ccm",
"curve25519-dalek 3.2.0",
- "der-parser 8.1.0",
+ "der-parser 8.2.0",
"elliptic-curve 0.12.3",
"hkdf",
- "hmac 0.10.1",
+ "hmac 0.12.1",
"log",
"oid-registry 0.6.1",
"p256",
@@ -14051,27 +14529,27 @@ dependencies = [
"rand 0.8.5",
"rand_core 0.6.4",
"rcgen 0.9.3",
- "ring",
+ "ring 0.16.20",
"rustls 0.19.1",
"sec1 0.3.0",
"serde",
- "sha-1 0.9.8",
- "sha2 0.9.8",
+ "sha1",
+ "sha2 0.10.7",
"signature 1.6.4",
"subtle",
"thiserror",
"tokio",
"webpki 0.21.4",
"webrtc-util",
- "x25519-dalek 2.0.0-pre.1",
+ "x25519-dalek 2.0.0",
"x509-parser 0.13.2",
]
[[package]]
name = "webrtc-ice"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7"
+checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80"
dependencies = [
"arc-swap",
"async-trait",
@@ -14098,7 +14576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106"
dependencies = [
"log",
- "socket2",
+ "socket2 0.4.9",
"thiserror",
"tokio",
"webrtc-util",
@@ -14106,18 +14584,15 @@ dependencies = [
[[package]]
name = "webrtc-media"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7"
+checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991"
dependencies = [
"byteorder",
"bytes",
- "derive_builder",
- "displaydoc",
"rand 0.8.5",
"rtp",
"thiserror",
- "webrtc-util",
]
[[package]]
@@ -14168,33 +14643,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87"
dependencies = [
"async-trait",
- "bitflags",
+ "bitflags 1.3.2",
"bytes",
"cc",
"ipnet",
"lazy_static",
"libc",
"log",
- "nix 0.24.1",
+ "nix 0.24.3",
"rand 0.8.5",
"thiserror",
"tokio",
"winapi",
]
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "westend-runtime"
version = "0.9.43"
dependencies = [
+ "binary-merkle-tree",
"bitvec",
"frame-benchmarking",
"frame-election-provider-support",
@@ -14212,6 +14679,8 @@ dependencies = [
"pallet-babe",
"pallet-bags-list",
"pallet-balances",
+ "pallet-beefy",
+ "pallet-beefy-mmr",
"pallet-collective",
"pallet-democracy",
"pallet-election-provider-multi-phase",
@@ -14224,6 +14693,7 @@ dependencies = [
"pallet-indices",
"pallet-membership",
"pallet-message-queue",
+ "pallet-mmr",
"pallet-multisig",
"pallet-nomination-pools",
"pallet-nomination-pools-benchmarking",
@@ -14262,6 +14732,7 @@ dependencies = [
"serde_json",
"smallvec",
"sp-api",
+ "sp-application-crypto",
"sp-authority-discovery",
"sp-block-builder",
"sp-consensus-babe",
@@ -14277,6 +14748,7 @@ dependencies = [
"sp-session",
"sp-staking",
"sp-std",
+ "sp-storage",
"sp-tracing",
"sp-transaction-pool",
"sp-version",
@@ -14304,20 +14776,20 @@ dependencies = [
[[package]]
name = "which"
-version = "4.2.2"
+version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9"
+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
dependencies = [
"either",
- "lazy_static",
"libc",
+ "once_cell",
]
[[package]]
name = "wide"
-version = "0.7.6"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feff0a412894d67223777b6cc8d68c0dab06d52d95e9890d5f2d47f10dd9366c"
+checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f"
dependencies = [
"bytemuck",
"safe_arch",
@@ -14325,9 +14797,9 @@ dependencies = [
[[package]]
name = "widestring"
-version = "0.5.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
[[package]]
name = "winapi"
@@ -14374,31 +14846,12 @@ dependencies = [
]
[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.48.1",
]
[[package]]
@@ -14416,7 +14869,7 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.1",
]
[[package]]
@@ -14436,9 +14889,9 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.48.0"
+version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",
@@ -14467,12 +14920,6 @@ version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
@@ -14491,12 +14938,6 @@ version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
@@ -14515,12 +14956,6 @@ version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
@@ -14539,12 +14974,6 @@ version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
@@ -14575,12 +15004,6 @@ version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
@@ -14595,29 +15018,30 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winnow"
-version = "0.4.0"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deac0939bd6e4f24ab5919fbf751c97a8cfc8543bb083a305ed5c0c10bb241d1"
+checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807"
dependencies = [
"memchr",
]
[[package]]
name = "winreg"
-version = "0.7.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
"winapi",
]
[[package]]
name = "winreg"
-version = "0.10.1"
+version = "0.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
dependencies = [
- "winapi",
+ "cfg-if",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -14642,12 +15066,13 @@ dependencies = [
[[package]]
name = "x25519-dalek"
-version = "2.0.0-pre.1"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
+checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
dependencies = [
- "curve25519-dalek 3.2.0",
+ "curve25519-dalek 4.0.0",
"rand_core 0.6.4",
+ "serde",
"zeroize",
]
@@ -14658,16 +15083,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c"
dependencies = [
"asn1-rs 0.3.1",
- "base64 0.13.0",
+ "base64 0.13.1",
"data-encoding",
"der-parser 7.0.0",
"lazy_static",
"nom",
"oid-registry 0.4.0",
- "ring",
+ "ring 0.16.20",
"rusticata-macros",
"thiserror",
- "time 0.3.17",
+ "time 0.3.25",
]
[[package]]
@@ -14676,16 +15101,16 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
dependencies = [
- "asn1-rs 0.5.1",
- "base64 0.13.0",
+ "asn1-rs 0.5.2",
+ "base64 0.13.1",
"data-encoding",
- "der-parser 8.1.0",
+ "der-parser 8.2.0",
"lazy_static",
"nom",
"oid-registry 0.6.1",
"rusticata-macros",
"thiserror",
- "time 0.3.17",
+ "time 0.3.25",
]
[[package]]
@@ -14715,11 +15140,14 @@ dependencies = [
"frame-system",
"impl-trait-for-tuples",
"log",
+ "pallet-assets",
"pallet-balances",
+ "pallet-salary",
"pallet-transaction-payment",
"pallet-xcm",
"parity-scale-codec",
"polkadot-parachain",
+ "polkadot-primitives",
"polkadot-runtime-parachains",
"polkadot-test-runtime",
"primitive-types",
@@ -14760,6 +15188,7 @@ dependencies = [
"frame-system",
"futures",
"pallet-xcm",
+ "parity-scale-codec",
"polkadot-test-client",
"polkadot-test-runtime",
"polkadot-test-service",
@@ -14779,7 +15208,7 @@ dependencies = [
"Inflector",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.28",
]
[[package]]
@@ -14874,11 +15303,11 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
[[package]]
name = "yasna"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
dependencies = [
- "time 0.3.17",
+ "time 0.3.25",
]
[[package]]
@@ -14892,14 +15321,13 @@ dependencies = [
[[package]]
name = "zeroize_derive"
-version = "1.3.2"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
- "synstructure",
+ "syn 2.0.28",
]
[[package]]
@@ -14930,11 +15358,11 @@ dependencies = [
[[package]]
name = "zstd"
-version = "0.12.3+zstd.1.5.2"
+version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
dependencies = [
- "zstd-safe 6.0.5+zstd.1.5.4",
+ "zstd-safe 6.0.6",
]
[[package]]
@@ -14949,9 +15377,9 @@ dependencies = [
[[package]]
name = "zstd-safe"
-version = "6.0.5+zstd.1.5.4"
+version = "6.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
dependencies = [
"libc",
"zstd-sys",
diff --git a/Cargo.toml b/Cargo.toml
index c23837b9c5ed..c1b94357c3cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,19 +2,29 @@
name = "polkadot"
path = "src/main.rs"
+[[bin]]
+name = "polkadot-execute-worker"
+path = "src/bin/execute-worker.rs"
+
+[[bin]]
+name = "polkadot-prepare-worker"
+path = "src/bin/prepare-worker.rs"
+
[package]
name = "polkadot"
description = "Implementation of a `https://polkadot.network` node in Rust based on the Substrate framework."
-license = "GPL-3.0-only"
rust-version = "1.64.0" # workspace properties
readme = "README.md"
+default-run = "polkadot"
authors.workspace = true
edition.workspace = true
+license.workspace = true
version.workspace = true
[workspace.package]
authors = ["Parity Technologies "]
edition = "2021"
+license = "GPL-3.0-only"
repository = "https://github.com/paritytech/polkadot.git"
version = "0.9.43"
@@ -28,6 +38,10 @@ polkadot-node-core-pvf = { path = "node/core/pvf" }
polkadot-node-core-pvf-prepare-worker = { path = "node/core/pvf/prepare-worker" }
polkadot-overseer = { path = "node/overseer" }
+# Needed for worker binaries.
+polkadot-node-core-pvf-common = { path = "node/core/pvf/common", features = ["test-utils"] }
+polkadot-node-core-pvf-execute-worker = { path = "node/core/pvf/execute-worker" }
+
[dev-dependencies]
assert_cmd = "2.0.4"
nix = { version = "0.26.1", features = ["signal"] }
@@ -36,6 +50,9 @@ tokio = "1.24.2"
substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-core-primitives = { path = "core-primitives" }
+[build-dependencies]
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
+
[workspace]
members = [
"cli",
@@ -79,6 +96,7 @@ members = [
"node/core/chain-selection",
"node/core/dispute-coordinator",
"node/core/parachains-inherent",
+ "node/core/prospective-parachains",
"node/core/provisioner",
"node/core/pvf",
"node/core/pvf/common",
@@ -149,7 +167,6 @@ crossbeam-deque = { opt-level = 3 }
crypto-mac = { opt-level = 3 }
curve25519-dalek = { opt-level = 3 }
ed25519-dalek = { opt-level = 3 }
-flate2 = { opt-level = 3 }
futures-channel = { opt-level = 3 }
hash-db = { opt-level = 3 }
hashbrown = { opt-level = 3 }
@@ -210,6 +227,7 @@ fast-runtime = [ "polkadot-cli/fast-runtime" ]
runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
pyroscope = ["polkadot-cli/pyroscope"]
jemalloc-allocator = ["polkadot-node-core-pvf-prepare-worker/jemalloc-allocator", "polkadot-overseer/jemalloc-allocator"]
+network-protocol-staging = ["polkadot-cli/network-protocol-staging"]
# Enables timeout-based tests supposed to be run only in CI environment as they may be flaky
# when run locally depending on system load
@@ -226,6 +244,8 @@ license-file = ["LICENSE", "0"]
maintainer-scripts = "scripts/packaging/deb-maintainer-scripts"
assets = [
["target/release/polkadot", "/usr/bin/", "755"],
+ ["target/release/polkadot-prepare-worker", "/usr/lib/polkadot/", "755"],
+ ["target/release/polkadot-execute-worker", "/usr/lib/polkadot/", "755"],
["scripts/packaging/polkadot.service", "/lib/systemd/system/", "644"]
]
conf-files = [
diff --git a/README.md b/README.md
index 1f64c941b5ad..59e0cff015d3 100644
--- a/README.md
+++ b/README.md
@@ -1,257 +1,13 @@
-# Polkadot
+Dear contributors and users,
-Implementation of a node in Rust based on the Substrate framework.
+We would like to inform you that we have recently made significant changes to our repository structure. In order to streamline our development process and foster better contributions, we have merged three separate repositories Cumulus, Substrate and Polkadot into a single new repository: [the Polkadot SDK](https://github.com/paritytech/polkadot-sdk). Go ahead and make sure to support us by giving a star ⭐️ to the new repo.
-> **NOTE:** In 2018, we split our implementation of "Polkadot" from its development framework
-> "Substrate". See the [Substrate][substrate-repo] repo for git history prior to 2018.
+By consolidating our codebase, we aim to enhance collaboration and provide a more efficient platform for future development.
-[substrate-repo]: https://github.com/paritytech/substrate
+If you currently have an open pull request in any of the merged repositories, we kindly request that you resubmit your PR in the new repository. This will ensure that your contributions are considered within the updated context and enable us to review and merge them more effectively.
-This repo contains runtimes for the Polkadot, Kusama, and Westend networks. The README provides
-information about installing the `polkadot` binary and developing on the codebase. For more
-specific guides, like how to be a validator, see the
-[Polkadot Wiki](https://wiki.polkadot.network/docs/getting-started).
+We appreciate your understanding and ongoing support throughout this transition. Should you have any questions or require further assistance, please don't hesitate to [reach out to us](https://forum.polkadot.network/t/psa-parity-is-currently-working-on-merging-the-polkadot-stack-repositories-into-one-single-repository/2883).
-## Installation
+Best Regards,
-If you just wish to run a Polkadot node without compiling it yourself, you may
-either run the latest binary from our
-[releases](https://github.com/paritytech/polkadot/releases) page, or install
-Polkadot from one of our package repositories.
-
-Installation from the Debian repository will create a `systemd`
-service that can be used to run a Polkadot node. This is disabled by default,
-and can be started by running `systemctl start polkadot` on demand (use
-`systemctl enable polkadot` to make it auto-start after reboot). By default, it
-will run as the `polkadot` user. Command-line flags passed to the binary can
-be customized by editing `/etc/default/polkadot`. This file will not be
-overwritten on updating polkadot. You may also just run the node directly from
-the command-line.
-
-### Debian-based (Debian, Ubuntu)
-
-Currently supports Debian 10 (Buster) and Ubuntu 20.04 (Focal), and
-derivatives. Run the following commands as the `root` user.
-
-```bash
-# Import the security@parity.io GPG key
-gpg --recv-keys --keyserver hkps://keys.mailvelope.com 9D4B2B6EB8F97156D19669A9FF0812D491B96798
-gpg --export 9D4B2B6EB8F97156D19669A9FF0812D491B96798 > /usr/share/keyrings/parity.gpg
-# Add the Parity repository and update the package index
-echo 'deb [signed-by=/usr/share/keyrings/parity.gpg] https://releases.parity.io/deb release main' > /etc/apt/sources.list.d/parity.list
-apt update
-# Install the `parity-keyring` package - This will ensure the GPG key
-# used by APT remains up-to-date
-apt install parity-keyring
-# Install polkadot
-apt install polkadot
-
-```
-
-## Building
-
-### Install via Cargo
-
-Make sure you have the support software installed from the **Build from Source** section
-below this section.
-
-If you want to install Polkadot in your PATH, you can do so with:
-
-```bash
-cargo install --git https://github.com/paritytech/polkadot --tag polkadot --locked
-```
-
-### Build from Source
-
-If you'd like to build from source, first install Rust. You may need to add Cargo's bin directory
-to your PATH environment variable. Restarting your computer will do this for you automatically.
-
-```bash
-curl https://sh.rustup.rs -sSf | sh
-```
-
-If you already have Rust installed, make sure you're using the latest version by running:
-
-```bash
-rustup update
-```
-
-Once done, finish installing the support software:
-
-```bash
-sudo apt install build-essential git clang libclang-dev pkg-config libssl-dev
-```
-
-Build the client by cloning this repository and running the following commands from the root
-directory of the repo:
-
-```bash
-git checkout
-./scripts/init.sh
-cargo build --release
-```
-
-Note that compilation is a memory intensive process. We recommend having 4 GiB of physical RAM or swap available (keep in mind that if a build hits swap it tends to be very slow).
-
-#### Build from Source with Docker
-
-You can also build from source using
-[Parity CI docker image](https://github.com/paritytech/scripts/tree/master/dockerfiles/ci-linux):
-
-```bash
-git checkout
-docker run --rm -it -w /shellhere/polkadot \
- -v $(pwd):/shellhere/polkadot \
- paritytech/ci-linux:production cargo build --release
-sudo chown -R $(id -u):$(id -g) target/
-```
-
-If you want to reproduce other steps of CI process you can use the following
-[guide](https://github.com/paritytech/scripts#gitlab-ci-for-building-docker-images).
-
-## Networks
-
-This repo supports runtimes for Polkadot, Kusama, and Westend.
-
-### Connect to Polkadot Mainnet
-
-Connect to the global Polkadot Mainnet network by running:
-
-```bash
-./target/release/polkadot --chain=polkadot
-```
-
-You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
-
-[telemetry]: https://telemetry.polkadot.io/#list/Polkadot
-
-### Connect to the "Kusama" Canary Network
-
-Connect to the global Kusama canary network by running:
-
-```bash
-./target/release/polkadot --chain=kusama
-```
-
-You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
-
-[telemetry]: https://telemetry.polkadot.io/#list/Kusama
-
-### Connect to the Westend Testnet
-
-Connect to the global Westend testnet by running:
-
-```bash
-./target/release/polkadot --chain=westend
-```
-
-You can see your node on [telemetry] (set a custom name with `--name "my custom name"`).
-
-[telemetry]: https://telemetry.polkadot.io/#list/Westend
-
-### Obtaining DOTs
-
-If you want to do anything on Polkadot, Kusama, or Westend, then you'll need to get an account and
-some DOT, KSM, or WND tokens, respectively. See the
-[claims instructions](https://claims.polkadot.network/) for Polkadot if you have DOTs to claim. For
-Westend's WND tokens, see the faucet
-[instructions](https://wiki.polkadot.network/docs/learn-DOT#getting-westies) on the Wiki.
-
-## Hacking on Polkadot
-
-If you'd actually like to hack on Polkadot, you can grab the source code and build it. Ensure you have
-Rust and the support software installed. This script will install or update Rust and install the
-required dependencies (this may take up to 30 minutes on Mac machines):
-
-```bash
-curl https://getsubstrate.io -sSf | bash -s -- --fast
-```
-
-Then, grab the Polkadot source code:
-
-```bash
-git clone https://github.com/paritytech/polkadot.git
-cd polkadot
-```
-
-Then build the code. You will need to build in release mode (`--release`) to start a network. Only
-use debug mode for development (faster compile times for development and testing).
-
-```bash
-./scripts/init.sh # Install WebAssembly. Update Rust
-cargo build # Builds all native code
-```
-
-You can run the tests if you like:
-
-```bash
-cargo test --workspace --release
-```
-
-You can start a development chain with:
-
-```bash
-cargo run -- --dev
-```
-
-Detailed logs may be shown by running the node with the following environment variables set:
-
-```bash
-RUST_LOG=debug RUST_BACKTRACE=1 cargo run -- --dev
-```
-
-### Development
-
-You can run a simple single-node development "network" on your machine by running:
-
-```bash
-polkadot --dev
-```
-
-You can muck around by heading to and choose "Local Node" from the
-Settings menu.
-
-### Local Two-node Testnet
-
-If you want to see the multi-node consensus algorithm in action locally, then you can create a
-local testnet. You'll need two terminals open. In one, run:
-
-```bash
-polkadot --chain=polkadot-local --alice -d /tmp/alice
-```
-
-And in the other, run:
-
-```bash
-polkadot --chain=polkadot-local --bob -d /tmp/bob --port 30334 --bootnodes '/ip4/127.0.0.1/tcp/30333/p2p/ALICE_BOOTNODE_ID_HERE'
-```
-
-Ensure you replace `ALICE_BOOTNODE_ID_HERE` with the node ID from the output of the first terminal.
-
-### Monitoring
-
-[Setup Prometheus and Grafana](https://wiki.polkadot.network/docs/maintain-guides-how-to-monitor-your-node).
-
-Once you set this up you can take a look at the [Polkadot Grafana dashboards](grafana/README.md) that we currently maintain.
-
-### Using Docker
-
-[Using Docker](doc/docker.md)
-
-### Shell Completion
-
-[Shell Completion](doc/shell-completion.md)
-
-## Contributing
-
-### Contributing Guidelines
-
-[Contribution Guidelines](CONTRIBUTING.md)
-
-### Contributor Code of Conduct
-
-[Code of Conduct](CODE_OF_CONDUCT.md)
-
-## License
-
-Polkadot is [GPL 3.0 licensed](LICENSE).
+Parity Technologies
\ No newline at end of file
diff --git a/node/core/pvf/common/build.rs b/build.rs
similarity index 80%
rename from node/core/pvf/common/build.rs
rename to build.rs
index 40e9f832586e..84fe22e23ed6 100644
--- a/node/core/pvf/common/build.rs
+++ b/build.rs
@@ -16,4 +16,7 @@
fn main() {
substrate_build_script_utils::generate_cargo_keys();
+ // For the node/worker version check, make sure we always rebuild the node and binary workers
+ // when the version changes.
+ substrate_build_script_utils::rerun_if_git_head_changed();
}
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index e7aa562880cc..9846bc4cf66e 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -4,6 +4,7 @@ description = "Polkadot Relay-chain Client Node"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[package.metadata.wasm-pack.profile.release]
# `wasm-opt` has some problems on Linux, see
@@ -22,8 +23,6 @@ pyro = { package = "pyroscope", version = "0.5.3", optional = true }
pyroscope_pprofrs = { version = "0.2", optional = true }
service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
-polkadot-node-core-pvf-execute-worker = { path = "../node/core/pvf/execute-worker", optional = true }
-polkadot-node-core-pvf-prepare-worker = { path = "../node/core/pvf/prepare-worker", optional = true }
polkadot-performance-test = { path = "../node/test/performance-test", optional = true }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -53,8 +52,6 @@ cli = [
"sc-tracing",
"frame-benchmarking-cli",
"try-runtime-cli",
- "polkadot-node-core-pvf-execute-worker",
- "polkadot-node-core-pvf-prepare-worker",
"service",
]
runtime-benchmarks = [
@@ -78,3 +75,4 @@ rococo-native = ["service/rococo-native"]
malus = ["full-node", "service/malus"]
runtime-metrics = ["service/runtime-metrics", "polkadot-node-metrics/runtime-metrics"]
+network-protocol-staging = ["service/network-protocol-staging"]
diff --git a/cli/build.rs b/cli/build.rs
index 018ea752a009..483cc04163fc 100644
--- a/cli/build.rs
+++ b/cli/build.rs
@@ -19,4 +19,7 @@ fn main() {
println!("cargo:rustc-cfg=build_type=\"{}\"", profile);
}
substrate_build_script_utils::generate_cargo_keys();
+ // For the node/worker version check, make sure we always rebuild the node when the version
+ // changes.
+ substrate_build_script_utils::rerun_if_git_head_changed();
}
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index 69c54b428a92..66205902b79d 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -17,6 +17,10 @@
//! Polkadot CLI library.
use clap::Parser;
+use std::path::PathBuf;
+
+/// The version of the node. The passed-in version of the workers should match this.
+pub const NODE_VERSION: &'static str = env!("SUBSTRATE_CLI_IMPL_VERSION");
#[allow(missing_docs)]
#[derive(Debug, Parser)]
@@ -42,14 +46,6 @@ pub enum Subcommand {
/// Revert the chain to a previous state.
Revert(sc_cli::RevertCmd),
- #[allow(missing_docs)]
- #[command(name = "prepare-worker", hide = true)]
- PvfPrepareWorker(ValidationWorkerCommand),
-
- #[allow(missing_docs)]
- #[command(name = "execute-worker", hide = true)]
- PvfExecuteWorker(ValidationWorkerCommand),
-
/// Sub-commands concerned with benchmarking.
/// The pallet benchmarking moved to the `pallet` sub-command.
#[command(subcommand)]
@@ -59,12 +55,9 @@ pub enum Subcommand {
/// capabilities of running a validator.
HostPerfCheck,
- /// Try some command against runtime state.
- #[cfg(feature = "try-runtime")]
- TryRuntime(try_runtime_cli::TryRuntimeCmd),
-
- /// Try some command against runtime state. Note: `try-runtime` feature must be enabled.
- #[cfg(not(feature = "try-runtime"))]
+ /// Try-runtime has migrated to a standalone CLI
+ /// (). The subcommand exists as a stub and
+ /// deprecation notice. It will be removed entirely some time after Janurary 2024.
TryRuntime,
/// Key management CLI utilities
@@ -75,17 +68,6 @@ pub enum Subcommand {
ChainInfo(sc_cli::ChainInfoCmd),
}
-#[allow(missing_docs)]
-#[derive(Debug, Parser)]
-pub struct ValidationWorkerCommand {
- /// The path to the validation host's socket.
- #[arg(long)]
- pub socket_path: String,
- /// Calling node implementation version
- #[arg(long)]
- pub node_impl_version: String,
-}
-
#[allow(missing_docs)]
#[derive(Debug, Parser)]
#[group(skip)]
@@ -148,6 +130,17 @@ pub struct RunCmd {
/// **Dangerous!** Do not touch unless explicitly adviced to.
#[arg(long)]
pub overseer_channel_capacity_override: Option,
+
+ /// Path to the directory where auxiliary worker binaries reside. If not specified, the main
+ /// binary's directory is searched first, then `/usr/lib/polkadot` is searched. TESTING ONLY:
+ /// if the path points to an executable rather then directory, that executable is used both as
+ /// preparation and execution worker.
+ #[arg(long, value_name = "PATH")]
+ pub workers_path: Option,
+
+ /// TESTING ONLY: disable the version check between nodes and workers.
+ #[arg(long, hide = true)]
+ pub disable_worker_version_check: bool,
}
#[allow(missing_docs)]
diff --git a/cli/src/command.rs b/cli/src/command.rs
index 8697f999b545..a2a00d0ebd3f 100644
--- a/cli/src/command.rs
+++ b/cli/src/command.rs
@@ -14,10 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see .
-use crate::cli::{Cli, Subcommand};
+use crate::cli::{Cli, Subcommand, NODE_VERSION};
use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE};
use futures::future::TryFutureExt;
-use log::info;
+use log::{info, warn};
use sc_cli::SubstrateCli;
use service::{
self,
@@ -55,7 +55,7 @@ impl SubstrateCli for Cli {
}
fn impl_version() -> String {
- env!("SUBSTRATE_CLI_IMPL_VERSION").into()
+ NODE_VERSION.into()
}
fn description() -> String {
@@ -148,8 +148,8 @@ impl SubstrateCli for Cli {
let chain_spec = Box::new(service::PolkadotChainSpec::from_json_file(path.clone())?)
as Box;
- // When `force_*` is given or the file name starts with the name of one of the known chains,
- // we use the chain spec for the specific chain.
+ // When `force_*` is given or the file name starts with the name of one of the known
+ // chains, we use the chain spec for the specific chain.
if self.run.force_rococo ||
chain_spec.is_rococo() ||
chain_spec.is_wococo() ||
@@ -240,9 +240,24 @@ where
.map_err(Error::from)?;
let chain_spec = &runner.config().chain_spec;
- // By default, enable BEEFY on test networks.
- let enable_beefy = (chain_spec.is_rococo() || chain_spec.is_wococo() || chain_spec.is_versi()) &&
- !cli.run.no_beefy;
+ // By default, enable BEEFY on all networks except Polkadot (for now), unless
+ // explicitly disabled through CLI.
+ let mut enable_beefy = !chain_spec.is_polkadot() && !cli.run.no_beefy;
+ // BEEFY doesn't (yet) support warp sync:
+ // Until we implement https://github.com/paritytech/substrate/issues/14756
+ // - disallow warp sync for validators,
+ // - disable BEEFY when warp sync for non-validators.
+ if enable_beefy && runner.config().network.sync_mode.is_warp() {
+ if runner.config().role.is_authority() {
+ return Err(Error::Other(
+ "Warp sync not supported for validator nodes running BEEFY.".into(),
+ ))
+ } else {
+ // disable BEEFY for non-validator nodes that are warp syncing
+ warn!("🥩 BEEFY not supported when warp syncing. Disabling BEEFY.");
+ enable_beefy = false;
+ }
+ }
set_default_ss58_version(chain_spec);
@@ -272,6 +287,9 @@ where
None
};
+ let node_version =
+ if cli.run.disable_worker_version_check { None } else { Some(NODE_VERSION.to_string()) };
+
runner.run_node_until_exit(move |config| async move {
let hwbench = (!cli.run.no_hardware_benchmarks)
.then_some(config.database.path().map(|database_path| {
@@ -283,16 +301,22 @@ where
let database_source = config.database.clone();
let task_manager = service::build_full(
config,
- service::IsCollator::No,
- grandpa_pause,
- enable_beefy,
- jaeger_agent,
- None,
- false,
- overseer_gen,
- cli.run.overseer_channel_capacity_override,
- maybe_malus_finality_delay,
- hwbench,
+ service::NewFullParams {
+ is_parachain_node: service::IsParachainNode::No,
+ grandpa_pause,
+ enable_beefy,
+ jaeger_agent,
+ telemetry_worker_handle: None,
+ node_version,
+ workers_path: cli.run.workers_path,
+ workers_names: None,
+ overseer_gen,
+ overseer_message_channel_capacity_override: cli
+ .run
+ .overseer_channel_capacity_override,
+ malus_finality_delay: maybe_malus_finality_delay,
+ hwbench,
+ },
)
.map(|full| full.task_manager)?;
@@ -419,50 +443,6 @@ pub fn run() -> Result<()> {
))
})?)
},
- Some(Subcommand::PvfPrepareWorker(cmd)) => {
- let mut builder = sc_cli::LoggerBuilder::new("");
- builder.with_colors(false);
- let _ = builder.init();
-
- #[cfg(target_os = "android")]
- {
- return Err(sc_cli::Error::Input(
- "PVF preparation workers are not supported under this platform".into(),
- )
- .into())
- }
-
- #[cfg(not(target_os = "android"))]
- {
- polkadot_node_core_pvf_prepare_worker::worker_entrypoint(
- &cmd.socket_path,
- Some(&cmd.node_impl_version),
- );
- Ok(())
- }
- },
- Some(Subcommand::PvfExecuteWorker(cmd)) => {
- let mut builder = sc_cli::LoggerBuilder::new("");
- builder.with_colors(false);
- let _ = builder.init();
-
- #[cfg(target_os = "android")]
- {
- return Err(sc_cli::Error::Input(
- "PVF execution workers are not supported under this platform".into(),
- )
- .into())
- }
-
- #[cfg(not(target_os = "android"))]
- {
- polkadot_node_core_pvf_execute_worker::worker_entrypoint(
- &cmd.socket_path,
- Some(&cmd.node_impl_version),
- );
- Ok(())
- }
- },
Some(Subcommand::Benchmark(cmd)) => {
let runner = cli.create_runner(cmd)?;
let chain_spec = &runner.config().chain_spec;
@@ -566,68 +546,12 @@ pub fn run() -> Result<()> {
},
Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?),
#[cfg(feature = "try-runtime")]
- Some(Subcommand::TryRuntime(cmd)) => {
- use sc_service::TaskManager;
- use try_runtime_cli::block_building_info::timestamp_with_babe_info;
-
- let runner = cli.create_runner(cmd)?;
- let chain_spec = &runner.config().chain_spec;
- set_default_ss58_version(chain_spec);
-
- let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
- let task_manager = TaskManager::new(runner.config().tokio_handle.clone(), *registry)
- .map_err(|e| Error::SubstrateService(sc_service::Error::Prometheus(e)))?;
-
- ensure_dev(chain_spec).map_err(Error::Other)?;
-
- #[cfg(feature = "kusama-native")]
- if chain_spec.is_kusama() {
- return runner.async_run(|_| {
- Ok((
- cmd.run::(
- Some(timestamp_with_babe_info(service::kusama_runtime_constants::time::MILLISECS_PER_BLOCK))
- )
- .map_err(Error::SubstrateCli),
- task_manager,
- ))
- })
- }
-
- #[cfg(feature = "westend-native")]
- if chain_spec.is_westend() {
- return runner.async_run(|_| {
- Ok((
- cmd.run::(
- Some(timestamp_with_babe_info(service::westend_runtime_constants::time::MILLISECS_PER_BLOCK))
- )
- .map_err(Error::SubstrateCli),
- task_manager,
- ))
- })
- }
- // else we assume it is polkadot.
- #[cfg(feature = "polkadot-native")]
- {
- return runner.async_run(|_| {
- Ok((
- cmd.run::(
- Some(timestamp_with_babe_info(service::polkadot_runtime_constants::time::MILLISECS_PER_BLOCK))
- )
- .map_err(Error::SubstrateCli),
- task_manager,
- ))
- })
- }
- #[cfg(not(feature = "polkadot-native"))]
- panic!("No runtime feature (polkadot, kusama, westend, rococo) is enabled")
- },
+ Some(Subcommand::TryRuntime) => Err(try_runtime_cli::DEPRECATION_NOTICE.to_owned().into()),
#[cfg(not(feature = "try-runtime"))]
- Some(Subcommand::TryRuntime) => Err(Error::Other(
- "TryRuntime wasn't enabled when building the node. \
+ Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \
You can enable it with `--features try-runtime`."
- .into(),
- )
- .into()),
+ .to_owned()
+ .into()),
Some(Subcommand::ChainInfo(cmd)) => {
let runner = cli.create_runner(cmd)?;
Ok(runner.sync_run(|config| cmd.run::(&config))?)
diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
index 7412c2b6e7e0..0ed315e1307e 100644
--- a/core-primitives/Cargo.toml
+++ b/core-primitives/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-core-primitives"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/core-primitives/src/lib.rs b/core-primitives/src/lib.rs
index 5e06966ecfee..aa01cf8dfc45 100644
--- a/core-primitives/src/lib.rs
+++ b/core-primitives/src/lib.rs
@@ -91,10 +91,10 @@ impl sp_std::fmt::Debug for CandidateHash {
pub type Nonce = u32;
/// The balance of an account.
-/// 128-bits (or 38 significant decimal figures) will allow for 10 m currency (`10^7`) at a resolution
-/// to all for one second's worth of an annualised 50% reward be paid to a unit holder (`10^11` unit
-/// denomination), or `10^18` total atomic units, to grow at 50%/year for 51 years (`10^9` multiplier)
-/// for an eventual total of `10^27` units (27 significant decimal figures).
+/// 128-bits (or 38 significant decimal figures) will allow for 10 m currency (`10^7`) at a
+/// resolution to all for one second's worth of an annualised 50% reward be paid to a unit holder
+/// (`10^11` unit denomination), or `10^18` total atomic units, to grow at 50%/year for 51 years
+/// (`10^9` multiplier) for an eventual total of `10^27` units (27 significant decimal figures).
/// We round denomination to `10^12` (12 SDF), and leave the other redundancy at the upper end so
/// that 32 bits may be multiplied with a balance in 128 bits without worrying about overflow.
pub type Balance = u128;
@@ -121,8 +121,8 @@ pub type Remark = [u8; 32];
/// The size of the message is limited by the `config.max_downward_message_size` parameter.
pub type DownwardMessage = sp_std::vec::Vec;
-/// A wrapped version of `DownwardMessage`. The difference is that it has attached the block number when
-/// the message was sent.
+/// A wrapped version of `DownwardMessage`. The difference is that it has attached the block number
+/// when the message was sent.
#[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, TypeInfo)]
pub struct InboundDownwardMessage {
/// The block number at which these messages were put into the downward message queue.
diff --git a/doc/docker.md b/doc/docker.md
index e8b7fa74732e..f20c2d001edd 100644
--- a/doc/docker.md
+++ b/doc/docker.md
@@ -1,43 +1,58 @@
-# Using Docker
+# Using Containers
+
+The following commands should work no matter if you use Docker or Podman. In general, Podman is recommended. All commands are "engine neutral" so you can use the container engine of your choice while still being able to copy/paste the commands below.
+
+Let's start defining Podman as our engine:
+```
+ENGINE=podman
+```
+
+If you prefer to stick with Docker, use:
+```
+ENGINE=docker
+```
## The easiest way
-The easiest/faster option to run Polkadot in Docker is to use the latest release images. These are small images that use the latest official release of the Polkadot binary, pulled from our package repository.
+The easiest/faster option to run Polkadot in Docker is to use the latest release images. These are small images that use the latest official release of the Polkadot binary, pulled from our Debian package.
-**_Following examples are running on westend chain and without SSL. They can be used to quick start and learn how Polkadot needs to be configured. Please find out how to secure your node, if you want to operate it on the internet. Do not expose RPC and WS ports, if they are not correctly configured._**
+**_The following examples are running on westend chain and without SSL. They can be used to quick start and learn how Polkadot needs to be configured. Please find out how to secure your node, if you want to operate it on the internet. Do not expose RPC and WS ports, if they are not correctly configured._**
Let's first check the version we have. The first time you run this command, the Polkadot docker image will be downloaded. This takes a bit of time and bandwidth, be patient:
```bash
-docker run --rm -it parity/polkadot:latest --version
+$ENGINE run --rm -it parity/polkadot:latest --version
```
You can also pass any argument/flag that Polkadot supports:
```bash
-docker run --rm -it parity/polkadot:latest --chain westend --name "PolkaDocker"
+$ENGINE run --rm -it parity/polkadot:latest --chain westend --name "PolkaDocker"
```
## Examples
-Once you are done experimenting and picking the best node name :) you can start Polkadot as daemon, exposes the Polkadot ports and mount a volume that will keep your blockchain data locally. Make sure that you set the ownership of your local directory to the Polkadot user that is used by the container. Set user id 1000 and group id 1000, by running `chown 1000.1000 /my/local/folder -R` if you use a bind mount.
-
-To start a Polkadot node on default rpc port 9933 and default p2p port 30333 use the following command. If you want to connect to rpc port 9933, then must add Polkadot startup parameter: `--rpc-external`.
+Once you are done experimenting and picking the best node name :) you can start Polkadot as daemon, exposes the Polkadot ports and mount a volume that will keep your blockchain data locally. Make sure that you set the ownership of your local directory to the Polkadot user that is used by the container.
-```bash
-docker run -d -p 30333:30333 -p 9933:9933 -v /my/local/folder:/polkadot parity/polkadot:latest --chain westend --rpc-external --rpc-cors all
-```
+Set user id 1000 and group id 1000, by running `chown 1000.1000 /my/local/folder -R` if you use a bind mount.
-Additionally if you want to have custom node name you can add the `--name "YourName"` at the end
+To start a Polkadot node on default rpc port 9933 and default p2p port 30333 use the following command. If you want to connect to rpc port 9933, then must add Polkadot startup parameter: `--rpc-external`.
```bash
-docker run -d -p 30333:30333 -p 9933:9933 -v /my/local/folder:/polkadot parity/polkadot:latest --chain westend --rpc-external --rpc-cors all --name "PolkaDocker"
+$ENGINE run -d -p 30333:30333 -p 9933:9933 \
+ -v /my/local/folder:/polkadot \
+ parity/polkadot:latest \
+ --chain westend --rpc-external --rpc-cors all \
+ --name "PolkaDocker
```
If you also want to expose the webservice port 9944 use the following command:
```bash
-docker run -d -p 30333:30333 -p 9933:9933 -p 9944:9944 -v /my/local/folder:/polkadot parity/polkadot:latest --chain westend --ws-external --rpc-external --rpc-cors all --name "PolkaDocker"
+$ENGINE run -d -p 30333:30333 -p 9933:9933 -p 9944:9944 \
+ -v /my/local/folder:/polkadot \
+ parity/polkadot:latest \
+ --chain westend --ws-external --rpc-external --rpc-cors all --name "PolkaDocker"
```
## Using Docker compose
@@ -55,17 +70,19 @@ services:
- 30333:30333 # p2p port
- 9933:9933 # rpc port
- 9944:9944 # ws port
+ - 9615:9615 # Prometheus port
volumes:
- /my/local/folder:/polkadot
command: [
"--name", "PolkaDocker",
"--ws-external",
"--rpc-external",
+ "--prometheus-external",
"--rpc-cors", "all"
]
```
-With following docker-compose.yml you can set up a node and use polkadot-js-apps as the front end on port 80. After starting the node use a browser and enter your Docker host IP in the URL field: __
+With following `docker-compose.yml` you can set up a node and use polkadot-js-apps as the front end on port 80. After starting the node use a browser and enter your Docker host IP in the URL field: __
```bash
version: '2'
@@ -78,10 +95,12 @@ services:
- 30333:30333 # p2p port
- 9933:9933 # rpc port
- 9944:9944 # ws port
+ - 9615:9615 # Prometheus port
command: [
"--name", "PolkaDocker",
"--ws-external",
"--rpc-external",
+ "--prometheus-external",
"--rpc-cors", "all"
]
@@ -100,27 +119,30 @@ Chain syncing will utilize all available memory and CPU power your server has to
If running on a low resource VPS, use `--memory` and `--cpus` to limit the resources used. E.g. To allow a maximum of 512MB memory and 50% of 1 CPU, use `--cpus=".5" --memory="512m"`. Read more about limiting a container's resources [here](https://docs.docker.com/config/containers/resource_constraints).
-Start a shell session with the daemon:
-```bash
-docker exec -it $(docker ps -q) bash;
-```
+## Build your own image
-Check the current version:
+There are 3 options to build a polkadot container image:
+- using the builder image
+- using the injected "Debian" image
+- using the generic injected image
-```bash
-polkadot --version
-```
+### Builder image
-## Build your own image
+To get up and running with the smallest footprint on your system, you may use an existing Polkadot Container image.
-To get up and running with the smallest footprint on your system, you may use the Polkadot Docker image.
-You can build it yourself (it takes a while...) in the shell session of the daemon:
+You may also build a polkadot container image yourself (it takes a while...) using the container specs `scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile`.
-```bash
-cd scripts/ci/dockerfiles/polkadot
-./build.sh
-```
+### Debian injected
+
+The Debian injected image is how the official polkadot container image is produced. It relies on the Debian package that is published upon each release. The Debian injected image is usually available a few minutes after a new release is published.
+It has the benefit of relying on the GPG signatures embedded in the Debian package.
+
+### Generic injected
+
+For simple testing purposes, the easiest option for polkadot and also random binaries, is to use the `binary_injected.Dockerfile` container spec. This option is less secure since the injected binary is not checked at all but it has the benefit to be simple. This option requires to already have a valid `polkadot` binary, compiled for Linux.
+
+This binary is then simply copied inside the `parity/base-bin` image.
## Reporting issues
@@ -128,8 +150,8 @@ If you run into issues with Polkadot when using docker, please run the following
(replace the tag with the appropriate one if you do not use latest):
```bash
-docker run --rm -it parity/polkadot:latest --version
+$ENGINE run --rm -it parity/polkadot:latest --version
```
This will show you the Polkadot version as well as the git commit ref that was used to build your container.
-Just paste that in the issue you create.
+You can now paste the version information in a [new issue](https://github.com/paritytech/polkadot/issues/new/choose).
diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
index 44aa86f881c8..8dfb775c6f49 100644
--- a/erasure-coding/Cargo.toml
+++ b/erasure-coding/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-erasure-coding"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
polkadot-primitives = { path = "../primitives" }
diff --git a/erasure-coding/fuzzer/Cargo.toml b/erasure-coding/fuzzer/Cargo.toml
index e67a00cb0c1a..9dee8e657840 100644
--- a/erasure-coding/fuzzer/Cargo.toml
+++ b/erasure-coding/fuzzer/Cargo.toml
@@ -3,6 +3,7 @@ name = "erasure_coding_fuzzer"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
publish = false
[dependencies]
diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
index a7badc877d45..60c165784673 100644
--- a/node/collation-generation/Cargo.toml
+++ b/node/collation-generation/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-collation-generation"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
@@ -20,3 +21,5 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../primitives/test-helpers" }
+assert_matches = "1.4.0"
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/node/collation-generation/src/lib.rs b/node/collation-generation/src/lib.rs
index 02a0e8df8f61..27779f3d1acb 100644
--- a/node/collation-generation/src/lib.rs
+++ b/node/collation-generation/src/lib.rs
@@ -22,28 +22,34 @@
//!
//! * If there is no collation generation config, ignore.
//! * Otherwise, for each `activated` head in the update:
-//! * Determine if the para is scheduled on any core by fetching the `availability_cores` Runtime API.
+//! * Determine if the para is scheduled on any core by fetching the `availability_cores` Runtime
+//! API.
//! * Use the Runtime API subsystem to fetch the full validation data.
-//! * Invoke the `collator`, and use its outputs to produce a [`CandidateReceipt`], signed with the configuration's `key`.
+//! * Invoke the `collator`, and use its outputs to produce a [`CandidateReceipt`], signed with
+//! the configuration's `key`.
//! * Dispatch a [`CollatorProtocolMessage::DistributeCollation`]`(receipt, pov)`.
#![deny(missing_docs)]
-use futures::{channel::mpsc, future::FutureExt, join, select, sink::SinkExt, stream::StreamExt};
+use futures::{channel::oneshot, future::FutureExt, join, select};
use parity_scale_codec::Encode;
-use polkadot_node_primitives::{AvailableData, CollationGenerationConfig, PoV};
+use polkadot_node_primitives::{
+ AvailableData, Collation, CollationGenerationConfig, CollationSecondedSignal, PoV,
+ SubmitCollationParams,
+};
use polkadot_node_subsystem::{
messages::{CollationGenerationMessage, CollatorProtocolMessage},
- overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, SpawnedSubsystem,
+ overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, RuntimeApiError, SpawnedSubsystem,
SubsystemContext, SubsystemError, SubsystemResult,
};
use polkadot_node_subsystem_util::{
- request_availability_cores, request_persisted_validation_data, request_validation_code,
- request_validation_code_hash, request_validators,
+ request_availability_cores, request_persisted_validation_data,
+ request_staging_async_backing_params, request_validation_code, request_validation_code_hash,
+ request_validators,
};
use polkadot_primitives::{
collator_signature_payload, CandidateCommitments, CandidateDescriptor, CandidateReceipt,
- CoreState, Hash, Id as ParaId, OccupiedCoreAssumption, PersistedValidationData,
+ CollatorPair, CoreState, Hash, Id as ParaId, OccupiedCoreAssumption, PersistedValidationData,
ValidationCodeHash,
};
use sp_core::crypto::Pair;
@@ -77,46 +83,33 @@ impl CollationGenerationSubsystem {
/// Conceptually, this is very simple: it just loops forever.
///
/// - On incoming overseer messages, it starts or stops jobs as appropriate.
- /// - On other incoming messages, if they can be converted into `Job::ToJob` and
- /// include a hash, then they're forwarded to the appropriate individual job.
+ /// - On other incoming messages, if they can be converted into `Job::ToJob` and include a hash,
+ /// then they're forwarded to the appropriate individual job.
/// - On outgoing messages from the jobs, it forwards them to the overseer.
///
/// If `err_tx` is not `None`, errors are forwarded onto that channel as they occur.
/// Otherwise, most are logged and then discarded.
async fn run(mut self, mut ctx: Context) {
- // when we activate new leaves, we spawn a bunch of sub-tasks, each of which is
- // expected to generate precisely one message. We don't want to block the main loop
- // at any point waiting for them all, so instead, we create a channel on which they can
- // send those messages. We can then just monitor the channel and forward messages on it
- // to the overseer here, via the context.
- let (sender, receiver) = mpsc::channel(0);
-
- let mut receiver = receiver.fuse();
loop {
select! {
incoming = ctx.recv().fuse() => {
- if self.handle_incoming::(incoming, &mut ctx, &sender).await {
+ if self.handle_incoming::(incoming, &mut ctx).await {
break;
}
},
- msg = receiver.next() => {
- if let Some(msg) = msg {
- ctx.send_message(msg).await;
- }
- },
}
}
}
// handle an incoming message. return true if we should break afterwards.
- // note: this doesn't strictly need to be a separate function; it's more an administrative function
- // so that we don't clutter the run loop. It could in principle be inlined directly into there.
- // it should hopefully therefore be ok that it's an async function mutably borrowing self.
+ // note: this doesn't strictly need to be a separate function; it's more an administrative
+ // function so that we don't clutter the run loop. It could in principle be inlined directly
+ // into there. it should hopefully therefore be ok that it's an async function mutably borrowing
+ // self.
async fn handle_incoming(
&mut self,
incoming: SubsystemResult::Message>>,
ctx: &mut Context,
- sender: &mpsc::Sender,
) -> bool {
match incoming {
Ok(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
@@ -131,7 +124,6 @@ impl CollationGenerationSubsystem {
activated.into_iter().map(|v| v.hash),
ctx,
metrics,
- sender,
)
.await
{
@@ -152,6 +144,21 @@ impl CollationGenerationSubsystem {
}
false
},
+ Ok(FromOrchestra::Communication {
+ msg: CollationGenerationMessage::SubmitCollation(params),
+ }) => {
+ if let Some(config) = &self.config {
+ if let Err(err) =
+ handle_submit_collation(params, config, ctx, &self.metrics).await
+ {
+ gum::error!(target: LOG_TARGET, ?err, "Failed to submit collation");
+ }
+ } else {
+ gum::error!(target: LOG_TARGET, "Collation submitted before initialization");
+ }
+
+ false
+ },
Ok(FromOrchestra::Signal(OverseerSignal::BlockFinalized(..))) => false,
Err(err) => {
gum::error!(
@@ -185,23 +192,28 @@ async fn handle_new_activations(
activated: impl IntoIterator- ,
ctx: &mut Context,
metrics: Metrics,
- sender: &mpsc::Sender,
) -> crate::error::Result<()> {
// follow the procedure from the guide:
// https://paritytech.github.io/polkadot/book/node/collators/collation-generation.html
+ if config.collator.is_none() {
+ return Ok(())
+ }
+
let _overall_timer = metrics.time_new_activations();
for relay_parent in activated {
let _relay_parent_timer = metrics.time_new_activations_relay_parent();
- let (availability_cores, validators) = join!(
+ let (availability_cores, validators, async_backing_params) = join!(
request_availability_cores(relay_parent, ctx.sender()).await,
request_validators(relay_parent, ctx.sender()).await,
+ request_staging_async_backing_params(relay_parent, ctx.sender()).await,
);
let availability_cores = availability_cores??;
let n_validators = validators??.len();
+ let async_backing_params = async_backing_params?.ok();
for (core_idx, core) in availability_cores.into_iter().enumerate() {
let _availability_core_timer = metrics.time_new_activations_availability_core();
@@ -209,15 +221,30 @@ async fn handle_new_activations(
let (scheduled_core, assumption) = match core {
CoreState::Scheduled(scheduled_core) =>
(scheduled_core, OccupiedCoreAssumption::Free),
- CoreState::Occupied(_occupied_core) => {
- // TODO: https://github.com/paritytech/polkadot/issues/1573
- gum::trace!(
- target: LOG_TARGET,
- core_idx = %core_idx,
- relay_parent = ?relay_parent,
- "core is occupied. Keep going.",
- );
- continue
+ CoreState::Occupied(occupied_core) => match async_backing_params {
+ Some(params) if params.max_candidate_depth >= 1 => {
+ // maximum candidate depth when building on top of a block
+ // pending availability is necessarily 1 - the depth of the
+ // pending block is 0 so the child has depth 1.
+
+ // TODO [now]: this assumes that next up == current.
+ // in practice we should only set `OccupiedCoreAssumption::Included`
+ // when the candidate occupying the core is also of the same para.
+ if let Some(scheduled) = occupied_core.next_up_on_available {
+ (scheduled, OccupiedCoreAssumption::Included)
+ } else {
+ continue
+ }
+ },
+ _ => {
+ gum::trace!(
+ target: LOG_TARGET,
+ core_idx = %core_idx,
+ relay_parent = ?relay_parent,
+ "core is occupied. Keep going.",
+ );
+ continue
+ },
},
CoreState::Free => {
gum::trace!(
@@ -268,7 +295,7 @@ async fn handle_new_activations(
},
};
- let validation_code_hash = match obtain_current_validation_code_hash(
+ let validation_code_hash = match obtain_validation_code_hash_with_assumption(
relay_parent,
scheduled_core.para_id,
assumption,
@@ -291,15 +318,18 @@ async fn handle_new_activations(
};
let task_config = config.clone();
- let mut task_sender = sender.clone();
let metrics = metrics.clone();
+ let mut task_sender = ctx.sender().clone();
ctx.spawn(
"collation-builder",
Box::pin(async move {
- let persisted_validation_data_hash = validation_data.hash();
+ let collator_fn = match task_config.collator.as_ref() {
+ Some(x) => x,
+ None => return,
+ };
let (collation, result_sender) =
- match (task_config.collator)(relay_parent, &validation_data).await {
+ match collator_fn(relay_parent, &validation_data).await {
Some(collation) => collation.into_inner(),
None => {
gum::debug!(
@@ -311,103 +341,21 @@ async fn handle_new_activations(
},
};
- // Apply compression to the block data.
- let pov = {
- let pov = collation.proof_of_validity.into_compressed();
- let encoded_size = pov.encoded_size();
-
- // As long as `POV_BOMB_LIMIT` is at least `max_pov_size`, this ensures
- // that honest collators never produce a PoV which is uncompressed.
- //
- // As such, honest collators never produce an uncompressed PoV which starts with
- // a compression magic number, which would lead validators to reject the collation.
- if encoded_size > validation_data.max_pov_size as usize {
- gum::debug!(
- target: LOG_TARGET,
- para_id = %scheduled_core.para_id,
- size = encoded_size,
- max_size = validation_data.max_pov_size,
- "PoV exceeded maximum size"
- );
-
- return
- }
-
- pov
- };
-
- let pov_hash = pov.hash();
-
- let signature_payload = collator_signature_payload(
- &relay_parent,
- &scheduled_core.para_id,
- &persisted_validation_data_hash,
- &pov_hash,
- &validation_code_hash,
- );
-
- let erasure_root =
- match erasure_root(n_validators, validation_data, pov.clone()) {
- Ok(erasure_root) => erasure_root,
- Err(err) => {
- gum::error!(
- target: LOG_TARGET,
- para_id = %scheduled_core.para_id,
- err = ?err,
- "failed to calculate erasure root",
- );
- return
- },
- };
-
- let commitments = CandidateCommitments {
- upward_messages: collation.upward_messages,
- horizontal_messages: collation.horizontal_messages,
- new_validation_code: collation.new_validation_code,
- head_data: collation.head_data,
- processed_downward_messages: collation.processed_downward_messages,
- hrmp_watermark: collation.hrmp_watermark,
- };
-
- let ccr = CandidateReceipt {
- commitments_hash: commitments.hash(),
- descriptor: CandidateDescriptor {
- signature: task_config.key.sign(&signature_payload),
+ construct_and_distribute_receipt(
+ PreparedCollation {
+ collation,
para_id: scheduled_core.para_id,
relay_parent,
- collator: task_config.key.public(),
- persisted_validation_data_hash,
- pov_hash,
- erasure_root,
- para_head: commitments.head_data.hash(),
+ validation_data,
validation_code_hash,
+ n_validators,
},
- };
-
- gum::debug!(
- target: LOG_TARGET,
- candidate_hash = ?ccr.hash(),
- ?pov_hash,
- ?relay_parent,
- para_id = %scheduled_core.para_id,
- "candidate is generated",
- );
- metrics.on_collation_generated();
-
- if let Err(err) = task_sender
- .send(
- CollatorProtocolMessage::DistributeCollation(ccr, pov, result_sender)
- .into(),
- )
- .await
- {
- gum::warn!(
- target: LOG_TARGET,
- para_id = %scheduled_core.para_id,
- err = ?err,
- "failed to send collation result",
- );
- }
+ task_config.key.clone(),
+ &mut task_sender,
+ result_sender,
+ &metrics,
+ )
+ .await;
}),
)?;
}
@@ -416,14 +364,199 @@ async fn handle_new_activations(
Ok(())
}
-async fn obtain_current_validation_code_hash(
+#[overseer::contextbounds(CollationGeneration, prefix = self::overseer)]
+async fn handle_submit_collation(
+ params: SubmitCollationParams,
+ config: &CollationGenerationConfig,
+ ctx: &mut Context,
+ metrics: &Metrics,
+) -> crate::error::Result<()> {
+ let _timer = metrics.time_submit_collation();
+
+ let SubmitCollationParams {
+ relay_parent,
+ collation,
+ parent_head,
+ validation_code_hash,
+ result_sender,
+ } = params;
+
+ let validators = request_validators(relay_parent, ctx.sender()).await.await??;
+ let n_validators = validators.len();
+
+ // We need to swap the parent-head data, but all other fields here will be correct.
+ let mut validation_data = match request_persisted_validation_data(
+ relay_parent,
+ config.para_id,
+ OccupiedCoreAssumption::TimedOut,
+ ctx.sender(),
+ )
+ .await
+ .await??
+ {
+ Some(v) => v,
+ None => {
+ gum::debug!(
+ target: LOG_TARGET,
+ relay_parent = ?relay_parent,
+ our_para = %config.para_id,
+ "No validation data for para - does it exist at this relay-parent?",
+ );
+ return Ok(())
+ },
+ };
+
+ validation_data.parent_head = parent_head;
+
+ let collation = PreparedCollation {
+ collation,
+ relay_parent,
+ para_id: config.para_id,
+ validation_data,
+ validation_code_hash,
+ n_validators,
+ };
+
+ construct_and_distribute_receipt(
+ collation,
+ config.key.clone(),
+ ctx.sender(),
+ result_sender,
+ metrics,
+ )
+ .await;
+
+ Ok(())
+}
+
+struct PreparedCollation {
+ collation: Collation,
+ para_id: ParaId,
+ relay_parent: Hash,
+ validation_data: PersistedValidationData,
+ validation_code_hash: ValidationCodeHash,
+ n_validators: usize,
+}
+
+/// Takes a prepared collation, along with its context, and produces a candidate receipt
+/// which is distributed to validators.
+async fn construct_and_distribute_receipt(
+ collation: PreparedCollation,
+ key: CollatorPair,
+ sender: &mut impl overseer::CollationGenerationSenderTrait,
+ result_sender: Option>,
+ metrics: &Metrics,
+) {
+ let PreparedCollation {
+ collation,
+ para_id,
+ relay_parent,
+ validation_data,
+ validation_code_hash,
+ n_validators,
+ } = collation;
+
+ let persisted_validation_data_hash = validation_data.hash();
+ let parent_head_data_hash = validation_data.parent_head.hash();
+
+ // Apply compression to the block data.
+ let pov = {
+ let pov = collation.proof_of_validity.into_compressed();
+ let encoded_size = pov.encoded_size();
+
+ // As long as `POV_BOMB_LIMIT` is at least `max_pov_size`, this ensures
+ // that honest collators never produce a PoV which is uncompressed.
+ //
+ // As such, honest collators never produce an uncompressed PoV which starts with
+ // a compression magic number, which would lead validators to reject the collation.
+ if encoded_size > validation_data.max_pov_size as usize {
+ gum::debug!(
+ target: LOG_TARGET,
+ para_id = %para_id,
+ size = encoded_size,
+ max_size = validation_data.max_pov_size,
+ "PoV exceeded maximum size"
+ );
+
+ return
+ }
+
+ pov
+ };
+
+ let pov_hash = pov.hash();
+
+ let signature_payload = collator_signature_payload(
+ &relay_parent,
+ ¶_id,
+ &persisted_validation_data_hash,
+ &pov_hash,
+ &validation_code_hash,
+ );
+
+ let erasure_root = match erasure_root(n_validators, validation_data, pov.clone()) {
+ Ok(erasure_root) => erasure_root,
+ Err(err) => {
+ gum::error!(
+ target: LOG_TARGET,
+ para_id = %para_id,
+ err = ?err,
+ "failed to calculate erasure root",
+ );
+ return
+ },
+ };
+
+ let commitments = CandidateCommitments {
+ upward_messages: collation.upward_messages,
+ horizontal_messages: collation.horizontal_messages,
+ new_validation_code: collation.new_validation_code,
+ head_data: collation.head_data,
+ processed_downward_messages: collation.processed_downward_messages,
+ hrmp_watermark: collation.hrmp_watermark,
+ };
+
+ let ccr = CandidateReceipt {
+ commitments_hash: commitments.hash(),
+ descriptor: CandidateDescriptor {
+ signature: key.sign(&signature_payload),
+ para_id,
+ relay_parent,
+ collator: key.public(),
+ persisted_validation_data_hash,
+ pov_hash,
+ erasure_root,
+ para_head: commitments.head_data.hash(),
+ validation_code_hash,
+ },
+ };
+
+ gum::debug!(
+ target: LOG_TARGET,
+ candidate_hash = ?ccr.hash(),
+ ?pov_hash,
+ ?relay_parent,
+ para_id = %para_id,
+ "candidate is generated",
+ );
+ metrics.on_collation_generated();
+
+ sender
+ .send_message(CollatorProtocolMessage::DistributeCollation(
+ ccr,
+ parent_head_data_hash,
+ pov,
+ result_sender,
+ ))
+ .await;
+}
+
+async fn obtain_validation_code_hash_with_assumption(
relay_parent: Hash,
para_id: ParaId,
assumption: OccupiedCoreAssumption,
sender: &mut impl overseer::CollationGenerationSenderTrait,
-) -> Result, crate::error::Error> {
- use polkadot_node_subsystem::RuntimeApiError;
-
+) -> crate::error::Result> {
match request_validation_code_hash(relay_parent, para_id, assumption, sender)
.await
.await?
diff --git a/node/collation-generation/src/metrics.rs b/node/collation-generation/src/metrics.rs
index cb9e4a0c8e85..c7690ec82c4f 100644
--- a/node/collation-generation/src/metrics.rs
+++ b/node/collation-generation/src/metrics.rs
@@ -22,6 +22,7 @@ pub(crate) struct MetricsInner {
pub(crate) new_activations_overall: prometheus::Histogram,
pub(crate) new_activations_per_relay_parent: prometheus::Histogram,
pub(crate) new_activations_per_availability_core: prometheus::Histogram,
+ pub(crate) submit_collation: prometheus::Histogram,
}
/// `CollationGenerationSubsystem` metrics.
@@ -57,6 +58,11 @@ impl Metrics {
.as_ref()
.map(|metrics| metrics.new_activations_per_availability_core.start_timer())
}
+
+ /// Provide a timer for submitting a collation which updates on drop.
+ pub fn time_submit_collation(&self) -> Option {
+ self.0.as_ref().map(|metrics| metrics.submit_collation.start_timer())
+ }
}
impl metrics::Metrics for Metrics {
@@ -96,6 +102,15 @@ impl metrics::Metrics for Metrics {
)?,
registry,
)?,
+ submit_collation: prometheus::register(
+ prometheus::Histogram::with_opts(
+ prometheus::HistogramOpts::new(
+ "polkadot_parachain_collation_generation_submit_collation",
+ "Time spent preparing and submitting a collation to the network protocol",
+ )
+ )?,
+ registry,
+ )?,
};
Ok(Metrics(Some(metrics)))
}
diff --git a/node/collation-generation/src/tests.rs b/node/collation-generation/src/tests.rs
index b2534bcf36c1..da6b343e6aee 100644
--- a/node/collation-generation/src/tests.rs
+++ b/node/collation-generation/src/tests.rs
@@ -14,472 +14,623 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see .
-mod handle_new_activations {
- use super::super::*;
- use ::test_helpers::{dummy_hash, dummy_head_data, dummy_validator};
- use futures::{
- lock::Mutex,
- task::{Context as FuturesContext, Poll},
- Future,
+use super::*;
+use assert_matches::assert_matches;
+use futures::{
+ lock::Mutex,
+ task::{Context as FuturesContext, Poll},
+ Future,
+};
+use polkadot_node_primitives::{BlockData, Collation, CollationResult, MaybeCompressedPoV, PoV};
+use polkadot_node_subsystem::{
+ errors::RuntimeApiError,
+ messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest},
+};
+use polkadot_node_subsystem_test_helpers::{subsystem_test_harness, TestSubsystemContextHandle};
+use polkadot_node_subsystem_util::TimeoutExt;
+use polkadot_primitives::{
+ CollatorPair, HeadData, Id as ParaId, PersistedValidationData, ScheduledCore, ValidationCode,
+};
+use sp_keyring::sr25519::Keyring as Sr25519Keyring;
+use std::pin::Pin;
+use test_helpers::{dummy_hash, dummy_head_data, dummy_validator};
+
+type VirtualOverseer = TestSubsystemContextHandle;
+
+fn test_harness>(test: impl FnOnce(VirtualOverseer) -> T) {
+ let pool = sp_core::testing::TaskExecutor::new();
+ let (context, virtual_overseer) =
+ polkadot_node_subsystem_test_helpers::make_subsystem_context(pool);
+ let subsystem = async move {
+ let subsystem = crate::CollationGenerationSubsystem::new(Metrics::default());
+
+ subsystem.run(context).await;
};
- use polkadot_node_primitives::{
- BlockData, Collation, CollationResult, MaybeCompressedPoV, PoV,
- };
- use polkadot_node_subsystem::{
- errors::RuntimeApiError,
- messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest},
- };
- use polkadot_node_subsystem_test_helpers::{
- subsystem_test_harness, TestSubsystemContextHandle,
- };
- use polkadot_primitives::{
- CollatorPair, Id as ParaId, PersistedValidationData, ScheduledCore, ValidationCode,
- };
- use std::pin::Pin;
-
- fn test_collation() -> Collation {
- Collation {
- upward_messages: Default::default(),
- horizontal_messages: Default::default(),
- new_validation_code: None,
- head_data: dummy_head_data(),
- proof_of_validity: MaybeCompressedPoV::Raw(PoV { block_data: BlockData(Vec::new()) }),
- processed_downward_messages: 0_u32,
- hrmp_watermark: 0_u32.into(),
- }
- }
- fn test_collation_compressed() -> Collation {
- let mut collation = test_collation();
- let compressed = collation.proof_of_validity.clone().into_compressed();
- collation.proof_of_validity = MaybeCompressedPoV::Compressed(compressed);
- collation
- }
+ let test_fut = test(virtual_overseer);
+
+ futures::pin_mut!(test_fut);
+ futures::executor::block_on(futures::future::join(
+ async move {
+ let mut virtual_overseer = test_fut.await;
+ // Ensure we have handled all responses.
+ if let Ok(Some(msg)) = virtual_overseer.rx.try_next() {
+ panic!("Did not handle all responses: {:?}", msg);
+ }
+ // Conclude.
+ virtual_overseer.send(FromOrchestra::Signal(OverseerSignal::Conclude)).await;
+ },
+ subsystem,
+ ));
+}
- fn test_validation_data() -> PersistedValidationData {
- let mut persisted_validation_data = PersistedValidationData::default();
- persisted_validation_data.max_pov_size = 1024;
- persisted_validation_data
+fn test_collation() -> Collation {
+ Collation {
+ upward_messages: Default::default(),
+ horizontal_messages: Default::default(),
+ new_validation_code: None,
+ head_data: dummy_head_data(),
+ proof_of_validity: MaybeCompressedPoV::Raw(PoV { block_data: BlockData(Vec::new()) }),
+ processed_downward_messages: 0_u32,
+ hrmp_watermark: 0_u32.into(),
}
+}
- // Box + Unpin + Send
- struct TestCollator;
+fn test_collation_compressed() -> Collation {
+ let mut collation = test_collation();
+ let compressed = collation.proof_of_validity.clone().into_compressed();
+ collation.proof_of_validity = MaybeCompressedPoV::Compressed(compressed);
+ collation
+}
- impl Future for TestCollator {
- type Output = Option;
+fn test_validation_data() -> PersistedValidationData {
+ let mut persisted_validation_data = PersistedValidationData::default();
+ persisted_validation_data.max_pov_size = 1024;
+ persisted_validation_data
+}
- fn poll(self: Pin<&mut Self>, _cx: &mut FuturesContext) -> Poll {
- Poll::Ready(Some(CollationResult { collation: test_collation(), result_sender: None }))
- }
+// Box + Unpin + Send
+struct TestCollator;
+
+impl Future for TestCollator {
+ type Output = Option;
+
+ fn poll(self: Pin<&mut Self>, _cx: &mut FuturesContext) -> Poll {
+ Poll::Ready(Some(CollationResult { collation: test_collation(), result_sender: None }))
}
+}
+
+impl Unpin for TestCollator {}
- impl Unpin for TestCollator {}
+async fn overseer_recv(overseer: &mut VirtualOverseer) -> AllMessages {
+ const TIMEOUT: std::time::Duration = std::time::Duration::from_millis(2000);
- fn test_config>(para_id: Id) -> Arc {
- Arc::new(CollationGenerationConfig {
- key: CollatorPair::generate().0,
- collator: Box::new(|_: Hash, _vd: &PersistedValidationData| TestCollator.boxed()),
- para_id: para_id.into(),
- })
+ overseer
+ .recv()
+ .timeout(TIMEOUT)
+ .await
+ .expect(&format!("{:?} is long enough to receive messages", TIMEOUT))
+}
+
+fn test_config>(para_id: Id) -> CollationGenerationConfig {
+ CollationGenerationConfig {
+ key: CollatorPair::generate().0,
+ collator: Some(Box::new(|_: Hash, _vd: &PersistedValidationData| TestCollator.boxed())),
+ para_id: para_id.into(),
}
+}
- fn scheduled_core_for>(para_id: Id) -> ScheduledCore {
- ScheduledCore { para_id: para_id.into(), collator: None }
+fn test_config_no_collator>(para_id: Id) -> CollationGenerationConfig {
+ CollationGenerationConfig {
+ key: CollatorPair::generate().0,
+ collator: None,
+ para_id: para_id.into(),
}
+}
- #[test]
- fn requests_availability_per_relay_parent() {
- let activated_hashes: Vec =
- vec![[1; 32].into(), [4; 32].into(), [9; 32].into(), [16; 32].into()];
-
- let requested_availability_cores = Arc::new(Mutex::new(Vec::new()));
-
- let overseer_requested_availability_cores = requested_availability_cores.clone();
- let overseer = |mut handle: TestSubsystemContextHandle| async move {
- loop {
- match handle.try_recv().await {
- None => break,
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(hash, RuntimeApiRequest::AvailabilityCores(tx)))) => {
- overseer_requested_availability_cores.lock().await.push(hash);
- tx.send(Ok(vec![])).unwrap();
- }
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(_hash, RuntimeApiRequest::Validators(tx)))) => {
- tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
- }
- Some(msg) => panic!("didn't expect any other overseer requests given no availability cores; got {:?}", msg),
+fn scheduled_core_for>(para_id: Id) -> ScheduledCore {
+ ScheduledCore { para_id: para_id.into(), collator: None }
+}
+
+#[test]
+fn requests_availability_per_relay_parent() {
+ let activated_hashes: Vec =
+ vec![[1; 32].into(), [4; 32].into(), [9; 32].into(), [16; 32].into()];
+
+ let requested_availability_cores = Arc::new(Mutex::new(Vec::new()));
+
+ let overseer_requested_availability_cores = requested_availability_cores.clone();
+ let overseer = |mut handle: TestSubsystemContextHandle| async move {
+ loop {
+ match handle.try_recv().await {
+ None => break,
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(hash, RuntimeApiRequest::AvailabilityCores(tx)))) => {
+ overseer_requested_availability_cores.lock().await.push(hash);
+ tx.send(Ok(vec![])).unwrap();
+ }
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(_hash, RuntimeApiRequest::Validators(tx)))) => {
+ tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
}
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::StagingAsyncBackingParams(
+ tx,
+ ),
+ ))) => {
+ tx.send(Err(RuntimeApiError::NotSupported { runtime_api_name: "doesnt_matter" })).unwrap();
+ },
+ Some(msg) => panic!("didn't expect any other overseer requests given no availability cores; got {:?}", msg),
}
- };
-
- let (tx, _rx) = mpsc::channel(0);
-
- let subsystem_activated_hashes = activated_hashes.clone();
- subsystem_test_harness(overseer, |mut ctx| async move {
- handle_new_activations(
- test_config(123u32),
- subsystem_activated_hashes,
- &mut ctx,
- Metrics(None),
- &tx,
- )
- .await
- .unwrap();
- });
-
- let mut requested_availability_cores = Arc::try_unwrap(requested_availability_cores)
- .expect("overseer should have shut down by now")
- .into_inner();
- requested_availability_cores.sort();
+ }
+ };
- assert_eq!(requested_availability_cores, activated_hashes);
- }
+ let subsystem_activated_hashes = activated_hashes.clone();
+ subsystem_test_harness(overseer, |mut ctx| async move {
+ handle_new_activations(
+ Arc::new(test_config(123u32)),
+ subsystem_activated_hashes,
+ &mut ctx,
+ Metrics(None),
+ )
+ .await
+ .unwrap();
+ });
+
+ let mut requested_availability_cores = Arc::try_unwrap(requested_availability_cores)
+ .expect("overseer should have shut down by now")
+ .into_inner();
+ requested_availability_cores.sort();
+
+ assert_eq!(requested_availability_cores, activated_hashes);
+}
- #[test]
- fn requests_validation_data_for_scheduled_matches() {
- let activated_hashes: Vec = vec![
- Hash::repeat_byte(1),
- Hash::repeat_byte(4),
- Hash::repeat_byte(9),
- Hash::repeat_byte(16),
- ];
-
- let requested_validation_data = Arc::new(Mutex::new(Vec::new()));
-
- let overseer_requested_validation_data = requested_validation_data.clone();
- let overseer = |mut handle: TestSubsystemContextHandle| async move {
- loop {
- match handle.try_recv().await {
- None => break,
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- hash,
- RuntimeApiRequest::AvailabilityCores(tx),
- ))) => {
- tx.send(Ok(vec![
- CoreState::Free,
- // this is weird, see explanation below
- CoreState::Scheduled(scheduled_core_for(
- (hash.as_fixed_bytes()[0] * 4) as u32,
- )),
- CoreState::Scheduled(scheduled_core_for(
- (hash.as_fixed_bytes()[0] * 5) as u32,
- )),
- ]))
- .unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- hash,
- RuntimeApiRequest::PersistedValidationData(
- _para_id,
- _occupied_core_assumption,
- tx,
- ),
- ))) => {
- overseer_requested_validation_data.lock().await.push(hash);
- tx.send(Ok(None)).unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _hash,
- RuntimeApiRequest::Validators(tx),
- ))) => {
- tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
- },
- Some(msg) => {
- panic!("didn't expect any other overseer requests; got {:?}", msg)
- },
- }
+#[test]
+fn requests_validation_data_for_scheduled_matches() {
+ let activated_hashes: Vec = vec![
+ Hash::repeat_byte(1),
+ Hash::repeat_byte(4),
+ Hash::repeat_byte(9),
+ Hash::repeat_byte(16),
+ ];
+
+ let requested_validation_data = Arc::new(Mutex::new(Vec::new()));
+
+ let overseer_requested_validation_data = requested_validation_data.clone();
+ let overseer = |mut handle: TestSubsystemContextHandle| async move {
+ loop {
+ match handle.try_recv().await {
+ None => break,
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ hash,
+ RuntimeApiRequest::AvailabilityCores(tx),
+ ))) => {
+ tx.send(Ok(vec![
+ CoreState::Free,
+ // this is weird, see explanation below
+ CoreState::Scheduled(scheduled_core_for(
+ (hash.as_fixed_bytes()[0] * 4) as u32,
+ )),
+ CoreState::Scheduled(scheduled_core_for(
+ (hash.as_fixed_bytes()[0] * 5) as u32,
+ )),
+ ]))
+ .unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ hash,
+ RuntimeApiRequest::PersistedValidationData(
+ _para_id,
+ _occupied_core_assumption,
+ tx,
+ ),
+ ))) => {
+ overseer_requested_validation_data.lock().await.push(hash);
+ tx.send(Ok(None)).unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::Validators(tx),
+ ))) => {
+ tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::StagingAsyncBackingParams(tx),
+ ))) => {
+ tx.send(Err(RuntimeApiError::NotSupported {
+ runtime_api_name: "doesnt_matter",
+ }))
+ .unwrap();
+ },
+ Some(msg) => {
+ panic!("didn't expect any other overseer requests; got {:?}", msg)
+ },
}
- };
+ }
+ };
- let (tx, _rx) = mpsc::channel(0);
+ subsystem_test_harness(overseer, |mut ctx| async move {
+ handle_new_activations(
+ Arc::new(test_config(16)),
+ activated_hashes,
+ &mut ctx,
+ Metrics(None),
+ )
+ .await
+ .unwrap();
+ });
+
+ let requested_validation_data = Arc::try_unwrap(requested_validation_data)
+ .expect("overseer should have shut down by now")
+ .into_inner();
+
+ // the only activated hash should be from the 4 hash:
+ // each activated hash generates two scheduled cores: one with its value * 4, one with its value
+ // * 5 given that the test configuration has a `para_id` of 16, there's only one way to get that
+ // value: with the 4 hash.
+ assert_eq!(requested_validation_data, vec![[4; 32].into()]);
+}
- subsystem_test_harness(overseer, |mut ctx| async move {
- handle_new_activations(test_config(16), activated_hashes, &mut ctx, Metrics(None), &tx)
- .await
- .unwrap();
- });
+#[test]
+fn sends_distribute_collation_message() {
+ let activated_hashes: Vec = vec![
+ Hash::repeat_byte(1),
+ Hash::repeat_byte(4),
+ Hash::repeat_byte(9),
+ Hash::repeat_byte(16),
+ ];
+
+ // empty vec doesn't allocate on the heap, so it's ok we throw it away
+ let to_collator_protocol = Arc::new(Mutex::new(Vec::new()));
+ let inner_to_collator_protocol = to_collator_protocol.clone();
+
+ let overseer = |mut handle: TestSubsystemContextHandle| async move {
+ loop {
+ match handle.try_recv().await {
+ None => break,
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ hash,
+ RuntimeApiRequest::AvailabilityCores(tx),
+ ))) => {
+ tx.send(Ok(vec![
+ CoreState::Free,
+ // this is weird, see explanation below
+ CoreState::Scheduled(scheduled_core_for(
+ (hash.as_fixed_bytes()[0] * 4) as u32,
+ )),
+ CoreState::Scheduled(scheduled_core_for(
+ (hash.as_fixed_bytes()[0] * 5) as u32,
+ )),
+ ]))
+ .unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::PersistedValidationData(
+ _para_id,
+ _occupied_core_assumption,
+ tx,
+ ),
+ ))) => {
+ tx.send(Ok(Some(test_validation_data()))).unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::Validators(tx),
+ ))) => {
+ tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::ValidationCodeHash(
+ _para_id,
+ OccupiedCoreAssumption::Free,
+ tx,
+ ),
+ ))) => {
+ tx.send(Ok(Some(ValidationCode(vec![1, 2, 3]).hash()))).unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::StagingAsyncBackingParams(tx),
+ ))) => {
+ tx.send(Err(RuntimeApiError::NotSupported {
+ runtime_api_name: "doesnt_matter",
+ }))
+ .unwrap();
+ },
+ Some(msg @ AllMessages::CollatorProtocol(_)) => {
+ inner_to_collator_protocol.lock().await.push(msg);
+ },
+ Some(msg) => {
+ panic!("didn't expect any other overseer requests; got {:?}", msg)
+ },
+ }
+ }
+ };
- let requested_validation_data = Arc::try_unwrap(requested_validation_data)
- .expect("overseer should have shut down by now")
- .into_inner();
+ let config = Arc::new(test_config(16));
+ let subsystem_config = config.clone();
- // the only activated hash should be from the 4 hash:
- // each activated hash generates two scheduled cores: one with its value * 4, one with its value * 5
- // given that the test configuration has a `para_id` of 16, there's only one way to get that value: with the 4
- // hash.
- assert_eq!(requested_validation_data, vec![[4; 32].into()]);
+ subsystem_test_harness(overseer, |mut ctx| async move {
+ handle_new_activations(subsystem_config, activated_hashes, &mut ctx, Metrics(None))
+ .await
+ .unwrap();
+ });
+
+ let mut to_collator_protocol = Arc::try_unwrap(to_collator_protocol)
+ .expect("subsystem should have shut down by now")
+ .into_inner();
+
+ // we expect a single message to be sent, containing a candidate receipt.
+ // we don't care too much about the `commitments_hash` right now, but let's ensure that we've
+ // calculated the correct descriptor
+ let expect_pov_hash = test_collation_compressed().proof_of_validity.into_compressed().hash();
+ let expect_validation_data_hash = test_validation_data().hash();
+ let expect_relay_parent = Hash::repeat_byte(4);
+ let expect_validation_code_hash = ValidationCode(vec![1, 2, 3]).hash();
+ let expect_payload = collator_signature_payload(
+ &expect_relay_parent,
+ &config.para_id,
+ &expect_validation_data_hash,
+ &expect_pov_hash,
+ &expect_validation_code_hash,
+ );
+ let expect_descriptor = CandidateDescriptor {
+ signature: config.key.sign(&expect_payload),
+ para_id: config.para_id,
+ relay_parent: expect_relay_parent,
+ collator: config.key.public(),
+ persisted_validation_data_hash: expect_validation_data_hash,
+ pov_hash: expect_pov_hash,
+ erasure_root: dummy_hash(), // this isn't something we're checking right now
+ para_head: test_collation().head_data.hash(),
+ validation_code_hash: expect_validation_code_hash,
+ };
+
+ assert_eq!(to_collator_protocol.len(), 1);
+ match AllMessages::from(to_collator_protocol.pop().unwrap()) {
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::DistributeCollation(
+ CandidateReceipt { descriptor, .. },
+ _pov,
+ ..,
+ )) => {
+ // signature generation is non-deterministic, so we can't just assert that the
+ // expected descriptor is correct. What we can do is validate that the produced
+ // descriptor has a valid signature, then just copy in the generated signature
+ // and check the rest of the fields for equality.
+ assert!(CollatorPair::verify(
+ &descriptor.signature,
+ &collator_signature_payload(
+ &descriptor.relay_parent,
+ &descriptor.para_id,
+ &descriptor.persisted_validation_data_hash,
+ &descriptor.pov_hash,
+ &descriptor.validation_code_hash,
+ )
+ .as_ref(),
+ &descriptor.collator,
+ ));
+ let expect_descriptor = {
+ let mut expect_descriptor = expect_descriptor;
+ expect_descriptor.signature = descriptor.signature.clone();
+ expect_descriptor.erasure_root = descriptor.erasure_root;
+ expect_descriptor
+ };
+ assert_eq!(descriptor, expect_descriptor);
+ },
+ _ => panic!("received wrong message type"),
}
+}
- #[test]
- fn sends_distribute_collation_message() {
- let activated_hashes: Vec = vec![
- Hash::repeat_byte(1),
- Hash::repeat_byte(4),
- Hash::repeat_byte(9),
- Hash::repeat_byte(16),
- ];
-
- let overseer = |mut handle: TestSubsystemContextHandle| async move {
- loop {
- match handle.try_recv().await {
- None => break,
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- hash,
- RuntimeApiRequest::AvailabilityCores(tx),
- ))) => {
- tx.send(Ok(vec![
- CoreState::Free,
- // this is weird, see explanation below
- CoreState::Scheduled(scheduled_core_for(
- (hash.as_fixed_bytes()[0] * 4) as u32,
- )),
- CoreState::Scheduled(scheduled_core_for(
- (hash.as_fixed_bytes()[0] * 5) as u32,
- )),
- ]))
- .unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _hash,
- RuntimeApiRequest::PersistedValidationData(
- _para_id,
- _occupied_core_assumption,
- tx,
- ),
- ))) => {
- tx.send(Ok(Some(test_validation_data()))).unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _hash,
- RuntimeApiRequest::Validators(tx),
- ))) => {
- tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _hash,
- RuntimeApiRequest::ValidationCodeHash(
- _para_id,
- OccupiedCoreAssumption::Free,
- tx,
- ),
- ))) => {
- tx.send(Ok(Some(ValidationCode(vec![1, 2, 3]).hash()))).unwrap();
- },
- Some(msg) => {
- panic!("didn't expect any other overseer requests; got {:?}", msg)
- },
- }
+#[test]
+fn fallback_when_no_validation_code_hash_api() {
+ // This is a variant of the above test, but with the validation code hash API disabled.
+
+ let activated_hashes: Vec = vec![
+ Hash::repeat_byte(1),
+ Hash::repeat_byte(4),
+ Hash::repeat_byte(9),
+ Hash::repeat_byte(16),
+ ];
+
+ // empty vec doesn't allocate on the heap, so it's ok we throw it away
+ let to_collator_protocol = Arc::new(Mutex::new(Vec::new()));
+ let inner_to_collator_protocol = to_collator_protocol.clone();
+
+ let overseer = |mut handle: TestSubsystemContextHandle| async move {
+ loop {
+ match handle.try_recv().await {
+ None => break,
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ hash,
+ RuntimeApiRequest::AvailabilityCores(tx),
+ ))) => {
+ tx.send(Ok(vec![
+ CoreState::Free,
+ CoreState::Scheduled(scheduled_core_for(
+ (hash.as_fixed_bytes()[0] * 4) as u32,
+ )),
+ CoreState::Scheduled(scheduled_core_for(
+ (hash.as_fixed_bytes()[0] * 5) as u32,
+ )),
+ ]))
+ .unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::PersistedValidationData(
+ _para_id,
+ _occupied_core_assumption,
+ tx,
+ ),
+ ))) => {
+ tx.send(Ok(Some(test_validation_data()))).unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::Validators(tx),
+ ))) => {
+ tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::ValidationCodeHash(
+ _para_id,
+ OccupiedCoreAssumption::Free,
+ tx,
+ ),
+ ))) => {
+ tx.send(Err(RuntimeApiError::NotSupported {
+ runtime_api_name: "validation_code_hash",
+ }))
+ .unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::ValidationCode(_para_id, OccupiedCoreAssumption::Free, tx),
+ ))) => {
+ tx.send(Ok(Some(ValidationCode(vec![1, 2, 3])))).unwrap();
+ },
+ Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _hash,
+ RuntimeApiRequest::StagingAsyncBackingParams(tx),
+ ))) => {
+ tx.send(Err(RuntimeApiError::NotSupported {
+ runtime_api_name: "doesnt_matter",
+ }))
+ .unwrap();
+ },
+ Some(msg @ AllMessages::CollatorProtocol(_)) => {
+ inner_to_collator_protocol.lock().await.push(msg);
+ },
+ Some(msg) => {
+ panic!("didn't expect any other overseer requests; got {:?}", msg)
+ },
}
- };
-
- let config = test_config(16);
- let subsystem_config = config.clone();
-
- let (tx, rx) = mpsc::channel(0);
-
- // empty vec doesn't allocate on the heap, so it's ok we throw it away
- let sent_messages = Arc::new(Mutex::new(Vec::new()));
- let subsystem_sent_messages = sent_messages.clone();
- subsystem_test_harness(overseer, |mut ctx| async move {
- handle_new_activations(
- subsystem_config,
- activated_hashes,
- &mut ctx,
- Metrics(None),
- &tx,
- )
+ }
+ };
+
+ let config = Arc::new(test_config(16u32));
+ let subsystem_config = config.clone();
+
+ // empty vec doesn't allocate on the heap, so it's ok we throw it away
+ subsystem_test_harness(overseer, |mut ctx| async move {
+ handle_new_activations(subsystem_config, activated_hashes, &mut ctx, Metrics(None))
.await
.unwrap();
+ });
+
+ let to_collator_protocol = Arc::try_unwrap(to_collator_protocol)
+ .expect("subsystem should have shut down by now")
+ .into_inner();
+
+ let expect_validation_code_hash = ValidationCode(vec![1, 2, 3]).hash();
+
+ assert_eq!(to_collator_protocol.len(), 1);
+ match &to_collator_protocol[0] {
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::DistributeCollation(
+ CandidateReceipt { descriptor, .. },
+ _pov,
+ ..,
+ )) => {
+ assert_eq!(expect_validation_code_hash, descriptor.validation_code_hash);
+ },
+ _ => panic!("received wrong message type"),
+ }
+}
+
+#[test]
+fn submit_collation_is_no_op_before_initialization() {
+ test_harness(|mut virtual_overseer| async move {
+ virtual_overseer
+ .send(FromOrchestra::Communication {
+ msg: CollationGenerationMessage::SubmitCollation(SubmitCollationParams {
+ relay_parent: Hash::repeat_byte(0),
+ collation: test_collation(),
+ parent_head: vec![1, 2, 3].into(),
+ validation_code_hash: Hash::repeat_byte(1).into(),
+ result_sender: None,
+ }),
+ })
+ .await;
+
+ virtual_overseer
+ });
+}
+
+#[test]
+fn submit_collation_leads_to_distribution() {
+ let relay_parent = Hash::repeat_byte(0);
+ let validation_code_hash = ValidationCodeHash::from(Hash::repeat_byte(42));
+ let parent_head = HeadData::from(vec![1, 2, 3]);
+ let para_id = ParaId::from(5);
+ let expected_pvd = PersistedValidationData {
+ parent_head: parent_head.clone(),
+ relay_parent_number: 10,
+ relay_parent_storage_root: Hash::repeat_byte(1),
+ max_pov_size: 1024,
+ };
- std::mem::drop(tx);
-
- // collect all sent messages
- *subsystem_sent_messages.lock().await = rx.collect().await;
- });
-
- let mut sent_messages = Arc::try_unwrap(sent_messages)
- .expect("subsystem should have shut down by now")
- .into_inner();
-
- // we expect a single message to be sent, containing a candidate receipt.
- // we don't care too much about the `commitments_hash` right now, but let's ensure that we've calculated the
- // correct descriptor
- let expect_pov_hash =
- test_collation_compressed().proof_of_validity.into_compressed().hash();
- let expect_validation_data_hash = test_validation_data().hash();
- let expect_relay_parent = Hash::repeat_byte(4);
- let expect_validation_code_hash = ValidationCode(vec![1, 2, 3]).hash();
- let expect_payload = collator_signature_payload(
- &expect_relay_parent,
- &config.para_id,
- &expect_validation_data_hash,
- &expect_pov_hash,
- &expect_validation_code_hash,
+ test_harness(|mut virtual_overseer| async move {
+ virtual_overseer
+ .send(FromOrchestra::Communication {
+ msg: CollationGenerationMessage::Initialize(test_config_no_collator(para_id)),
+ })
+ .await;
+
+ virtual_overseer
+ .send(FromOrchestra::Communication {
+ msg: CollationGenerationMessage::SubmitCollation(SubmitCollationParams {
+ relay_parent,
+ collation: test_collation(),
+ parent_head: vec![1, 2, 3].into(),
+ validation_code_hash,
+ result_sender: None,
+ }),
+ })
+ .await;
+
+ assert_matches!(
+ overseer_recv(&mut virtual_overseer).await,
+ AllMessages::RuntimeApi(RuntimeApiMessage::Request(rp, RuntimeApiRequest::Validators(tx))) => {
+ assert_eq!(rp, relay_parent);
+ let _ = tx.send(Ok(vec![
+ Sr25519Keyring::Alice.public().into(),
+ Sr25519Keyring::Bob.public().into(),
+ Sr25519Keyring::Charlie.public().into(),
+ ]));
+ }
);
- let expect_descriptor = CandidateDescriptor {
- signature: config.key.sign(&expect_payload),
- para_id: config.para_id,
- relay_parent: expect_relay_parent,
- collator: config.key.public(),
- persisted_validation_data_hash: expect_validation_data_hash,
- pov_hash: expect_pov_hash,
- erasure_root: dummy_hash(), // this isn't something we're checking right now
- para_head: test_collation().head_data.hash(),
- validation_code_hash: expect_validation_code_hash,
- };
-
- assert_eq!(sent_messages.len(), 1);
- match AllMessages::from(sent_messages.pop().unwrap()) {
+
+ assert_matches!(
+ overseer_recv(&mut virtual_overseer).await,
+ AllMessages::RuntimeApi(RuntimeApiMessage::Request(rp, RuntimeApiRequest::PersistedValidationData(id, a, tx))) => {
+ assert_eq!(rp, relay_parent);
+ assert_eq!(id, para_id);
+ assert_eq!(a, OccupiedCoreAssumption::TimedOut);
+
+ // Candidate receipt should be constructed with the real parent head.
+ let mut pvd = expected_pvd.clone();
+ pvd.parent_head = vec![4, 5, 6].into();
+ let _ = tx.send(Ok(Some(pvd)));
+ }
+ );
+
+ assert_matches!(
+ overseer_recv(&mut virtual_overseer).await,
AllMessages::CollatorProtocol(CollatorProtocolMessage::DistributeCollation(
- CandidateReceipt { descriptor, .. },
- _pov,
- ..,
+ ccr,
+ parent_head_data_hash,
+ ..
)) => {
- // signature generation is non-deterministic, so we can't just assert that the
- // expected descriptor is correct. What we can do is validate that the produced
- // descriptor has a valid signature, then just copy in the generated signature
- // and check the rest of the fields for equality.
- assert!(CollatorPair::verify(
- &descriptor.signature,
- &collator_signature_payload(
- &descriptor.relay_parent,
- &descriptor.para_id,
- &descriptor.persisted_validation_data_hash,
- &descriptor.pov_hash,
- &descriptor.validation_code_hash,
- )
- .as_ref(),
- &descriptor.collator,
- ));
- let expect_descriptor = {
- let mut expect_descriptor = expect_descriptor;
- expect_descriptor.signature = descriptor.signature.clone();
- expect_descriptor.erasure_root = descriptor.erasure_root.clone();
- expect_descriptor
- };
- assert_eq!(descriptor, expect_descriptor);
- },
- _ => panic!("received wrong message type"),
- }
- }
-
- #[test]
- fn fallback_when_no_validation_code_hash_api() {
- // This is a variant of the above test, but with the validation code hash API disabled.
-
- let activated_hashes: Vec = vec![
- Hash::repeat_byte(1),
- Hash::repeat_byte(4),
- Hash::repeat_byte(9),
- Hash::repeat_byte(16),
- ];
-
- let overseer = |mut handle: TestSubsystemContextHandle| async move {
- loop {
- match handle.try_recv().await {
- None => break,
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- hash,
- RuntimeApiRequest::AvailabilityCores(tx),
- ))) => {
- tx.send(Ok(vec![
- CoreState::Free,
- CoreState::Scheduled(scheduled_core_for(
- (hash.as_fixed_bytes()[0] * 4) as u32,
- )),
- CoreState::Scheduled(scheduled_core_for(
- (hash.as_fixed_bytes()[0] * 5) as u32,
- )),
- ]))
- .unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _hash,
- RuntimeApiRequest::PersistedValidationData(
- _para_id,
- _occupied_core_assumption,
- tx,
- ),
- ))) => {
- tx.send(Ok(Some(test_validation_data()))).unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _hash,
- RuntimeApiRequest::Validators(tx),
- ))) => {
- tx.send(Ok(vec![dummy_validator(); 3])).unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _hash,
- RuntimeApiRequest::ValidationCodeHash(
- _para_id,
- OccupiedCoreAssumption::Free,
- tx,
- ),
- ))) => {
- tx.send(Err(RuntimeApiError::NotSupported {
- runtime_api_name: "validation_code_hash",
- }))
- .unwrap();
- },
- Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _hash,
- RuntimeApiRequest::ValidationCode(
- _para_id,
- OccupiedCoreAssumption::Free,
- tx,
- ),
- ))) => {
- tx.send(Ok(Some(ValidationCode(vec![1, 2, 3])))).unwrap();
- },
- Some(msg) => {
- panic!("didn't expect any other overseer requests; got {:?}", msg)
- },
- }
+ assert_eq!(parent_head_data_hash, parent_head.hash());
+ assert_eq!(ccr.descriptor().persisted_validation_data_hash, expected_pvd.hash());
+ assert_eq!(ccr.descriptor().para_head, dummy_head_data().hash());
+ assert_eq!(ccr.descriptor().validation_code_hash, validation_code_hash);
}
- };
-
- let config = test_config(16u32);
- let subsystem_config = config.clone();
-
- let (tx, rx) = mpsc::channel(0);
-
- // empty vec doesn't allocate on the heap, so it's ok we throw it away
- let sent_messages = Arc::new(Mutex::new(Vec::new()));
- let subsystem_sent_messages = sent_messages.clone();
- subsystem_test_harness(overseer, |mut ctx| async move {
- handle_new_activations(
- subsystem_config,
- activated_hashes,
- &mut ctx,
- Metrics(None),
- &tx,
- )
- .await
- .unwrap();
+ );
- std::mem::drop(tx);
-
- *subsystem_sent_messages.lock().await = rx.collect().await;
- });
-
- let sent_messages = Arc::try_unwrap(sent_messages)
- .expect("subsystem should have shut down by now")
- .into_inner();
-
- let expect_validation_code_hash = ValidationCode(vec![1, 2, 3]).hash();
-
- assert_eq!(sent_messages.len(), 1);
- match &sent_messages[0] {
- overseer::CollationGenerationOutgoingMessages::CollatorProtocolMessage(
- CollatorProtocolMessage::DistributeCollation(
- CandidateReceipt { descriptor, .. },
- _pov,
- ..,
- ),
- ) => {
- assert_eq!(expect_validation_code_hash, descriptor.validation_code_hash);
- },
- _ => panic!("received wrong message type"),
- }
- }
+ virtual_overseer
+ });
}
diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
index 0cb12b501aea..f31c7d0a1694 100644
--- a/node/core/approval-voting/Cargo.toml
+++ b/node/core/approval-voting/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-approval-voting"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
@@ -10,7 +11,7 @@ futures-timer = "3.0.2"
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }
gum = { package = "tracing-gum", path = "../../gum" }
bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
-lru = "0.9"
+lru = "0.11.0"
merlin = "2.0"
schnorrkel = "0.9.1"
kvdb = "0.13.0"
diff --git a/node/core/approval-voting/src/approval_checking.rs b/node/core/approval-voting/src/approval_checking.rs
index bfecdba73f88..f345b57029b5 100644
--- a/node/core/approval-voting/src/approval_checking.rs
+++ b/node/core/approval-voting/src/approval_checking.rs
@@ -42,8 +42,8 @@ pub enum RequiredTranches {
/// assignments that are before the local time.
maximum_broadcast: DelayTranche,
/// The clock drift, in ticks, to apply to the local clock when determining whether
- /// to broadcast an assignment or when to schedule a wakeup. The local clock should be treated
- /// as though it is `clock_drift` ticks earlier.
+ /// to broadcast an assignment or when to schedule a wakeup. The local clock should be
+ /// treated as though it is `clock_drift` ticks earlier.
clock_drift: Tick,
},
/// An exact number of required tranches and a number of no-shows. This indicates that
@@ -55,8 +55,8 @@ pub enum RequiredTranches {
/// The amount of missing votes that should be tolerated.
tolerated_missing: usize,
/// When the next no-show would be, if any. This is used to schedule the next wakeup in the
- /// event that there are some assignments that don't have corresponding approval votes. If this
- /// is `None`, all assignments have approvals.
+ /// event that there are some assignments that don't have corresponding approval votes. If
+ /// this is `None`, all assignments have approvals.
next_no_show: Option,
/// The last tick at which a needed assignment was received.
last_assignment_tick: Option,
diff --git a/node/core/approval-voting/src/criteria.rs b/node/core/approval-voting/src/criteria.rs
index 40a24e2dd937..0e1d18198c21 100644
--- a/node/core/approval-voting/src/criteria.rs
+++ b/node/core/approval-voting/src/criteria.rs
@@ -218,13 +218,14 @@ impl AssignmentCriteria for RealAssignmentCriteria {
}
/// Compute the assignments for a given block. Returns a map containing all assignments to cores in
-/// the block. If more than one assignment targets the given core, only the earliest assignment is kept.
+/// the block. If more than one assignment targets the given core, only the earliest assignment is
+/// kept.
///
-/// The `leaving_cores` parameter indicates all cores within the block where a candidate was included,
-/// as well as the group index backing those.
+/// The `leaving_cores` parameter indicates all cores within the block where a candidate was
+/// included, as well as the group index backing those.
///
-/// The current description of the protocol assigns every validator to check every core. But at different times.
-/// The idea is that most assignments are never triggered and fall by the wayside.
+/// The current description of the protocol assigns every validator to check every core. But at
+/// different times. The idea is that most assignments are never triggered and fall by the wayside.
///
/// This will not assign to anything the local validator was part of the backing group for.
pub(crate) fn compute_assignments(
@@ -463,8 +464,8 @@ pub(crate) enum InvalidAssignmentReason {
/// * Sample is out of bounds
/// * Validator is present in backing group.
///
-/// This function does not check whether the core is actually a valid assignment or not. That should be done
-/// outside the scope of this function.
+/// This function does not check whether the core is actually a valid assignment or not. That should
+/// be done outside the scope of this function.
pub(crate) fn check_assignment_cert(
claimed_core_index: CoreIndex,
validator_index: ValidatorIndex,
diff --git a/node/core/approval-voting/src/import.rs b/node/core/approval-voting/src/import.rs
index e33caed49c5f..c504ba71b3c2 100644
--- a/node/core/approval-voting/src/import.rs
+++ b/node/core/approval-voting/src/import.rs
@@ -104,7 +104,8 @@ enum ImportedBlockInfoError {
VrfInfoUnavailable,
}
-/// Computes information about the imported block. Returns an error if the info couldn't be extracted.
+/// Computes information about the imported block. Returns an error if the info couldn't be
+/// extracted.
#[overseer::contextbounds(ApprovalVoting, prefix = self::overseer)]
async fn imported_block_info(
ctx: &mut Context,
@@ -181,20 +182,21 @@ async fn imported_block_info(
// It's not obvious whether to use the hash or the parent hash for this, intuitively. We
// want to use the block hash itself, and here's why:
//
- // First off, 'epoch' in BABE means 'session' in other places. 'epoch' is the terminology from
- // the paper, which we fulfill using 'session's, which are a Substrate consensus concept.
+ // First off, 'epoch' in BABE means 'session' in other places. 'epoch' is the terminology
+ // from the paper, which we fulfill using 'session's, which are a Substrate consensus
+ // concept.
//
- // In BABE, the on-chain and off-chain view of the current epoch can differ at epoch boundaries
- // because epochs change precisely at a slot. When a block triggers a new epoch, the state of
- // its parent will still have the old epoch. Conversely, we have the invariant that every
- // block in BABE has the epoch _it was authored in_ within its post-state. So we use the
- // block, and not its parent.
+ // In BABE, the on-chain and off-chain view of the current epoch can differ at epoch
+ // boundaries because epochs change precisely at a slot. When a block triggers a new epoch,
+ // the state of its parent will still have the old epoch. Conversely, we have the invariant
+ // that every block in BABE has the epoch _it was authored in_ within its post-state. So we
+ // use the block, and not its parent.
//
- // It's worth nothing that Polkadot session changes, at least for the purposes of parachains,
- // would function the same way, except for the fact that they're always delayed by one block.
- // This gives us the opposite invariant for sessions - the parent block's post-state gives
- // us the canonical information about the session index for any of its children, regardless
- // of which slot number they might be produced at.
+ // It's worth nothing that Polkadot session changes, at least for the purposes of
+ // parachains, would function the same way, except for the fact that they're always delayed
+ // by one block. This gives us the opposite invariant for sessions - the parent block's
+ // post-state gives us the canonical information about the session index for any of its
+ // children, regardless of which slot number they might be produced at.
ctx.send_message(RuntimeApiMessage::Request(
block_hash,
RuntimeApiRequest::CurrentBabeEpoch(s_tx),
diff --git a/node/core/approval-voting/src/lib.rs b/node/core/approval-voting/src/lib.rs
index a6a74da50480..b29e47b4c435 100644
--- a/node/core/approval-voting/src/lib.rs
+++ b/node/core/approval-voting/src/lib.rs
@@ -160,6 +160,7 @@ struct MetricsInner {
time_db_transaction: prometheus::Histogram,
time_recover_and_approve: prometheus::Histogram,
candidate_signatures_requests_total: prometheus::Counter,
+ unapproved_candidates_in_unfinalized_chain: prometheus::Gauge,
}
/// Approval Voting metrics.
@@ -246,6 +247,12 @@ impl Metrics {
fn time_recover_and_approve(&self) -> Option {
self.0.as_ref().map(|metrics| metrics.time_recover_and_approve.start_timer())
}
+
+ fn on_unapproved_candidates_in_unfinalized_chain(&self, count: usize) {
+ if let Some(metrics) = &self.0 {
+ metrics.unapproved_candidates_in_unfinalized_chain.set(count as u64);
+ }
+ }
}
impl metrics::Metrics for Metrics {
@@ -336,6 +343,13 @@ impl metrics::Metrics for Metrics {
)?,
registry,
)?,
+ unapproved_candidates_in_unfinalized_chain: prometheus::register(
+ prometheus::Gauge::new(
+ "polkadot_parachain_approval_unapproved_candidates_in_unfinalized_chain",
+ "Number of unapproved candidates in unfinalized chain",
+ )?,
+ registry,
+ )?,
};
Ok(Metrics(Some(metrics)))
@@ -1218,8 +1232,8 @@ async fn handle_from_overseer(
);
// Our first wakeup will just be the tranche of our assignment,
- // if any. This will likely be superseded by incoming assignments
- // and approvals which trigger rescheduling.
+ // if any. This will likely be superseded by incoming
+ // assignments and approvals which trigger rescheduling.
actions.push(Action::ScheduleWakeup {
block_hash: block_batch.block_hash,
block_number: block_batch.block_number,
@@ -1242,12 +1256,14 @@ async fn handle_from_overseer(
crate::ops::canonicalize(db, block_number, block_hash)
.map_err(|e| SubsystemError::with_origin("db", e))?;
- // `prune_finalized_wakeups` prunes all finalized block hashes. We prune spans accordingly.
+ // `prune_finalized_wakeups` prunes all finalized block hashes. We prune spans
+ // accordingly.
wakeups.prune_finalized_wakeups(block_number, &mut state.spans);
- // // `prune_finalized_wakeups` prunes all finalized block hashes. We prune spans accordingly.
- // let hash_set = wakeups.block_numbers.values().flatten().collect::>();
- // state.spans.retain(|hash, _| hash_set.contains(hash));
+ // // `prune_finalized_wakeups` prunes all finalized block hashes. We prune spans
+ // accordingly. let hash_set =
+ // wakeups.block_numbers.values().flatten().collect::>(); state.spans.
+ // retain(|hash, _| hash_set.contains(hash));
Vec::new()
},
@@ -1298,6 +1314,7 @@ async fn handle_from_overseer(
lower_bound,
wakeups,
&mut approved_ancestor_span,
+ &metrics,
)
.await
{
@@ -1388,8 +1405,8 @@ async fn get_approval_signatures_for_candidate(
tx_distribution,
));
- // Because of the unbounded sending and the nature of the call (just fetching data from state),
- // this should not block long:
+ // Because of the unbounded sending and the nature of the call (just fetching data from
+ // state), this should not block long:
match rx_distribution.timeout(WAIT_FOR_SIGS_TIMEOUT).await {
None => {
gum::warn!(
@@ -1423,9 +1440,11 @@ async fn handle_approved_ancestor(
lower_bound: BlockNumber,
wakeups: &Wakeups,
span: &mut jaeger::Span,
+ metrics: &Metrics,
) -> SubsystemResult> {
const MAX_TRACING_WINDOW: usize = 200;
const ABNORMAL_DEPTH_THRESHOLD: usize = 5;
+ const LOGGING_DEPTH_THRESHOLD: usize = 10;
let mut span = span
.child("handle-approved-ancestor")
.with_stage(jaeger::Stage::ApprovalChecking);
@@ -1471,6 +1490,7 @@ async fn handle_approved_ancestor(
} else {
Vec::new()
};
+ let ancestry_len = ancestry.len();
let mut block_descriptions = Vec::new();
@@ -1534,6 +1554,17 @@ async fn handle_approved_ancestor(
unapproved.len(),
entry.candidates().len(),
);
+ if ancestry_len >= LOGGING_DEPTH_THRESHOLD && i > ancestry_len - LOGGING_DEPTH_THRESHOLD
+ {
+ gum::trace!(
+ target: LOG_TARGET,
+ ?block_hash,
+ "Unapproved candidates at depth {}: {:?}",
+ bits.len(),
+ unapproved
+ )
+ }
+ metrics.on_unapproved_candidates_in_unfinalized_chain(unapproved.len());
entry_span.add_uint_tag("unapproved-candidates", unapproved.len() as u64);
for candidate_hash in unapproved {
match db.load_candidate_entry(&candidate_hash)? {
@@ -2088,9 +2119,10 @@ impl ApprovalStateTransition {
}
}
-// Advance the approval state, either by importing an approval vote which is already checked to be valid and corresponding to an assigned
-// validator on the candidate and block, or by noting that there are no further wakeups or tranches needed. This updates the block entry and candidate entry as
-// necessary and schedules any further wakeups.
+// Advance the approval state, either by importing an approval vote which is already checked to be
+// valid and corresponding to an assigned validator on the candidate and block, or by noting that
+// there are no further wakeups or tranches needed. This updates the block entry and candidate entry
+// as necessary and schedules any further wakeups.
async fn advance_approval_state(
sender: &mut Sender,
state: &State,
@@ -2221,8 +2253,9 @@ where
//
// 1. This is not a local approval, as we don't store anything new in the approval entry.
// 2. The candidate is not newly approved, as we haven't altered the approval entry's
- // approved flag with `mark_approved` above.
- // 3. The approver, if any, had already approved the candidate, as we haven't altered the bitfield.
+ // approved flag with `mark_approved` above.
+ // 3. The approver, if any, had already approved the candidate, as we haven't altered the
+ // bitfield.
if transition.is_local_approval() || newly_approved || !already_approved_by.unwrap_or(true)
{
// In all other cases, we need to write the candidate entry.
@@ -2250,7 +2283,8 @@ fn should_trigger_assignment(
&approval_entry,
RequiredTranches::All,
)
- .is_approved(Tick::max_value()), // when all are required, we are just waiting for the first 1/3+
+ // when all are required, we are just waiting for the first 1/3+
+ .is_approved(Tick::max_value()),
RequiredTranches::Pending { maximum_broadcast, clock_drift, .. } => {
let drifted_tranche_now =
tranche_now.saturating_sub(clock_drift as DelayTranche);
@@ -2586,8 +2620,8 @@ async fn launch_approval(
match val_rx.await {
Err(_) => return ApprovalState::failed(validator_index, candidate_hash),
Ok(Ok(ValidationResult::Valid(_, _))) => {
- // Validation checked out. Issue an approval command. If the underlying service is unreachable,
- // then there isn't anything we can do.
+ // Validation checked out. Issue an approval command. If the underlying service is
+ // unreachable, then there isn't anything we can do.
gum::trace!(target: LOG_TARGET, ?candidate_hash, ?para_id, "Candidate Valid");
diff --git a/node/core/approval-voting/src/ops.rs b/node/core/approval-voting/src/ops.rs
index 4d6dc5e7ad66..6f57b2f80e8a 100644
--- a/node/core/approval-voting/src/ops.rs
+++ b/node/core/approval-voting/src/ops.rs
@@ -161,7 +161,8 @@ pub fn canonicalize(
}
}
- // Update all blocks-at-height keys, deleting all those which now have empty `block_assignments`.
+ // Update all blocks-at-height keys, deleting all those which now have empty
+ // `block_assignments`.
for (h, at) in visited_heights.into_iter() {
if at.is_empty() {
overlay_db.delete_blocks_at_height(h);
@@ -170,8 +171,8 @@ pub fn canonicalize(
}
}
- // due to the fork pruning, this range actually might go too far above where our actual highest block is,
- // if a relatively short fork is canonicalized.
+ // due to the fork pruning, this range actually might go too far above where our actual highest
+ // block is, if a relatively short fork is canonicalized.
// TODO https://github.com/paritytech/polkadot/issues/3389
let new_range = StoredBlockRange(canon_number + 1, std::cmp::max(range.1, canon_number + 2));
diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml
index 72d8e111480f..4861386bfd7a 100644
--- a/node/core/av-store/Cargo.toml
+++ b/node/core/av-store/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-av-store"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/av-store/src/lib.rs b/node/core/av-store/src/lib.rs
index 675d41b79c06..ef7dcecac075 100644
--- a/node/core/av-store/src/lib.rs
+++ b/node/core/av-store/src/lib.rs
@@ -67,8 +67,8 @@ const META_PREFIX: &[u8; 4] = b"meta";
const UNFINALIZED_PREFIX: &[u8; 11] = b"unfinalized";
const PRUNE_BY_TIME_PREFIX: &[u8; 13] = b"prune_by_time";
-// We have some keys we want to map to empty values because existence of the key is enough. We use this because
-// rocksdb doesn't support empty values.
+// We have some keys we want to map to empty values because existence of the key is enough. We use
+// this because rocksdb doesn't support empty values.
const TOMBSTONE_VALUE: &[u8] = b" ";
/// Unavailable blocks are kept for 1 hour.
@@ -139,10 +139,11 @@ enum State {
/// Candidate data was first observed at the given time but is not available in any block.
#[codec(index = 0)]
Unavailable(BETimestamp),
- /// The candidate was first observed at the given time and was included in the given list of unfinalized blocks, which may be
- /// empty. The timestamp here is not used for pruning. Either one of these blocks will be finalized or the state will regress to
- /// `State::Unavailable`, in which case the same timestamp will be reused. Blocks are sorted ascending first by block number and
- /// then hash.
+ /// The candidate was first observed at the given time and was included in the given list of
+ /// unfinalized blocks, which may be empty. The timestamp here is not used for pruning. Either
+ /// one of these blocks will be finalized or the state will regress to `State::Unavailable`, in
+ /// which case the same timestamp will be reused. Blocks are sorted ascending first by block
+ /// number and then hash.
#[codec(index = 1)]
Unfinalized(BETimestamp, Vec<(BEBlockNumber, Hash)>),
/// Candidate data has appeared in a finalized block and did so at the given time.
@@ -820,8 +821,8 @@ fn note_block_included(
match load_meta(db, config, &candidate_hash)? {
None => {
- // This is alarming. We've observed a block being included without ever seeing it backed.
- // Warn and ignore.
+ // This is alarming. We've observed a block being included without ever seeing it
+ // backed. Warn and ignore.
gum::warn!(
target: LOG_TARGET,
?candidate_hash,
@@ -894,9 +895,9 @@ async fn process_block_finalized(
let mut db_transaction = DBTransaction::new();
let (start_prefix, end_prefix) = finalized_block_range(finalized_number);
- // We have to do some juggling here of the `iter` to make sure it doesn't cross the `.await` boundary
- // as it is not `Send`. That is why we create the iterator once within this loop, drop it,
- // do an asynchronous request, and then instantiate the exact same iterator again.
+ // We have to do some juggling here of the `iter` to make sure it doesn't cross the `.await`
+ // boundary as it is not `Send`. That is why we create the iterator once within this loop,
+ // drop it, do an asynchronous request, and then instantiate the exact same iterator again.
let batch_num = {
let mut iter = subsystem
.db
@@ -961,8 +962,9 @@ async fn process_block_finalized(
update_blocks_at_finalized_height(&subsystem, &mut db_transaction, batch, batch_num, now)?;
- // We need to write at the end of the loop so the prefix iterator doesn't pick up the same values again
- // in the next iteration. Another unfortunate effect of having to re-initialize the iterator.
+ // We need to write at the end of the loop so the prefix iterator doesn't pick up the same
+ // values again in the next iteration. Another unfortunate effect of having to re-initialize
+ // the iterator.
subsystem.db.write(db_transaction)?;
}
@@ -1215,7 +1217,8 @@ fn process_message(
// We do not bubble up internal errors to caller subsystems, instead the
// tx channel is dropped and that error is caught by the caller subsystem.
//
- // We bubble up the specific error here so `av-store` logs still tell what happend.
+ // We bubble up the specific error here so `av-store` logs still tell what
+ // happend.
return Err(e.into())
},
}
@@ -1298,8 +1301,8 @@ fn store_available_data(
.with_candidate(candidate_hash)
.with_pov(&available_data.pov);
- // Important note: This check below is critical for consensus and the `backing` subsystem relies on it to
- // ensure candidate validity.
+ // Important note: This check below is critical for consensus and the `backing` subsystem relies
+ // on it to ensure candidate validity.
let chunks = erasure::obtain_chunks_v1(n_validators, &available_data)?;
let branches = erasure::branches(chunks.as_ref());
diff --git a/node/core/av-store/src/tests.rs b/node/core/av-store/src/tests.rs
index f8e30210c7c2..dbccf1401582 100644
--- a/node/core/av-store/src/tests.rs
+++ b/node/core/av-store/src/tests.rs
@@ -53,7 +53,7 @@ struct TestClock {
impl TestClock {
fn now(&self) -> Duration {
- self.inner.lock().clone()
+ *self.inner.lock()
}
fn inc(&self, by: Duration) {
diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
index 7428372eec62..d611784d7bba 100644
--- a/node/core/backing/Cargo.toml
+++ b/node/core/backing/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-backing"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/backing/src/error.rs b/node/core/backing/src/error.rs
index ae138e8510ea..d8f9e82d8f48 100644
--- a/node/core/backing/src/error.rs
+++ b/node/core/backing/src/error.rs
@@ -19,10 +19,10 @@ use futures::channel::{mpsc, oneshot};
use polkadot_node_subsystem::{
messages::{StoreAvailableDataError, ValidationFailed},
- SubsystemError,
+ RuntimeApiError, SubsystemError,
};
-use polkadot_node_subsystem_util::Error as UtilError;
-use polkadot_primitives::BackedCandidate;
+use polkadot_node_subsystem_util::{runtime, Error as UtilError};
+use polkadot_primitives::{BackedCandidate, ValidationCodeHash};
use crate::LOG_TARGET;
@@ -33,6 +33,18 @@ pub type FatalResult = std::result::Result;
#[allow(missing_docs)]
#[fatality::fatality(splitable)]
pub enum Error {
+ #[fatal]
+ #[error("Failed to spawn background task")]
+ FailedToSpawnBackgroundTask,
+
+ #[fatal(forward)]
+ #[error("Error while accessing runtime information")]
+ Runtime(#[from] runtime::Error),
+
+ #[fatal]
+ #[error(transparent)]
+ BackgroundValidationMpsc(#[from] mpsc::SendError),
+
#[error("Candidate is not found")]
CandidateNotFound,
@@ -45,16 +57,27 @@ pub enum Error {
#[error("FetchPoV failed")]
FetchPoV,
- #[fatal]
- #[error("Failed to spawn background task")]
- FailedToSpawnBackgroundTask,
+ #[error("Fetching validation code by hash failed {0:?}, {1:?}")]
+ FetchValidationCode(ValidationCodeHash, RuntimeApiError),
+
+ #[error("Fetching Runtime API version failed {0:?}")]
+ FetchRuntimeApiVersion(RuntimeApiError),
+
+ #[error("No validation code {0:?}")]
+ NoValidationCode(ValidationCodeHash),
+
+ #[error("Candidate rejected by prospective parachains subsystem")]
+ RejectedByProspectiveParachains,
- #[error("ValidateFromChainState channel closed before receipt")]
- ValidateFromChainState(#[source] oneshot::Canceled),
+ #[error("ValidateFromExhaustive channel closed before receipt")]
+ ValidateFromExhaustive(#[source] oneshot::Canceled),
#[error("StoreAvailableData channel closed before receipt")]
StoreAvailableDataChannel(#[source] oneshot::Canceled),
+ #[error("RuntimeAPISubsystem channel closed before receipt")]
+ RuntimeApiUnavailable(#[source] oneshot::Canceled),
+
#[error("a channel was closed before receipt in try_join!")]
JoinMultiple(#[source] oneshot::Canceled),
@@ -64,10 +87,6 @@ pub enum Error {
#[error(transparent)]
ValidationFailed(#[from] ValidationFailed),
- #[fatal]
- #[error(transparent)]
- BackgroundValidationMpsc(#[from] mpsc::SendError),
-
#[error(transparent)]
UtilError(#[from] UtilError),
diff --git a/node/core/backing/src/lib.rs b/node/core/backing/src/lib.rs
index dc0863cfa0b3..58763e6d80cc 100644
--- a/node/core/backing/src/lib.rs
+++ b/node/core/backing/src/lib.rs
@@ -14,43 +14,98 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see .
-//! Implements a `CandidateBackingSubsystem`.
+//! Implements the `CandidateBackingSubsystem`.
+//!
+//! This subsystem maintains the entire responsibility of tracking parachain
+//! candidates which can be backed, as well as the issuance of statements
+//! about candidates when run on a validator node.
+//!
+//! There are two types of statements: `Seconded` and `Valid`.
+//! `Seconded` implies `Valid`, and nothing should be stated as
+//! `Valid` unless its already been `Seconded`.
+//!
+//! Validators may only second candidates which fall under their own group
+//! assignment, and they may only second one candidate per depth per active leaf.
+//! Candidates which are stated as either `Second` or `Valid` by a majority of the
+//! assigned group of validators may be backed on-chain and proceed to the availability
+//! stage.
+//!
+//! Depth is a concept relating to asynchronous backing, by which validators
+//! short sub-chains of candidates are backed and extended off-chain, and then placed
+//! asynchronously into blocks of the relay chain as those are authored and as the
+//! relay-chain state becomes ready for them. Asynchronous backing allows parachains to
+//! grow mostly independently from the state of the relay chain, which gives more time for
+//! parachains to be validated and thereby increases performance.
+//!
+//! Most of the work of asynchronous backing is handled by the Prospective Parachains
+//! subsystem. The 'depth' of a parachain block with respect to a relay chain block is
+//! a measure of how many parachain blocks are between the most recent included parachain block
+//! in the post-state of the relay-chain block and the candidate. For instance,
+//! a candidate that descends directly from the most recent parachain block in the relay-chain
+//! state has depth 0. The child of that candidate would have depth 1. And so on.
+//!
+//! The candidate backing subsystem keeps track of a set of 'active leaves' which are the
+//! most recent blocks in the relay-chain (which is in fact a tree) which could be built
+//! upon. Depth is always measured against active leaves, and the valid relay-parent that
+//! each candidate can have is determined by the active leaves. The Prospective Parachains
+//! subsystem enforces that the relay-parent increases monotonically, so that logic
+//! is not handled here. By communicating with the Prospective Parachains subsystem,
+//! this subsystem extrapolates an "implicit view" from the set of currently active leaves,
+//! which determines the set of all recent relay-chain block hashes which could be relay-parents
+//! for candidates backed in children of the active leaves.
+//!
+//! In fact, this subsystem relies on the Statement Distribution subsystem to prevent spam
+//! by enforcing the rule that each validator may second at most one candidate per depth per
+//! active leaf. This bounds the number of candidates that the system needs to consider and
+//! is not handled within this subsystem, except for candidates seconded locally.
+//!
+//! This subsystem also handles relay-chain heads which don't support asynchronous backing.
+//! For such active leaves, the only valid relay-parent is the leaf hash itself and the only
+//! allowed depth is 0.
#![deny(unused_crate_dependencies)]
use std::{
- collections::{HashMap, HashSet},
+ collections::{BTreeMap, HashMap, HashSet},
sync::Arc,
};
use bitvec::vec::BitVec;
use futures::{
channel::{mpsc, oneshot},
- FutureExt, SinkExt, StreamExt,
+ future::BoxFuture,
+ stream::FuturesOrdered,
+ FutureExt, SinkExt, StreamExt, TryFutureExt,
};
use error::{Error, FatalResult};
use polkadot_node_primitives::{
- AvailableData, InvalidCandidate, PoV, SignedFullStatement, Statement, ValidationResult,
+ minimum_votes, AvailableData, InvalidCandidate, PoV, SignedFullStatementWithPVD,
+ StatementWithPVD, ValidationResult,
};
use polkadot_node_subsystem::{
- jaeger,
messages::{
- AvailabilityDistributionMessage, AvailabilityStoreMessage, CandidateBackingMessage,
- CandidateValidationMessage, CollatorProtocolMessage, ProvisionableData, ProvisionerMessage,
+ AvailabilityDistributionMessage, AvailabilityStoreMessage, CanSecondRequest,
+ CandidateBackingMessage, CandidateValidationMessage, CollatorProtocolMessage,
+ HypotheticalCandidate, HypotheticalFrontierRequest, IntroduceCandidateRequest,
+ ProspectiveParachainsMessage, ProvisionableData, ProvisionerMessage, RuntimeApiMessage,
RuntimeApiRequest, StatementDistributionMessage, StoreAvailableDataError,
},
- overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, PerLeafSpan, SpawnedSubsystem,
- Stage, SubsystemError,
+ overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, SpawnedSubsystem, SubsystemError,
};
use polkadot_node_subsystem_util::{
- self as util, request_from_runtime, request_session_index_for_child, request_validator_groups,
- request_validators, Validator,
+ self as util,
+ backing_implicit_view::{FetchError as ImplicitViewFetchError, View as ImplicitView},
+ request_from_runtime, request_session_index_for_child, request_validator_groups,
+ request_validators,
+ runtime::{prospective_parachains_mode, ProspectiveParachainsMode},
+ Validator,
};
use polkadot_primitives::{
- BackedCandidate, CandidateCommitments, CandidateHash, CandidateReceipt, CollatorId,
- CommittedCandidateReceipt, CoreIndex, CoreState, Hash, Id as ParaId, PvfExecTimeoutKind,
- SigningContext, ValidatorId, ValidatorIndex, ValidatorSignature, ValidityAttestation,
+ BackedCandidate, CandidateCommitments, CandidateHash, CandidateReceipt,
+ CommittedCandidateReceipt, CoreIndex, CoreState, Hash, Id as ParaId, PersistedValidationData,
+ PvfExecTimeoutKind, SigningContext, ValidationCode, ValidatorId, ValidatorIndex,
+ ValidatorSignature, ValidityAttestation,
};
use sp_keystore::KeystorePtr;
use statement_table::{
@@ -59,7 +114,7 @@ use statement_table::{
SignedStatement as TableSignedStatement, Statement as TableStatement,
Summary as TableSummary,
},
- Context as TableContextTrait, Table,
+ Config as TableConfig, Context as TableContextTrait, Table,
};
mod error;
@@ -107,9 +162,9 @@ impl std::fmt::Debug for ValidatedCandidateCommand {
impl ValidatedCandidateCommand {
fn candidate_hash(&self) -> CandidateHash {
match *self {
- ValidatedCandidateCommand::Second(Ok((ref candidate, _, _))) => candidate.hash(),
+ ValidatedCandidateCommand::Second(Ok(ref outputs)) => outputs.candidate.hash(),
ValidatedCandidateCommand::Second(Err(ref candidate)) => candidate.hash(),
- ValidatedCandidateCommand::Attest(Ok((ref candidate, _, _))) => candidate.hash(),
+ ValidatedCandidateCommand::Attest(Ok(ref outputs)) => outputs.candidate.hash(),
ValidatedCandidateCommand::Attest(Err(ref candidate)) => candidate.hash(),
ValidatedCandidateCommand::AttestNoPoV(candidate_hash) => candidate_hash,
}
@@ -146,6 +201,98 @@ where
}
}
+struct PerRelayParentState {
+ prospective_parachains_mode: ProspectiveParachainsMode,
+ /// The hash of the relay parent on top of which this job is doing it's work.
+ parent: Hash,
+ /// The `ParaId` assigned to the local validator at this relay parent.
+ assignment: Option,
+ /// The candidates that are backed by enough validators in their group, by hash.
+ backed: HashSet,
+ /// The table of candidates and statements under this relay-parent.
+ table: Table,
+ /// The table context, including groups.
+ table_context: TableContext,
+ /// We issued `Seconded` or `Valid` statements on about these candidates.
+ issued_statements: HashSet,
+ /// These candidates are undergoing validation in the background.
+ awaiting_validation: HashSet,
+ /// Data needed for retrying in case of `ValidatedCandidateCommand::AttestNoPoV`.
+ fallbacks: HashMap,
+}
+
+struct PerCandidateState {
+ persisted_validation_data: PersistedValidationData,
+ seconded_locally: bool,
+ para_id: ParaId,
+ relay_parent: Hash,
+}
+
+struct ActiveLeafState {
+ prospective_parachains_mode: ProspectiveParachainsMode,
+ /// The candidates seconded at various depths under this active
+ /// leaf with respect to parachain id. A candidate can only be
+ /// seconded when its hypothetical frontier under every active leaf
+ /// has an empty entry in this map.
+ ///
+ /// When prospective parachains are disabled, the only depth
+ /// which is allowed is 0.
+ seconded_at_depth: HashMap>,
+}
+
+/// The state of the subsystem.
+struct State {
+ /// The utility for managing the implicit and explicit views in a consistent way.
+ ///
+ /// We only feed leaves which have prospective parachains enabled to this view.
+ implicit_view: ImplicitView,
+ /// State tracked for all active leaves, whether or not they have prospective parachains
+ /// enabled.
+ per_leaf: HashMap,
+ /// State tracked for all relay-parents backing work is ongoing for. This includes
+ /// all active leaves.
+ ///
+ /// relay-parents fall into one of 3 categories.
+ /// 1. active leaves which do support prospective parachains
+ /// 2. active leaves which do not support prospective parachains
+ /// 3. relay-chain blocks which are ancestors of an active leaf and do support prospective
+ /// parachains.
+ ///
+ /// Relay-chain blocks which don't support prospective parachains are
+ /// never included in the fragment trees of active leaves which do.
+ ///
+ /// While it would be technically possible to support such leaves in
+ /// fragment trees, it only benefits the transition period when asynchronous
+ /// backing is being enabled and complicates code complexity.
+ per_relay_parent: HashMap,
+ /// State tracked for all candidates relevant to the implicit view.
+ ///
+ /// This is guaranteed to have an entry for each candidate with a relay parent in the implicit
+ /// or explicit view for which a `Seconded` statement has been successfully imported.
+ per_candidate: HashMap,
+ /// A cloneable sender which is dispatched to background candidate validation tasks to inform
+ /// the main task of the result.
+ background_validation_tx: mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
+ /// The handle to the keystore used for signing.
+ keystore: KeystorePtr,
+}
+
+impl State {
+ fn new(
+ background_validation_tx: mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
+ keystore: KeystorePtr,
+ ) -> Self {
+ State {
+ implicit_view: ImplicitView::default(),
+ per_leaf: HashMap::default(),
+ per_relay_parent: HashMap::default(),
+ per_candidate: HashMap::new(),
+ background_validation_tx,
+ keystore,
+ }
+ }
+}
+
#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
async fn run(
mut ctx: Context,
@@ -153,18 +300,11 @@ async fn run(
metrics: Metrics,
) -> FatalResult<()> {
let (background_validation_tx, mut background_validation_rx) = mpsc::channel(16);
- let mut jobs = HashMap::new();
+ let mut state = State::new(background_validation_tx, keystore);
loop {
- let res = run_iteration(
- &mut ctx,
- keystore.clone(),
- &metrics,
- &mut jobs,
- background_validation_tx.clone(),
- &mut background_validation_rx,
- )
- .await;
+ let res =
+ run_iteration(&mut ctx, &mut state, &metrics, &mut background_validation_rx).await;
match res {
Ok(()) => break,
@@ -178,10 +318,8 @@ async fn run(
#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
async fn run_iteration(
ctx: &mut Context,
- keystore: KeystorePtr,
+ state: &mut State,
metrics: &Metrics,
- jobs: &mut HashMap>,
- background_validation_tx: mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
background_validation_rx: &mut mpsc::Receiver<(Hash, ValidatedCandidateCommand)>,
) -> Result<(), Error> {
loop {
@@ -190,251 +328,35 @@ async fn run_iteration(
if let Some((relay_parent, command)) = validated_command {
handle_validated_candidate_command(
&mut *ctx,
- jobs,
+ state,
relay_parent,
command,
+ metrics,
).await?;
} else {
panic!("background_validation_tx always alive at this point; qed");
}
}
from_overseer = ctx.recv().fuse() => {
- // Map the error to ensure that the subsystem exits when the overseer is gone.
match from_overseer.map_err(Error::OverseerExited)? {
- FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => handle_active_leaves_update(
- &mut *ctx,
- update,
- jobs,
- &keystore,
- &background_validation_tx,
- &metrics,
- ).await?,
+ FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
+ handle_active_leaves_update(
+ &mut *ctx,
+ update,
+ state,
+ ).await?;
+ }
FromOrchestra::Signal(OverseerSignal::BlockFinalized(..)) => {}
FromOrchestra::Signal(OverseerSignal::Conclude) => return Ok(()),
- FromOrchestra::Communication { msg } => handle_communication(&mut *ctx, jobs, msg).await?,
+ FromOrchestra::Communication { msg } => {
+ handle_communication(&mut *ctx, state, msg, metrics).await?;
+ }
}
}
)
}
}
-#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
-async fn handle_validated_candidate_command(
- ctx: &mut Context,
- jobs: &mut HashMap>,
- relay_parent: Hash,
- command: ValidatedCandidateCommand,
-) -> Result<(), Error> {
- if let Some(job) = jobs.get_mut(&relay_parent) {
- job.job.handle_validated_candidate_command(&job.span, ctx, command).await?;
- } else {
- // simple race condition; can be ignored - this relay-parent
- // is no longer relevant.
- }
-
- Ok(())
-}
-
-#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
-async fn handle_communication(
- ctx: &mut Context,
- jobs: &mut HashMap>,
- message: CandidateBackingMessage,
-) -> Result<(), Error> {
- match message {
- CandidateBackingMessage::Second(relay_parent, candidate, pov) => {
- if let Some(job) = jobs.get_mut(&relay_parent) {
- job.job.handle_second_msg(&job.span, ctx, candidate, pov).await?;
- }
- },
- CandidateBackingMessage::Statement(relay_parent, statement) => {
- if let Some(job) = jobs.get_mut(&relay_parent) {
- job.job.handle_statement_message(&job.span, ctx, statement).await?;
- }
- },
- CandidateBackingMessage::GetBackedCandidates(relay_parent, requested_candidates, tx) =>
- if let Some(job) = jobs.get_mut(&relay_parent) {
- job.job.handle_get_backed_candidates_message(requested_candidates, tx)?;
- },
- }
-
- Ok(())
-}
-
-#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
-async fn handle_active_leaves_update(
- ctx: &mut Context,
- update: ActiveLeavesUpdate,
- jobs: &mut HashMap>,
- keystore: &KeystorePtr,
- background_validation_tx: &mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
- metrics: &Metrics,
-) -> Result<(), Error> {
- for deactivated in update.deactivated {
- jobs.remove(&deactivated);
- }
-
- let leaf = match update.activated {
- None => return Ok(()),
- Some(a) => a,
- };
-
- macro_rules! try_runtime_api {
- ($x: expr) => {
- match $x {
- Ok(x) => x,
- Err(e) => {
- gum::warn!(
- target: LOG_TARGET,
- err = ?e,
- "Failed to fetch runtime API data for job",
- );
-
- // We can't do candidate validation work if we don't have the
- // requisite runtime API data. But these errors should not take
- // down the node.
- return Ok(());
- }
- }
- }
- }
-
- let parent = leaf.hash;
- let span = PerLeafSpan::new(leaf.span, "backing");
- let _span = span.child("runtime-apis");
-
- let (validators, groups, session_index, cores) = futures::try_join!(
- request_validators(parent, ctx.sender()).await,
- request_validator_groups(parent, ctx.sender()).await,
- request_session_index_for_child(parent, ctx.sender()).await,
- request_from_runtime(parent, ctx.sender(), |tx| {
- RuntimeApiRequest::AvailabilityCores(tx)
- },)
- .await,
- )
- .map_err(Error::JoinMultiple)?;
-
- let validators: Vec<_> = try_runtime_api!(validators);
- let (validator_groups, group_rotation_info) = try_runtime_api!(groups);
- let session_index = try_runtime_api!(session_index);
- let cores = try_runtime_api!(cores);
-
- drop(_span);
- let _span = span.child("validator-construction");
-
- let signing_context = SigningContext { parent_hash: parent, session_index };
- let validator =
- match Validator::construct(&validators, signing_context.clone(), keystore.clone()) {
- Ok(v) => Some(v),
- Err(util::Error::NotAValidator) => None,
- Err(e) => {
- gum::warn!(
- target: LOG_TARGET,
- err = ?e,
- "Cannot participate in candidate backing",
- );
-
- return Ok(())
- },
- };
-
- drop(_span);
- let mut assignments_span = span.child("compute-assignments");
-
- let mut groups = HashMap::new();
-
- let n_cores = cores.len();
-
- let mut assignment = None;
-
- for (idx, core) in cores.into_iter().enumerate() {
- // Ignore prospective assignments on occupied cores for the time being.
- if let CoreState::Scheduled(scheduled) = core {
- let core_index = CoreIndex(idx as _);
- let group_index = group_rotation_info.group_for_core(core_index, n_cores);
- if let Some(g) = validator_groups.get(group_index.0 as usize) {
- if validator.as_ref().map_or(false, |v| g.contains(&v.index())) {
- assignment = Some((scheduled.para_id, scheduled.collator));
- }
- groups.insert(scheduled.para_id, g.clone());
- }
- }
- }
-
- let table_context = TableContext { groups, validators, validator };
-
- let (assignment, required_collator) = match assignment {
- None => {
- assignments_span.add_string_tag("assigned", "false");
- (None, None)
- },
- Some((assignment, required_collator)) => {
- assignments_span.add_string_tag("assigned", "true");
- assignments_span.add_para_id(assignment);
- (Some(assignment), required_collator)
- },
- };
-
- drop(assignments_span);
- let _span = span.child("wait-for-job");
-
- let job = CandidateBackingJob {
- parent,
- assignment,
- required_collator,
- issued_statements: HashSet::new(),
- awaiting_validation: HashSet::new(),
- fallbacks: HashMap::new(),
- seconded: None,
- unbacked_candidates: HashMap::new(),
- backed: HashSet::new(),
- keystore: keystore.clone(),
- table: Table::default(),
- table_context,
- background_validation_tx: background_validation_tx.clone(),
- metrics: metrics.clone(),
- _marker: std::marker::PhantomData,
- };
-
- jobs.insert(parent, JobAndSpan { job, span });
-
- Ok(())
-}
-
-struct JobAndSpan {
- job: CandidateBackingJob,
- span: PerLeafSpan,
-}
-
-/// Holds all data needed for candidate backing job operation.
-struct CandidateBackingJob {
- /// The hash of the relay parent on top of which this job is doing it's work.
- parent: Hash,
- /// The `ParaId` assigned to this validator
- assignment: Option,
- /// The collator required to author the candidate, if any.
- required_collator: Option,
- /// Spans for all candidates that are not yet backable.
- unbacked_candidates: HashMap,
- /// We issued `Seconded`, `Valid` or `Invalid` statements on about these candidates.
- issued_statements: HashSet,
- /// These candidates are undergoing validation in the background.
- awaiting_validation: HashSet,
- /// Data needed for retrying in case of `ValidatedCandidateCommand::AttestNoPoV`.
- fallbacks: HashMap)>,
- /// `Some(h)` if this job has already issued `Seconded` statement for some candidate with `h` hash.
- seconded: Option,
- /// The candidates that are includable, by hash. Each entry here indicates
- /// that we've sent the provisioner the backed candidate.
- backed: HashSet,
- keystore: KeystorePtr,
- table: Table,
- table_context: TableContext,
- background_validation_tx: mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
- metrics: Metrics,
- _marker: std::marker::PhantomData,
-}
-
/// In case a backing validator does not provide a PoV, we need to retry with other backing
/// validators.
///
@@ -452,13 +374,6 @@ struct AttestingData {
backing: Vec,
}
-/// How many votes we need to consider a candidate backed.
-///
-/// WARNING: This has to be kept in sync with the runtime check in the inclusion module.
-fn minimum_votes(n_validators: usize) -> usize {
- std::cmp::min(2, n_validators)
-}
-
#[derive(Default)]
struct TableContext {
validator: Option,
@@ -492,10 +407,10 @@ impl TableContextTrait for TableContext {
// It looks like it's not possible to do an `impl From` given the current state of
// the code. So this does the necessary conversion.
-fn primitive_statement_to_table(s: &SignedFullStatement) -> TableSignedStatement {
+fn primitive_statement_to_table(s: &SignedFullStatementWithPVD) -> TableSignedStatement {
let statement = match s.payload() {
- Statement::Seconded(c) => TableStatement::Seconded(c.clone()),
- Statement::Valid(h) => TableStatement::Valid(*h),
+ StatementWithPVD::Seconded(c, _) => TableStatement::Seconded(c.clone()),
+ StatementWithPVD::Valid(h) => TableStatement::Valid(*h),
};
TableSignedStatement {
@@ -562,9 +477,10 @@ async fn store_available_data(
expected_erasure_root: Hash,
) -> Result<(), Error> {
let (tx, rx) = oneshot::channel();
- // Important: the `av-store` subsystem will check if the erasure root of the `available_data` matches `expected_erasure_root`
- // which was provided by the collator in the `CandidateReceipt`. This check is consensus critical and the `backing` subsystem
- // relies on it for ensuring candidate validity.
+ // Important: the `av-store` subsystem will check if the erasure root of the `available_data`
+ // matches `expected_erasure_root` which was provided by the collator in the `CandidateReceipt`.
+ // This check is consensus critical and the `backing` subsystem relies on it for ensuring
+ // candidate validity.
sender
.send_message(AvailabilityStoreMessage::StoreAvailableData {
candidate_hash,
@@ -582,23 +498,19 @@ async fn store_available_data(
// Make a `PoV` available.
//
-// This calls the AV store to write the available data to storage. The AV store also checks the erasure root matches
-// the `expected_erasure_root`.
+// This calls the AV store to write the available data to storage. The AV store also checks the
+// erasure root matches the `expected_erasure_root`.
// This returns `Err()` on erasure root mismatch or due to any AV store subsystem error.
//
-// Otherwise, it returns either `Ok(())`
-
+// Otherwise, it returns `Ok(())`.
async fn make_pov_available(
sender: &mut impl overseer::CandidateBackingSenderTrait,
n_validators: usize,
pov: Arc,
candidate_hash: CandidateHash,
- validation_data: polkadot_primitives::PersistedValidationData,
+ validation_data: PersistedValidationData,
expected_erasure_root: Hash,
- span: Option<&jaeger::Span>,
) -> Result<(), Error> {
- let _span = span.as_ref().map(|s| s.child("store-data").with_candidate(candidate_hash));
-
store_available_data(
sender,
n_validators as u32,
@@ -635,13 +547,17 @@ async fn request_pov(
async fn request_candidate_validation(
sender: &mut impl overseer::CandidateBackingSenderTrait,
+ pvd: PersistedValidationData,
+ code: ValidationCode,
candidate_receipt: CandidateReceipt,
pov: Arc,
) -> Result {
let (tx, rx) = oneshot::channel();
sender
- .send_message(CandidateValidationMessage::ValidateFromChainState(
+ .send_message(CandidateValidationMessage::ValidateFromExhaustive(
+ pvd,
+ code,
candidate_receipt,
pov,
PvfExecTimeoutKind::Backing,
@@ -652,21 +568,26 @@ async fn request_candidate_validation(
match rx.await {
Ok(Ok(validation_result)) => Ok(validation_result),
Ok(Err(err)) => Err(Error::ValidationFailed(err)),
- Err(err) => Err(Error::ValidateFromChainState(err)),
+ Err(err) => Err(Error::ValidateFromExhaustive(err)),
}
}
-type BackgroundValidationResult =
- Result<(CandidateReceipt, CandidateCommitments, Arc), CandidateReceipt>;
+struct BackgroundValidationOutputs {
+ candidate: CandidateReceipt,
+ commitments: CandidateCommitments,
+ persisted_validation_data: PersistedValidationData,
+}
+
+type BackgroundValidationResult = Result;
struct BackgroundValidationParams {
sender: S,
tx_command: mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
candidate: CandidateReceipt,
relay_parent: Hash,
+ persisted_validation_data: PersistedValidationData,
pov: PoVData,
n_validators: usize,
- span: Option,
make_command: F,
}
@@ -681,16 +602,33 @@ async fn validate_and_make_available(
mut tx_command,
candidate,
relay_parent,
+ persisted_validation_data,
pov,
n_validators,
- span,
make_command,
} = params;
+ let validation_code = {
+ let validation_code_hash = candidate.descriptor().validation_code_hash;
+ let (tx, rx) = oneshot::channel();
+ sender
+ .send_message(RuntimeApiMessage::Request(
+ relay_parent,
+ RuntimeApiRequest::ValidationCodeByHash(validation_code_hash, tx),
+ ))
+ .await;
+
+ let code = rx.await.map_err(Error::RuntimeApiUnavailable)?;
+ match code {
+ Err(e) => return Err(Error::FetchValidationCode(validation_code_hash, e)),
+ Ok(None) => return Err(Error::NoValidationCode(validation_code_hash)),
+ Ok(Some(c)) => c,
+ }
+ };
+
let pov = match pov {
PoVData::Ready(pov) => pov,
- PoVData::FetchFromValidator { from_validator, candidate_hash, pov_hash } => {
- let _span = span.as_ref().map(|s| s.child("request-pov"));
+ PoVData::FetchFromValidator { from_validator, candidate_hash, pov_hash } =>
match request_pov(
&mut sender,
relay_parent,
@@ -713,17 +651,18 @@ async fn validate_and_make_available(
},
Err(err) => return Err(err),
Ok(pov) => pov,
- }
- },
+ },
};
let v = {
- let _span = span.as_ref().map(|s| {
- s.child("request-validation")
- .with_pov(&pov)
- .with_para_id(candidate.descriptor().para_id)
- });
- request_candidate_validation(&mut sender, candidate.clone(), pov.clone()).await?
+ request_candidate_validation(
+ &mut sender,
+ persisted_validation_data,
+ validation_code,
+ candidate.clone(),
+ pov.clone(),
+ )
+ .await?
};
let res = match v {
@@ -739,14 +678,17 @@ async fn validate_and_make_available(
n_validators,
pov.clone(),
candidate.hash(),
- validation_data,
+ validation_data.clone(),
candidate.descriptor.erasure_root,
- span.as_ref(),
)
.await;
match erasure_valid {
- Ok(()) => Ok((candidate, commitments, pov.clone())),
+ Ok(()) => Ok(BackgroundValidationOutputs {
+ candidate,
+ commitments,
+ persisted_validation_data: validation_data,
+ }),
Err(Error::StoreAvailableData(StoreAvailableDataError::InvalidErasureRoot)) => {
gum::debug!(
target: LOG_TARGET,
@@ -784,556 +726,1294 @@ async fn validate_and_make_available(
}
#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
-impl CandidateBackingJob {
- async fn handle_validated_candidate_command(
- &mut self,
- root_span: &jaeger::Span,
- ctx: &mut Context,
- command: ValidatedCandidateCommand,
- ) -> Result<(), Error> {
- let candidate_hash = command.candidate_hash();
- self.awaiting_validation.remove(&candidate_hash);
-
- match command {
- ValidatedCandidateCommand::Second(res) => {
- match res {
- Ok((candidate, commitments, _)) => {
- // sanity check.
- if self.seconded.is_none() &&
- !self.issued_statements.contains(&candidate_hash)
- {
- self.seconded = Some(candidate_hash);
- self.issued_statements.insert(candidate_hash);
- self.metrics.on_candidate_seconded();
-
- let statement = Statement::Seconded(CommittedCandidateReceipt {
- descriptor: candidate.descriptor.clone(),
- commitments,
- });
- if let Some(stmt) = self
- .sign_import_and_distribute_statement(ctx, statement, root_span)?
- {
- // Break cycle - bounded as there is only one candidate to
- // second per block.
- ctx.send_unbounded_message(CollatorProtocolMessage::Seconded(
- self.parent,
- stmt,
- ));
- }
- }
- },
- Err(candidate) => {
- // Break cycle - bounded as there is only one candidate to
- // second per block.
- ctx.send_unbounded_message(CollatorProtocolMessage::Invalid(
- self.parent,
- candidate,
- ));
- },
- }
- },
- ValidatedCandidateCommand::Attest(res) => {
- // We are done - avoid new validation spawns:
- self.fallbacks.remove(&candidate_hash);
- // sanity check.
- if !self.issued_statements.contains(&candidate_hash) {
- if res.is_ok() {
- let statement = Statement::Valid(candidate_hash);
- self.sign_import_and_distribute_statement(ctx, statement, &root_span)?;
- }
- self.issued_statements.insert(candidate_hash);
- }
- },
- ValidatedCandidateCommand::AttestNoPoV(candidate_hash) => {
- if let Some((attesting, span)) = self.fallbacks.get_mut(&candidate_hash) {
- if let Some(index) = attesting.backing.pop() {
- attesting.from_validator = index;
- // Ok, another try:
- let c_span = span.as_ref().map(|s| s.child("try"));
- let attesting = attesting.clone();
- self.kick_off_validation_work(ctx, attesting, c_span).await?
- }
- } else {
- gum::warn!(
- target: LOG_TARGET,
- "AttestNoPoV was triggered without fallback being available."
- );
- debug_assert!(false);
- }
- },
- }
+async fn handle_communication(
+ ctx: &mut Context,
+ state: &mut State,
+ message: CandidateBackingMessage,
+ metrics: &Metrics,
+) -> Result<(), Error> {
+ match message {
+ CandidateBackingMessage::Second(_relay_parent, candidate, pvd, pov) => {
+ handle_second_message(ctx, state, candidate, pvd, pov, metrics).await?;
+ },
+ CandidateBackingMessage::Statement(relay_parent, statement) => {
+ handle_statement_message(ctx, state, relay_parent, statement, metrics).await?;
+ },
+ CandidateBackingMessage::GetBackedCandidates(requested_candidates, tx) =>
+ handle_get_backed_candidates_message(state, requested_candidates, tx, metrics)?,
+ CandidateBackingMessage::CanSecond(request, tx) =>
+ handle_can_second_request(ctx, state, request, tx).await,
+ }
+
+ Ok(())
+}
- Ok(())
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn handle_active_leaves_update(
+ ctx: &mut Context,
+ update: ActiveLeavesUpdate,
+ state: &mut State,
+) -> Result<(), Error> {
+ enum LeafHasProspectiveParachains {
+ Enabled(Result),
+ Disabled,
}
- async fn background_validate_and_make_available(
- &mut self,
- ctx: &mut Context,
- params: BackgroundValidationParams<
- impl overseer::CandidateBackingSenderTrait,
- impl Fn(BackgroundValidationResult) -> ValidatedCandidateCommand + Send + 'static + Sync,
- >,
- ) -> Result<(), Error> {
- let candidate_hash = params.candidate.hash();
- if self.awaiting_validation.insert(candidate_hash) {
- // spawn background task.
- let bg = async move {
- if let Err(e) = validate_and_make_available(params).await {
- if let Error::BackgroundValidationMpsc(error) = e {
- gum::debug!(
- target: LOG_TARGET,
- ?error,
- "Mpsc background validation mpsc died during validation- leaf no longer active?"
- );
- } else {
- gum::error!(
- target: LOG_TARGET,
- "Failed to validate and make available: {:?}",
- e
- );
- }
- }
- };
+ // Activate in implicit view before deactivate, per the docs
+ // on ImplicitView, this is more efficient.
+ let res = if let Some(leaf) = update.activated {
+ // Only activate in implicit view if prospective
+ // parachains are enabled.
+ let mode = prospective_parachains_mode(ctx.sender(), leaf.hash).await?;
+
+ let leaf_hash = leaf.hash;
+ Some((
+ leaf,
+ match mode {
+ ProspectiveParachainsMode::Disabled => LeafHasProspectiveParachains::Disabled,
+ ProspectiveParachainsMode::Enabled { .. } => LeafHasProspectiveParachains::Enabled(
+ state.implicit_view.activate_leaf(ctx.sender(), leaf_hash).await.map(|_| mode),
+ ),
+ },
+ ))
+ } else {
+ None
+ };
- ctx.spawn("backing-validation", bg.boxed())
- .map_err(|_| Error::FailedToSpawnBackgroundTask)?;
- }
+ for deactivated in update.deactivated {
+ state.per_leaf.remove(&deactivated);
+ state.implicit_view.deactivate_leaf(deactivated);
+ }
+
+ // clean up `per_relay_parent` according to ancestry
+ // of leaves. we do this so we can clean up candidates right after
+ // as a result.
+ //
+ // when prospective parachains are disabled, the implicit view is empty,
+ // which means we'll clean up everything that's not a leaf - the expected behavior
+ // for pre-asynchronous backing.
+ {
+ let remaining: HashSet<_> = state
+ .per_leaf
+ .keys()
+ .chain(state.implicit_view.all_allowed_relay_parents())
+ .collect();
- Ok(())
+ state.per_relay_parent.retain(|r, _| remaining.contains(&r));
}
- /// Kick off background validation with intent to second.
- async fn validate_and_second(
- &mut self,
- parent_span: &jaeger::Span,
- root_span: &jaeger::Span,
- ctx: &mut Context,
- candidate: &CandidateReceipt,
- pov: Arc,
- ) -> Result<(), Error> {
- // Check that candidate is collated by the right collator.
- if self
- .required_collator
- .as_ref()
- .map_or(false, |c| c != &candidate.descriptor().collator)
- {
- // Break cycle - bounded as there is only one candidate to
- // second per block.
- ctx.send_unbounded_message(CollatorProtocolMessage::Invalid(
- self.parent,
- candidate.clone(),
- ));
+ // clean up `per_candidate` according to which relay-parents
+ // are known.
+ //
+ // when prospective parachains are disabled, we clean up all candidates
+ // because we've cleaned up all relay parents. this is correct.
+ state
+ .per_candidate
+ .retain(|_, pc| state.per_relay_parent.contains_key(&pc.relay_parent));
+
+ // Get relay parents which might be fresh but might be known already
+ // that are explicit or implicit from the new active leaf.
+ let (fresh_relay_parents, leaf_mode) = match res {
+ None => return Ok(()),
+ Some((leaf, LeafHasProspectiveParachains::Disabled)) => {
+ // defensive in this case - for enabled, this manifests as an error.
+ if state.per_leaf.contains_key(&leaf.hash) {
+ return Ok(())
+ }
+
+ state.per_leaf.insert(
+ leaf.hash,
+ ActiveLeafState {
+ prospective_parachains_mode: ProspectiveParachainsMode::Disabled,
+ // This is empty because the only allowed relay-parent and depth
+ // when prospective parachains are disabled is the leaf hash and 0,
+ // respectively. We've just learned about the leaf hash, so we cannot
+ // have any candidates seconded with it as a relay-parent yet.
+ seconded_at_depth: HashMap::new(),
+ },
+ );
+
+ (vec![leaf.hash], ProspectiveParachainsMode::Disabled)
+ },
+ Some((leaf, LeafHasProspectiveParachains::Enabled(Ok(prospective_parachains_mode)))) => {
+ let fresh_relay_parents =
+ state.implicit_view.known_allowed_relay_parents_under(&leaf.hash, None);
+
+ // At this point, all candidates outside of the implicit view
+ // have been cleaned up. For all which remain, which we've seconded,
+ // we ask the prospective parachains subsystem where they land in the fragment
+ // tree for the given active leaf. This comprises our `seconded_at_depth`.
+
+ let remaining_seconded = state
+ .per_candidate
+ .iter()
+ .filter(|(_, cd)| cd.seconded_locally)
+ .map(|(c_hash, cd)| (*c_hash, cd.para_id));
+
+ // one-to-one correspondence to remaining_seconded
+ let mut membership_answers = FuturesOrdered::new();
+
+ for (candidate_hash, para_id) in remaining_seconded {
+ let (tx, rx) = oneshot::channel();
+ membership_answers
+ .push_back(rx.map_ok(move |membership| (para_id, candidate_hash, membership)));
+
+ ctx.send_message(ProspectiveParachainsMessage::GetTreeMembership(
+ para_id,
+ candidate_hash,
+ tx,
+ ))
+ .await;
+ }
+
+ let mut seconded_at_depth = HashMap::new();
+ if let Some(response) = membership_answers.next().await {
+ match response {
+ Err(oneshot::Canceled) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ "Prospective parachains subsystem unreachable for membership request",
+ );
+ },
+ Ok((para_id, candidate_hash, membership)) => {
+ // This request gives membership in all fragment trees. We have some
+ // wasted data here, and it can be optimized if it proves
+ // relevant to performance.
+ if let Some((_, depths)) =
+ membership.into_iter().find(|(leaf_hash, _)| leaf_hash == &leaf.hash)
+ {
+ let para_entry: &mut BTreeMap =
+ seconded_at_depth.entry(para_id).or_default();
+ for depth in depths {
+ para_entry.insert(depth, candidate_hash);
+ }
+ }
+ },
+ }
+ }
+
+ state.per_leaf.insert(
+ leaf.hash,
+ ActiveLeafState { prospective_parachains_mode, seconded_at_depth },
+ );
+
+ let fresh_relay_parent = match fresh_relay_parents {
+ Some(f) => f.to_vec(),
+ None => {
+ gum::warn!(
+ target: LOG_TARGET,
+ leaf_hash = ?leaf.hash,
+ "Implicit view gave no relay-parents"
+ );
+
+ vec![leaf.hash]
+ },
+ };
+ (fresh_relay_parent, prospective_parachains_mode)
+ },
+ Some((leaf, LeafHasProspectiveParachains::Enabled(Err(e)))) => {
+ gum::debug!(
+ target: LOG_TARGET,
+ leaf_hash = ?leaf.hash,
+ err = ?e,
+ "Failed to load implicit view for leaf."
+ );
+
return Ok(())
+ },
+ };
+
+ // add entries in `per_relay_parent`. for all new relay-parents.
+ for maybe_new in fresh_relay_parents {
+ if state.per_relay_parent.contains_key(&maybe_new) {
+ continue
}
- let candidate_hash = candidate.hash();
- let mut span = self.get_unbacked_validation_child(
- root_span,
- candidate_hash,
- candidate.descriptor().para_id,
- );
+ let mode = match state.per_leaf.get(&maybe_new) {
+ None => {
+ // If the relay-parent isn't a leaf itself,
+ // then it is guaranteed by the prospective parachains
+ // subsystem that it is an ancestor of a leaf which
+ // has prospective parachains enabled and that the
+ // block itself did.
+ leaf_mode
+ },
+ Some(l) => l.prospective_parachains_mode,
+ };
- span.as_mut().map(|span| span.add_follows_from(parent_span));
+ // construct a `PerRelayParent` from the runtime API
+ // and insert it.
+ let per = construct_per_relay_parent_state(ctx, maybe_new, &state.keystore, mode).await?;
- gum::debug!(
- target: LOG_TARGET,
- candidate_hash = ?candidate_hash,
- candidate_receipt = ?candidate,
- "Validate and second candidate",
- );
+ if let Some(per) = per {
+ state.per_relay_parent.insert(maybe_new, per);
+ }
+ }
- let bg_sender = ctx.sender().clone();
- self.background_validate_and_make_available(
- ctx,
- BackgroundValidationParams {
- sender: bg_sender,
- tx_command: self.background_validation_tx.clone(),
- candidate: candidate.clone(),
- relay_parent: self.parent,
- pov: PoVData::Ready(pov),
- n_validators: self.table_context.validators.len(),
- span,
- make_command: ValidatedCandidateCommand::Second,
+ Ok(())
+}
+
+/// Load the data necessary to do backing work on top of a relay-parent.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn construct_per_relay_parent_state(
+ ctx: &mut Context,
+ relay_parent: Hash,
+ keystore: &KeystorePtr,
+ mode: ProspectiveParachainsMode,
+) -> Result, Error> {
+ macro_rules! try_runtime_api {
+ ($x: expr) => {
+ match $x {
+ Ok(x) => x,
+ Err(e) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ err = ?e,
+ "Failed to fetch runtime API data for job",
+ );
+
+ // We can't do candidate validation work if we don't have the
+ // requisite runtime API data. But these errors should not take
+ // down the node.
+ return Ok(None);
+ }
+ }
+ }
+ }
+
+ let parent = relay_parent;
+
+ let (validators, groups, session_index, cores) = futures::try_join!(
+ request_validators(parent, ctx.sender()).await,
+ request_validator_groups(parent, ctx.sender()).await,
+ request_session_index_for_child(parent, ctx.sender()).await,
+ request_from_runtime(parent, ctx.sender(), |tx| {
+ RuntimeApiRequest::AvailabilityCores(tx)
+ },)
+ .await,
+ )
+ .map_err(Error::JoinMultiple)?;
+
+ let validators: Vec<_> = try_runtime_api!(validators);
+ let (validator_groups, group_rotation_info) = try_runtime_api!(groups);
+ let session_index = try_runtime_api!(session_index);
+ let cores = try_runtime_api!(cores);
+
+ let signing_context = SigningContext { parent_hash: parent, session_index };
+ let validator =
+ match Validator::construct(&validators, signing_context.clone(), keystore.clone()) {
+ Ok(v) => Some(v),
+ Err(util::Error::NotAValidator) => None,
+ Err(e) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ err = ?e,
+ "Cannot participate in candidate backing",
+ );
+
+ return Ok(None)
},
- )
- .await?;
+ };
+
+ let mut groups = HashMap::new();
+ let n_cores = cores.len();
+ let mut assignment = None;
- Ok(())
+ for (idx, core) in cores.into_iter().enumerate() {
+ let core_para_id = match core {
+ CoreState::Scheduled(scheduled) => scheduled.para_id,
+ CoreState::Occupied(occupied) =>
+ if mode.is_enabled() {
+ // Async backing makes it legal to build on top of
+ // occupied core.
+ occupied.candidate_descriptor.para_id
+ } else {
+ continue
+ },
+ CoreState::Free => continue,
+ };
+
+ let core_index = CoreIndex(idx as _);
+ let group_index = group_rotation_info.group_for_core(core_index, n_cores);
+ if let Some(g) = validator_groups.get(group_index.0 as usize) {
+ if validator.as_ref().map_or(false, |v| g.contains(&v.index())) {
+ assignment = Some(core_para_id);
+ }
+ groups.insert(core_para_id, g.clone());
+ }
}
- fn sign_import_and_distribute_statement(
- &mut self,
- ctx: &mut Context,
- statement: Statement,
- root_span: &jaeger::Span,
- ) -> Result, Error> {
- if let Some(signed_statement) = self.sign_statement(statement) {
- self.import_statement(ctx, &signed_statement, root_span)?;
- let smsg = StatementDistributionMessage::Share(self.parent, signed_statement.clone());
- ctx.send_unbounded_message(smsg);
-
- Ok(Some(signed_statement))
+ let table_context = TableContext { groups, validators, validator };
+ let table_config = TableConfig {
+ allow_multiple_seconded: match mode {
+ ProspectiveParachainsMode::Enabled { .. } => true,
+ ProspectiveParachainsMode::Disabled => false,
+ },
+ };
+
+ Ok(Some(PerRelayParentState {
+ prospective_parachains_mode: mode,
+ parent,
+ assignment,
+ backed: HashSet::new(),
+ table: Table::new(table_config),
+ table_context,
+ issued_statements: HashSet::new(),
+ awaiting_validation: HashSet::new(),
+ fallbacks: HashMap::new(),
+ }))
+}
+
+enum SecondingAllowed {
+ No,
+ Yes(Vec<(Hash, Vec)>),
+}
+
+/// Checks whether a candidate can be seconded based on its hypothetical frontiers in the fragment
+/// tree and what we've already seconded in all active leaves.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn seconding_sanity_check(
+ ctx: &mut Context,
+ active_leaves: &HashMap,
+ implicit_view: &ImplicitView,
+ hypothetical_candidate: HypotheticalCandidate,
+ backed_in_path_only: bool,
+) -> SecondingAllowed {
+ let mut membership = Vec::new();
+ let mut responses = FuturesOrdered::>>::new();
+
+ let candidate_para = hypothetical_candidate.candidate_para();
+ let candidate_relay_parent = hypothetical_candidate.relay_parent();
+ let candidate_hash = hypothetical_candidate.candidate_hash();
+
+ for (head, leaf_state) in active_leaves {
+ if leaf_state.prospective_parachains_mode.is_enabled() {
+ // Check that the candidate relay parent is allowed for para, skip the
+ // leaf otherwise.
+ let allowed_parents_for_para =
+ implicit_view.known_allowed_relay_parents_under(head, Some(candidate_para));
+ if !allowed_parents_for_para.unwrap_or_default().contains(&candidate_relay_parent) {
+ continue
+ }
+
+ let (tx, rx) = oneshot::channel();
+ ctx.send_message(ProspectiveParachainsMessage::GetHypotheticalFrontier(
+ HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(*head),
+ backed_in_path_only,
+ },
+ tx,
+ ))
+ .await;
+ let response = rx.map_ok(move |frontiers| {
+ let depths: Vec = frontiers
+ .into_iter()
+ .flat_map(|(candidate, memberships)| {
+ debug_assert_eq!(candidate.candidate_hash(), candidate_hash);
+ memberships.into_iter().flat_map(|(relay_parent, depths)| {
+ debug_assert_eq!(relay_parent, *head);
+ depths
+ })
+ })
+ .collect();
+ (depths, head, leaf_state)
+ });
+ responses.push_back(response.boxed());
} else {
- Ok(None)
+ if *head == candidate_relay_parent {
+ if leaf_state
+ .seconded_at_depth
+ .get(&candidate_para)
+ .map_or(false, |occupied| occupied.contains_key(&0))
+ {
+ // The leaf is already occupied.
+ return SecondingAllowed::No
+ }
+ responses.push_back(futures::future::ok((vec![0], head, leaf_state)).boxed());
+ }
}
}
- /// Check if there have happened any new misbehaviors and issue necessary messages.
- fn issue_new_misbehaviors(&mut self, sender: &mut impl overseer::CandidateBackingSenderTrait) {
- // collect the misbehaviors to avoid double mutable self borrow issues
- let misbehaviors: Vec<_> = self.table.drain_misbehaviors().collect();
- for (validator_id, report) in misbehaviors {
- // The provisioner waits on candidate-backing, which means
- // that we need to send unbounded messages to avoid cycles.
- //
- // Misbehaviors are bounded by the number of validators and
- // the block production protocol.
- sender.send_unbounded_message(ProvisionerMessage::ProvisionableData(
- self.parent,
- ProvisionableData::MisbehaviorReport(self.parent, validator_id, report),
- ));
+ if responses.is_empty() {
+ return SecondingAllowed::No
+ }
+
+ while let Some(response) = responses.next().await {
+ match response {
+ Err(oneshot::Canceled) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ "Failed to reach prospective parachains subsystem for hypothetical frontiers",
+ );
+
+ return SecondingAllowed::No
+ },
+ Ok((depths, head, leaf_state)) => {
+ for depth in &depths {
+ if leaf_state
+ .seconded_at_depth
+ .get(&candidate_para)
+ .map_or(false, |occupied| occupied.contains_key(&depth))
+ {
+ gum::debug!(
+ target: LOG_TARGET,
+ ?candidate_hash,
+ depth,
+ leaf_hash = ?head,
+ "Refusing to second candidate at depth - already occupied."
+ );
+
+ return SecondingAllowed::No
+ }
+ }
+
+ membership.push((*head, depths));
+ },
}
}
- /// Import a statement into the statement table and return the summary of the import.
- fn import_statement(
- &mut self,
- ctx: &mut Context,
- statement: &SignedFullStatement,
- root_span: &jaeger::Span,
- ) -> Result, Error> {
- gum::debug!(
- target: LOG_TARGET,
- statement = ?statement.payload().to_compact(),
- validator_index = statement.validator_index().0,
- "Importing statement",
- );
+ // At this point we've checked the depths of the candidate against all active
+ // leaves.
+ SecondingAllowed::Yes(membership)
+}
- let candidate_hash = statement.payload().candidate_hash();
- let import_statement_span = {
- // create a span only for candidates we're already aware of.
- self.get_unbacked_statement_child(
- root_span,
- candidate_hash,
- statement.validator_index(),
- )
+/// Performs seconding sanity check for an advertisement.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn handle_can_second_request(
+ ctx: &mut Context,
+ state: &State,
+ request: CanSecondRequest,
+ tx: oneshot::Sender,
+) {
+ let relay_parent = request.candidate_relay_parent;
+ let response = if state
+ .per_relay_parent
+ .get(&relay_parent)
+ .map_or(false, |pr_state| pr_state.prospective_parachains_mode.is_enabled())
+ {
+ let hypothetical_candidate = HypotheticalCandidate::Incomplete {
+ candidate_hash: request.candidate_hash,
+ candidate_para: request.candidate_para_id,
+ parent_head_data_hash: request.parent_head_data_hash,
+ candidate_relay_parent: relay_parent,
};
- let stmt = primitive_statement_to_table(statement);
+ let result = seconding_sanity_check(
+ ctx,
+ &state.per_leaf,
+ &state.implicit_view,
+ hypothetical_candidate,
+ true,
+ )
+ .await;
- let summary = self.table.import_statement(&self.table_context, stmt);
+ match result {
+ SecondingAllowed::No => false,
+ SecondingAllowed::Yes(membership) => {
+ // Candidate should be recognized by at least some fragment tree.
+ membership.iter().any(|(_, m)| !m.is_empty())
+ },
+ }
+ } else {
+ // Relay parent is unknown or async backing is disabled.
+ false
+ };
- let unbacked_span = if let Some(attested) = summary
- .as_ref()
- .and_then(|s| self.table.attested_candidate(&s.candidate, &self.table_context))
- {
- let candidate_hash = attested.candidate.hash();
- // `HashSet::insert` returns true if the thing wasn't in there already.
- if self.backed.insert(candidate_hash) {
- let span = self.remove_unbacked_span(&candidate_hash);
+ let _ = tx.send(response);
+}
- if let Some(backed) = table_attested_to_backed(attested, &self.table_context) {
- gum::debug!(
- target: LOG_TARGET,
- candidate_hash = ?candidate_hash,
- relay_parent = ?self.parent,
- para_id = %backed.candidate.descriptor.para_id,
- "Candidate backed",
- );
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn handle_validated_candidate_command(
+ ctx: &mut Context,
+ state: &mut State,
+ relay_parent: Hash,
+ command: ValidatedCandidateCommand,
+ metrics: &Metrics,
+) -> Result<(), Error> {
+ match state.per_relay_parent.get_mut(&relay_parent) {
+ Some(rp_state) => {
+ let candidate_hash = command.candidate_hash();
+ rp_state.awaiting_validation.remove(&candidate_hash);
+
+ match command {
+ ValidatedCandidateCommand::Second(res) => match res {
+ Ok(outputs) => {
+ let BackgroundValidationOutputs {
+ candidate,
+ commitments,
+ persisted_validation_data,
+ } = outputs;
+ if rp_state.issued_statements.contains(&candidate_hash) {
+ return Ok(())
+ }
+
+ let receipt = CommittedCandidateReceipt {
+ descriptor: candidate.descriptor.clone(),
+ commitments,
+ };
+
+ let parent_head_data_hash = persisted_validation_data.parent_head.hash();
+ // Note that `GetHypotheticalFrontier` doesn't account for recursion,
+ // i.e. candidates can appear at multiple depths in the tree and in fact
+ // at all depths, and we don't know what depths a candidate will ultimately
+ // occupy because that's dependent on other candidates we haven't yet
+ // received.
+ //
+ // The only way to effectively rule this out is to have candidate receipts
+ // directly commit to the parachain block number or some other incrementing
+ // counter. That requires a major primitives format upgrade, so for now
+ // we just rule out trivial cycles.
+ if parent_head_data_hash == receipt.commitments.head_data.hash() {
+ return Ok(())
+ }
+ let hypothetical_candidate = HypotheticalCandidate::Complete {
+ candidate_hash,
+ receipt: Arc::new(receipt.clone()),
+ persisted_validation_data: persisted_validation_data.clone(),
+ };
+ // sanity check that we're allowed to second the candidate
+ // and that it doesn't conflict with other candidates we've
+ // seconded.
+ let fragment_tree_membership = match seconding_sanity_check(
+ ctx,
+ &state.per_leaf,
+ &state.implicit_view,
+ hypothetical_candidate,
+ false,
+ )
+ .await
+ {
+ SecondingAllowed::No => return Ok(()),
+ SecondingAllowed::Yes(membership) => membership,
+ };
+
+ let statement =
+ StatementWithPVD::Seconded(receipt, persisted_validation_data);
+
+ // If we get an Error::RejectedByProspectiveParachains,
+ // then the statement has not been distributed or imported into
+ // the table.
+ let res = sign_import_and_distribute_statement(
+ ctx,
+ rp_state,
+ &mut state.per_candidate,
+ statement,
+ state.keystore.clone(),
+ metrics,
+ )
+ .await;
+
+ if let Err(Error::RejectedByProspectiveParachains) = res {
+ let candidate_hash = candidate.hash();
+ gum::debug!(
+ target: LOG_TARGET,
+ relay_parent = ?candidate.descriptor().relay_parent,
+ ?candidate_hash,
+ "Attempted to second candidate but was rejected by prospective parachains",
+ );
+
+ // Ensure the collator is reported.
+ ctx.send_message(CollatorProtocolMessage::Invalid(
+ candidate.descriptor().relay_parent,
+ candidate,
+ ))
+ .await;
+
+ return Ok(())
+ }
+
+ if let Some(stmt) = res? {
+ match state.per_candidate.get_mut(&candidate_hash) {
+ None => {
+ gum::warn!(
+ target: LOG_TARGET,
+ ?candidate_hash,
+ "Missing `per_candidate` for seconded candidate.",
+ );
+ },
+ Some(p) => p.seconded_locally = true,
+ }
+
+ // update seconded depths in active leaves.
+ for (leaf, depths) in fragment_tree_membership {
+ let leaf_data = match state.per_leaf.get_mut(&leaf) {
+ None => {
+ gum::warn!(
+ target: LOG_TARGET,
+ leaf_hash = ?leaf,
+ "Missing `per_leaf` for known active leaf."
+ );
+
+ continue
+ },
+ Some(d) => d,
+ };
+
+ let seconded_at_depth = leaf_data
+ .seconded_at_depth
+ .entry(candidate.descriptor().para_id)
+ .or_default();
+
+ for depth in depths {
+ seconded_at_depth.insert(depth, candidate_hash);
+ }
+ }
+
+ rp_state.issued_statements.insert(candidate_hash);
+
+ metrics.on_candidate_seconded();
+ ctx.send_message(CollatorProtocolMessage::Seconded(
+ rp_state.parent,
+ StatementWithPVD::drop_pvd_from_signed(stmt),
+ ))
+ .await;
+ }
+ },
+ Err(candidate) => {
+ ctx.send_message(CollatorProtocolMessage::Invalid(
+ rp_state.parent,
+ candidate,
+ ))
+ .await;
+ },
+ },
+ ValidatedCandidateCommand::Attest(res) => {
+ // We are done - avoid new validation spawns:
+ rp_state.fallbacks.remove(&candidate_hash);
+ // sanity check.
+ if !rp_state.issued_statements.contains(&candidate_hash) {
+ if res.is_ok() {
+ let statement = StatementWithPVD::Valid(candidate_hash);
+
+ sign_import_and_distribute_statement(
+ ctx,
+ rp_state,
+ &mut state.per_candidate,
+ statement,
+ state.keystore.clone(),
+ metrics,
+ )
+ .await?;
+ }
+ rp_state.issued_statements.insert(candidate_hash);
+ }
+ },
+ ValidatedCandidateCommand::AttestNoPoV(candidate_hash) => {
+ if let Some(attesting) = rp_state.fallbacks.get_mut(&candidate_hash) {
+ if let Some(index) = attesting.backing.pop() {
+ attesting.from_validator = index;
+ let attesting = attesting.clone();
+
+ // The candidate state should be available because we've
+ // validated it before, the relay-parent is still around,
+ // and candidates are pruned on the basis of relay-parents.
+ //
+ // If it's not, then no point in validating it anyway.
+ if let Some(pvd) = state
+ .per_candidate
+ .get(&candidate_hash)
+ .map(|pc| pc.persisted_validation_data.clone())
+ {
+ kick_off_validation_work(
+ ctx,
+ rp_state,
+ pvd,
+ &state.background_validation_tx,
+ attesting,
+ )
+ .await?;
+ }
+ }
+ } else {
+ gum::warn!(
+ target: LOG_TARGET,
+ "AttestNoPoV was triggered without fallback being available."
+ );
+ debug_assert!(false);
+ }
+ },
+ }
+ },
+ None => {
+ // simple race condition; can be ignored = this relay-parent
+ // is no longer relevant.
+ },
+ }
+
+ Ok(())
+}
+
+fn sign_statement(
+ rp_state: &PerRelayParentState,
+ statement: StatementWithPVD,
+ keystore: KeystorePtr,
+ metrics: &Metrics,
+) -> Option {
+ let signed = rp_state
+ .table_context
+ .validator
+ .as_ref()?
+ .sign(keystore, statement)
+ .ok()
+ .flatten()?;
+ metrics.on_statement_signed();
+ Some(signed)
+}
+
+/// Import a statement into the statement table and return the summary of the import.
+///
+/// This will fail with `Error::RejectedByProspectiveParachains` if the message type
+/// is seconded, the candidate is fresh,
+/// and any of the following are true:
+/// 1. There is no `PersistedValidationData` attached.
+/// 2. Prospective parachains are enabled for the relay parent and the prospective parachains
+/// subsystem returned an empty `FragmentTreeMembership` i.e. did not recognize the candidate as
+/// being applicable to any of the active leaves.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn import_statement(
+ ctx: &mut Context,
+ rp_state: &mut PerRelayParentState,
+ per_candidate: &mut HashMap,
+ statement: &SignedFullStatementWithPVD,
+) -> Result, Error> {
+ gum::debug!(
+ target: LOG_TARGET,
+ statement = ?statement.payload().to_compact(),
+ validator_index = statement.validator_index().0,
+ "Importing statement",
+ );
+
+ let candidate_hash = statement.payload().candidate_hash();
+
+ // If this is a new candidate (statement is 'seconded' and candidate is unknown),
+ // we need to create an entry in the `PerCandidateState` map.
+ //
+ // If the relay parent supports prospective parachains, we also need
+ // to inform the prospective parachains subsystem of the seconded candidate.
+ // If `ProspectiveParachainsMessage::Second` fails, then we return
+ // Error::RejectedByProspectiveParachains.
+ //
+ // Persisted Validation Data should be available - it may already be available
+ // if this is a candidate we are seconding.
+ //
+ // We should also not accept any candidates which have no valid depths under any of
+ // our active leaves.
+ if let StatementWithPVD::Seconded(candidate, pvd) = statement.payload() {
+ if !per_candidate.contains_key(&candidate_hash) {
+ if rp_state.prospective_parachains_mode.is_enabled() {
+ let (tx, rx) = oneshot::channel();
+ ctx.send_message(ProspectiveParachainsMessage::IntroduceCandidate(
+ IntroduceCandidateRequest {
+ candidate_para: candidate.descriptor().para_id,
+ candidate_receipt: candidate.clone(),
+ persisted_validation_data: pvd.clone(),
+ },
+ tx,
+ ))
+ .await;
+
+ match rx.await {
+ Err(oneshot::Canceled) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ "Could not reach the Prospective Parachains subsystem."
+ );
+
+ return Err(Error::RejectedByProspectiveParachains)
+ },
+ Ok(membership) =>
+ if membership.is_empty() {
+ return Err(Error::RejectedByProspectiveParachains)
+ },
+ }
+
+ ctx.send_message(ProspectiveParachainsMessage::CandidateSeconded(
+ candidate.descriptor().para_id,
+ candidate_hash,
+ ))
+ .await;
+ }
+
+ // Only save the candidate if it was approved by prospective parachains.
+ per_candidate.insert(
+ candidate_hash,
+ PerCandidateState {
+ persisted_validation_data: pvd.clone(),
+ // This is set after importing when seconding locally.
+ seconded_locally: false,
+ para_id: candidate.descriptor().para_id,
+ relay_parent: candidate.descriptor().relay_parent,
+ },
+ );
+ }
+ }
+
+ let stmt = primitive_statement_to_table(statement);
+
+ Ok(rp_state.table.import_statement(&rp_state.table_context, stmt))
+}
+
+/// Handles a summary received from [`import_statement`] and dispatches `Backed` notifications and
+/// misbehaviors as a result of importing a statement.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn post_import_statement_actions(
+ ctx: &mut Context,
+ rp_state: &mut PerRelayParentState,
+ summary: Option<&TableSummary>,
+) -> Result<(), Error> {
+ if let Some(attested) = summary
+ .as_ref()
+ .and_then(|s| rp_state.table.attested_candidate(&s.candidate, &rp_state.table_context))
+ {
+ let candidate_hash = attested.candidate.hash();
+
+ // `HashSet::insert` returns true if the thing wasn't in there already.
+ if rp_state.backed.insert(candidate_hash) {
+ if let Some(backed) = table_attested_to_backed(attested, &rp_state.table_context) {
+ let para_id = backed.candidate.descriptor.para_id;
+ gum::debug!(
+ target: LOG_TARGET,
+ candidate_hash = ?candidate_hash,
+ relay_parent = ?rp_state.parent,
+ %para_id,
+ "Candidate backed",
+ );
+
+ if rp_state.prospective_parachains_mode.is_enabled() {
+ // Inform the prospective parachains subsystem
+ // that the candidate is now backed.
+ ctx.send_message(ProspectiveParachainsMessage::CandidateBacked(
+ para_id,
+ candidate_hash,
+ ))
+ .await;
+ // Backed candidate potentially unblocks new advertisements,
+ // notify collator protocol.
+ ctx.send_message(CollatorProtocolMessage::Backed {
+ para_id,
+ para_head: backed.candidate.descriptor.para_head,
+ })
+ .await;
+ // Notify statement distribution of backed candidate.
+ ctx.send_message(StatementDistributionMessage::Backed(candidate_hash)).await;
+ } else {
// The provisioner waits on candidate-backing, which means
// that we need to send unbounded messages to avoid cycles.
//
// Backed candidates are bounded by the number of validators,
// parachains, and the block production rate of the relay chain.
let message = ProvisionerMessage::ProvisionableData(
- self.parent,
+ rp_state.parent,
ProvisionableData::BackedCandidate(backed.receipt()),
);
ctx.send_unbounded_message(message);
-
- span.as_ref().map(|s| s.child("backed"));
- span
- } else {
- None
}
- } else {
- None
}
- } else {
- None
- };
+ }
+ }
- self.issue_new_misbehaviors(ctx.sender());
+ issue_new_misbehaviors(ctx, rp_state.parent, &mut rp_state.table);
- // It is important that the child span is dropped before its parent span (`unbacked_span`)
- drop(import_statement_span);
- drop(unbacked_span);
+ Ok(())
+}
- Ok(summary)
+/// Check if there have happened any new misbehaviors and issue necessary messages.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+fn issue_new_misbehaviors(
+ ctx: &mut Context,
+ relay_parent: Hash,
+ table: &mut Table,
+) {
+ // collect the misbehaviors to avoid double mutable self borrow issues
+ let misbehaviors: Vec<_> = table.drain_misbehaviors().collect();
+ for (validator_id, report) in misbehaviors {
+ // The provisioner waits on candidate-backing, which means
+ // that we need to send unbounded messages to avoid cycles.
+ //
+ // Misbehaviors are bounded by the number of validators and
+ // the block production protocol.
+ ctx.send_unbounded_message(ProvisionerMessage::ProvisionableData(
+ relay_parent,
+ ProvisionableData::MisbehaviorReport(relay_parent, validator_id, report),
+ ));
}
+}
- async fn handle_second_msg(
- &mut self,
- root_span: &jaeger::Span,
- ctx: &mut Context,
- candidate: CandidateReceipt,
- pov: PoV,
- ) -> Result<(), Error> {
- let _timer = self.metrics.time_process_second();
-
- let candidate_hash = candidate.hash();
- let span = root_span
- .child("second")
- .with_stage(jaeger::Stage::CandidateBacking)
- .with_pov(&pov)
- .with_candidate(candidate_hash)
- .with_relay_parent(self.parent);
-
- // Sanity check that candidate is from our assignment.
- if Some(candidate.descriptor().para_id) != self.assignment {
- gum::debug!(
- target: LOG_TARGET,
- our_assignment = ?self.assignment,
- collation = ?candidate.descriptor().para_id,
- "Subsystem asked to second for para outside of our assignment",
- );
+/// Sign, import, and distribute a statement.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn sign_import_and_distribute_statement(
+ ctx: &mut Context,
+ rp_state: &mut PerRelayParentState,
+ per_candidate: &mut HashMap,
+ statement: StatementWithPVD,
+ keystore: KeystorePtr,
+ metrics: &Metrics,
+) -> Result, Error> {
+ if let Some(signed_statement) = sign_statement(&*rp_state, statement, keystore, metrics) {
+ let summary = import_statement(ctx, rp_state, per_candidate, &signed_statement).await?;
- return Ok(())
- }
+ // `Share` must always be sent before `Backed`. We send the latter in
+ // `post_import_statement_action` below.
+ let smsg = StatementDistributionMessage::Share(rp_state.parent, signed_statement.clone());
+ ctx.send_unbounded_message(smsg);
- // If the message is a `CandidateBackingMessage::Second`, sign and dispatch a
- // Seconded statement only if we have not seconded any other candidate and
- // have not signed a Valid statement for the requested candidate.
- if self.seconded.is_none() {
- // This job has not seconded a candidate yet.
+ post_import_statement_actions(ctx, rp_state, summary.as_ref()).await?;
- if !self.issued_statements.contains(&candidate_hash) {
- let pov = Arc::new(pov);
- self.validate_and_second(&span, &root_span, ctx, &candidate, pov).await?;
+ Ok(Some(signed_statement))
+ } else {
+ Ok(None)
+ }
+}
+
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn background_validate_and_make_available(
+ ctx: &mut Context,
+ rp_state: &mut PerRelayParentState,
+ params: BackgroundValidationParams<
+ impl overseer::CandidateBackingSenderTrait,
+ impl Fn(BackgroundValidationResult) -> ValidatedCandidateCommand + Send + 'static + Sync,
+ >,
+) -> Result<(), Error> {
+ let candidate_hash = params.candidate.hash();
+ if rp_state.awaiting_validation.insert(candidate_hash) {
+ // spawn background task.
+ let bg = async move {
+ if let Err(e) = validate_and_make_available(params).await {
+ if let Error::BackgroundValidationMpsc(error) = e {
+ gum::debug!(
+ target: LOG_TARGET,
+ ?error,
+ "Mpsc background validation mpsc died during validation- leaf no longer active?"
+ );
+ } else {
+ gum::error!(
+ target: LOG_TARGET,
+ "Failed to validate and make available: {:?}",
+ e
+ );
+ }
}
- }
+ };
- Ok(())
+ ctx.spawn("backing-validation", bg.boxed())
+ .map_err(|_| Error::FailedToSpawnBackgroundTask)?;
}
- async fn handle_statement_message(
- &mut self,
- root_span: &jaeger::Span,
- ctx: &mut Context,
- statement: SignedFullStatement,
- ) -> Result<(), Error> {
- let _timer = self.metrics.time_process_statement();
- let _span = root_span
- .child("statement")
- .with_stage(jaeger::Stage::CandidateBacking)
- .with_candidate(statement.payload().candidate_hash())
- .with_relay_parent(self.parent);
-
- match self.maybe_validate_and_import(&root_span, ctx, statement).await {
- Err(Error::ValidationFailed(_)) => Ok(()),
- Err(e) => Err(e),
- Ok(()) => Ok(()),
- }
+ Ok(())
+}
+
+/// Kick off validation work and distribute the result as a signed statement.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn kick_off_validation_work(
+ ctx: &mut Context,
+ rp_state: &mut PerRelayParentState,
+ persisted_validation_data: PersistedValidationData,
+ background_validation_tx: &mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
+ attesting: AttestingData,
+) -> Result<(), Error> {
+ let candidate_hash = attesting.candidate.hash();
+ if rp_state.issued_statements.contains(&candidate_hash) {
+ return Ok(())
}
- fn handle_get_backed_candidates_message(
- &mut self,
- requested_candidates: Vec,
- tx: oneshot::Sender>,
- ) -> Result<(), Error> {
- let _timer = self.metrics.time_get_backed_candidates();
+ gum::debug!(
+ target: LOG_TARGET,
+ candidate_hash = ?candidate_hash,
+ candidate_receipt = ?attesting.candidate,
+ "Kicking off validation",
+ );
- let backed = requested_candidates
- .into_iter()
- .filter_map(|hash| {
- self.table
- .attested_candidate(&hash, &self.table_context)
- .and_then(|attested| table_attested_to_backed(attested, &self.table_context))
- })
- .collect();
+ let bg_sender = ctx.sender().clone();
+ let pov = PoVData::FetchFromValidator {
+ from_validator: attesting.from_validator,
+ candidate_hash,
+ pov_hash: attesting.pov_hash,
+ };
- tx.send(backed).map_err(|data| Error::Send(data))?;
- Ok(())
- }
+ background_validate_and_make_available(
+ ctx,
+ rp_state,
+ BackgroundValidationParams {
+ sender: bg_sender,
+ tx_command: background_validation_tx.clone(),
+ candidate: attesting.candidate,
+ relay_parent: rp_state.parent,
+ persisted_validation_data,
+ pov,
+ n_validators: rp_state.table_context.validators.len(),
+ make_command: ValidatedCandidateCommand::Attest,
+ },
+ )
+ .await
+}
+
+/// Import the statement and kick off validation work if it is a part of our assignment.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn maybe_validate_and_import(
+ ctx: &mut Context,
+ state: &mut State,
+ relay_parent: Hash,
+ statement: SignedFullStatementWithPVD,
+) -> Result<(), Error> {
+ let rp_state = match state.per_relay_parent.get_mut(&relay_parent) {
+ Some(r) => r,
+ None => {
+ gum::trace!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ "Received statement for unknown relay-parent"
+ );
- /// Kick off validation work and distribute the result as a signed statement.
- async fn kick_off_validation_work(
- &mut self,
- ctx: &mut Context,
- attesting: AttestingData,
- span: Option,
- ) -> Result<(), Error> {
- let candidate_hash = attesting.candidate.hash();
- if self.issued_statements.contains(&candidate_hash) {
return Ok(())
- }
+ },
+ };
- let descriptor = attesting.candidate.descriptor().clone();
+ let res = import_statement(ctx, rp_state, &mut state.per_candidate, &statement).await;
+ // if we get an Error::RejectedByProspectiveParachains,
+ // we will do nothing.
+ if let Err(Error::RejectedByProspectiveParachains) = res {
gum::debug!(
target: LOG_TARGET,
- candidate_hash = ?candidate_hash,
- candidate_receipt = ?attesting.candidate,
- "Kicking off validation",
+ ?relay_parent,
+ "Statement rejected by prospective parachains."
);
- // Check that candidate is collated by the right collator.
- if self.required_collator.as_ref().map_or(false, |c| c != &descriptor.collator) {
- // If not, we've got the statement in the table but we will
- // not issue validation work for it.
- //
- // Act as though we've issued a statement.
- self.issued_statements.insert(candidate_hash);
+ return Ok(())
+ }
+
+ let summary = res?;
+ post_import_statement_actions(ctx, rp_state, summary.as_ref()).await?;
+
+ if let Some(summary) = summary {
+ // import_statement already takes care of communicating with the
+ // prospective parachains subsystem. At this point, the candidate
+ // has already been accepted into the fragment trees.
+
+ let candidate_hash = summary.candidate;
+
+ if Some(summary.group_id) != rp_state.assignment {
return Ok(())
}
+ let attesting = match statement.payload() {
+ StatementWithPVD::Seconded(receipt, _) => {
+ let attesting = AttestingData {
+ candidate: rp_state
+ .table
+ .get_candidate(&candidate_hash)
+ .ok_or(Error::CandidateNotFound)?
+ .to_plain(),
+ pov_hash: receipt.descriptor.pov_hash,
+ from_validator: statement.validator_index(),
+ backing: Vec::new(),
+ };
+ rp_state.fallbacks.insert(summary.candidate, attesting.clone());
+ attesting
+ },
+ StatementWithPVD::Valid(candidate_hash) => {
+ if let Some(attesting) = rp_state.fallbacks.get_mut(candidate_hash) {
+ let our_index = rp_state.table_context.validator.as_ref().map(|v| v.index());
+ if our_index == Some(statement.validator_index()) {
+ return Ok(())
+ }
- let bg_sender = ctx.sender().clone();
- let pov = PoVData::FetchFromValidator {
- from_validator: attesting.from_validator,
- candidate_hash,
- pov_hash: attesting.pov_hash,
- };
- self.background_validate_and_make_available(
- ctx,
- BackgroundValidationParams {
- sender: bg_sender,
- tx_command: self.background_validation_tx.clone(),
- candidate: attesting.candidate,
- relay_parent: self.parent,
- pov,
- n_validators: self.table_context.validators.len(),
- span,
- make_command: ValidatedCandidateCommand::Attest,
+ if rp_state.awaiting_validation.contains(candidate_hash) {
+ // Job already running:
+ attesting.backing.push(statement.validator_index());
+ return Ok(())
+ } else {
+ // No job, so start another with current validator:
+ attesting.from_validator = statement.validator_index();
+ attesting.clone()
+ }
+ } else {
+ return Ok(())
+ }
},
- )
- .await
+ };
+
+ // After `import_statement` succeeds, the candidate entry is guaranteed
+ // to exist.
+ if let Some(pvd) = state
+ .per_candidate
+ .get(&candidate_hash)
+ .map(|pc| pc.persisted_validation_data.clone())
+ {
+ kick_off_validation_work(
+ ctx,
+ rp_state,
+ pvd,
+ &state.background_validation_tx,
+ attesting,
+ )
+ .await?;
+ }
}
+ Ok(())
+}
- /// Import the statement and kick off validation work if it is a part of our assignment.
- async fn maybe_validate_and_import(
- &mut self,
- root_span: &jaeger::Span,
- ctx: &mut Context,
- statement: SignedFullStatement,
- ) -> Result<(), Error> {
- if let Some(summary) = self.import_statement(ctx, &statement, root_span)? {
- if Some(summary.group_id) != self.assignment {
- return Ok(())
- }
- let (attesting, span) = match statement.payload() {
- Statement::Seconded(receipt) => {
- let candidate_hash = summary.candidate;
-
- let span = self.get_unbacked_validation_child(
- root_span,
- summary.candidate,
- summary.group_id,
- );
+/// Kick off background validation with intent to second.
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn validate_and_second(
+ ctx: &mut Context,
+ rp_state: &mut PerRelayParentState,
+ persisted_validation_data: PersistedValidationData,
+ candidate: &CandidateReceipt,
+ pov: Arc,
+ background_validation_tx: &mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
+) -> Result<(), Error> {
+ let candidate_hash = candidate.hash();
+
+ gum::debug!(
+ target: LOG_TARGET,
+ candidate_hash = ?candidate_hash,
+ candidate_receipt = ?candidate,
+ "Validate and second candidate",
+ );
+
+ let bg_sender = ctx.sender().clone();
+ background_validate_and_make_available(
+ ctx,
+ rp_state,
+ BackgroundValidationParams {
+ sender: bg_sender,
+ tx_command: background_validation_tx.clone(),
+ candidate: candidate.clone(),
+ relay_parent: rp_state.parent,
+ persisted_validation_data,
+ pov: PoVData::Ready(pov),
+ n_validators: rp_state.table_context.validators.len(),
+ make_command: ValidatedCandidateCommand::Second,
+ },
+ )
+ .await?;
- let attesting = AttestingData {
- candidate: self
- .table
- .get_candidate(&candidate_hash)
- .ok_or(Error::CandidateNotFound)?
- .to_plain(),
- pov_hash: receipt.descriptor.pov_hash,
- from_validator: statement.validator_index(),
- backing: Vec::new(),
- };
- let child = span.as_ref().map(|s| s.child("try"));
- self.fallbacks.insert(summary.candidate, (attesting.clone(), span));
- (attesting, child)
- },
- Statement::Valid(candidate_hash) => {
- if let Some((attesting, span)) = self.fallbacks.get_mut(candidate_hash) {
- let our_index = self.table_context.validator.as_ref().map(|v| v.index());
- if our_index == Some(statement.validator_index()) {
- return Ok(())
- }
+ Ok(())
+}
- if self.awaiting_validation.contains(candidate_hash) {
- // Job already running:
- attesting.backing.push(statement.validator_index());
- return Ok(())
- } else {
- // No job, so start another with current validator:
- attesting.from_validator = statement.validator_index();
- (attesting.clone(), span.as_ref().map(|s| s.child("try")))
- }
- } else {
- return Ok(())
- }
- },
- };
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn handle_second_message(
+ ctx: &mut Context,
+ state: &mut State,
+ candidate: CandidateReceipt,
+ persisted_validation_data: PersistedValidationData,
+ pov: PoV,
+ metrics: &Metrics,
+) -> Result<(), Error> {
+ let _timer = metrics.time_process_second();
- self.kick_off_validation_work(ctx, attesting, span).await?;
- }
- Ok(())
+ let candidate_hash = candidate.hash();
+ let relay_parent = candidate.descriptor().relay_parent;
+
+ if candidate.descriptor().persisted_validation_data_hash != persisted_validation_data.hash() {
+ gum::warn!(
+ target: LOG_TARGET,
+ ?candidate_hash,
+ "Candidate backing was asked to second candidate with wrong PVD",
+ );
+
+ return Ok(())
}
- fn sign_statement(&mut self, statement: Statement) -> Option {
- let signed = self
- .table_context
- .validator
- .as_ref()?
- .sign(self.keystore.clone(), statement)
- .ok()
- .flatten()?;
- self.metrics.on_statement_signed();
- Some(signed)
+ let rp_state = match state.per_relay_parent.get_mut(&relay_parent) {
+ None => {
+ gum::trace!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ ?candidate_hash,
+ "We were asked to second a candidate outside of our view."
+ );
+
+ return Ok(())
+ },
+ Some(r) => r,
+ };
+
+ // Sanity check that candidate is from our assignment.
+ if Some(candidate.descriptor().para_id) != rp_state.assignment {
+ gum::debug!(
+ target: LOG_TARGET,
+ our_assignment = ?rp_state.assignment,
+ collation = ?candidate.descriptor().para_id,
+ "Subsystem asked to second for para outside of our assignment",
+ );
+
+ return Ok(())
}
- /// Insert or get the unbacked-span for the given candidate hash.
- fn insert_or_get_unbacked_span(
- &mut self,
- parent_span: &jaeger::Span,
- hash: CandidateHash,
- para_id: Option,
- ) -> Option<&jaeger::Span> {
- if !self.backed.contains(&hash) {
- // only add if we don't consider this backed.
- let span = self.unbacked_candidates.entry(hash).or_insert_with(|| {
- let s = parent_span.child("unbacked-candidate").with_candidate(hash);
- if let Some(para_id) = para_id {
- s.with_para_id(para_id)
- } else {
- s
- }
- });
- Some(span)
- } else {
- None
- }
+ // If the message is a `CandidateBackingMessage::Second`, sign and dispatch a
+ // Seconded statement only if we have not signed a Valid statement for the requested candidate.
+ //
+ // The actual logic of issuing the signed statement checks that this isn't
+ // conflicting with other seconded candidates. Not doing that check here
+ // gives other subsystems the ability to get us to execute arbitrary candidates,
+ // but no more.
+ if !rp_state.issued_statements.contains(&candidate_hash) {
+ let pov = Arc::new(pov);
+
+ validate_and_second(
+ ctx,
+ rp_state,
+ persisted_validation_data,
+ &candidate,
+ pov,
+ &state.background_validation_tx,
+ )
+ .await?;
}
- fn get_unbacked_validation_child(
- &mut self,
- parent_span: &jaeger::Span,
- hash: CandidateHash,
- para_id: ParaId,
- ) -> Option {
- self.insert_or_get_unbacked_span(parent_span, hash, Some(para_id)).map(|span| {
- span.child("validation")
- .with_candidate(hash)
- .with_stage(Stage::CandidateBacking)
- })
+ Ok(())
+}
+
+#[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
+async fn handle_statement_message(
+ ctx: &mut Context,
+ state: &mut State,
+ relay_parent: Hash,
+ statement: SignedFullStatementWithPVD,
+ metrics: &Metrics,
+) -> Result<(), Error> {
+ let _timer = metrics.time_process_statement();
+
+ match maybe_validate_and_import(ctx, state, relay_parent, statement).await {
+ Err(Error::ValidationFailed(_)) => Ok(()),
+ Err(e) => Err(e),
+ Ok(()) => Ok(()),
}
+}
- fn get_unbacked_statement_child(
- &mut self,
- parent_span: &jaeger::Span,
- hash: CandidateHash,
- validator: ValidatorIndex,
- ) -> Option {
- self.insert_or_get_unbacked_span(parent_span, hash, None).map(|span| {
- span.child("import-statement")
- .with_candidate(hash)
- .with_validator_index(validator)
+fn handle_get_backed_candidates_message(
+ state: &State,
+ requested_candidates: Vec<(CandidateHash, Hash)>,
+ tx: oneshot::Sender>,
+ metrics: &Metrics,
+) -> Result<(), Error> {
+ let _timer = metrics.time_get_backed_candidates();
+
+ let backed = requested_candidates
+ .into_iter()
+ .filter_map(|(candidate_hash, relay_parent)| {
+ let rp_state = match state.per_relay_parent.get(&relay_parent) {
+ Some(rp_state) => rp_state,
+ None => {
+ gum::debug!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ ?candidate_hash,
+ "Requested candidate's relay parent is out of view",
+ );
+ return None
+ },
+ };
+ rp_state
+ .table
+ .attested_candidate(&candidate_hash, &rp_state.table_context)
+ .and_then(|attested| table_attested_to_backed(attested, &rp_state.table_context))
})
- }
+ .collect();
- fn remove_unbacked_span(&mut self, hash: &CandidateHash) -> Option {
- self.unbacked_candidates.remove(hash)
- }
+ tx.send(backed).map_err(|data| Error::Send(data))?;
+ Ok(())
}
diff --git a/node/core/backing/src/metrics.rs b/node/core/backing/src/metrics.rs
index 8468ea005404..77f0e7f9d92a 100644
--- a/node/core/backing/src/metrics.rs
+++ b/node/core/backing/src/metrics.rs
@@ -54,7 +54,8 @@ impl Metrics {
self.0.as_ref().map(|metrics| metrics.process_statement.start_timer())
}
- /// Provide a timer for handling `CandidateBackingMessage::GetBackedCandidates` which observes on drop.
+ /// Provide a timer for handling `CandidateBackingMessage::GetBackedCandidates` which observes
+ /// on drop.
pub fn time_get_backed_candidates(
&self,
) -> Option {
diff --git a/node/core/backing/src/tests.rs b/node/core/backing/src/tests/mod.rs
similarity index 67%
rename from node/core/backing/src/tests.rs
rename to node/core/backing/src/tests/mod.rs
index 35c83297fa71..054337669c07 100644
--- a/node/core/backing/src/tests.rs
+++ b/node/core/backing/src/tests/mod.rs
@@ -17,22 +17,24 @@
use super::*;
use ::test_helpers::{
dummy_candidate_receipt_bad_sig, dummy_collator, dummy_collator_signature,
- dummy_committed_candidate_receipt, dummy_hash, dummy_validation_code,
+ dummy_committed_candidate_receipt, dummy_hash,
};
use assert_matches::assert_matches;
use futures::{future, Future};
-use polkadot_node_primitives::{BlockData, InvalidCandidate};
+use polkadot_node_primitives::{BlockData, InvalidCandidate, SignedFullStatement, Statement};
use polkadot_node_subsystem::{
+ errors::RuntimeApiError,
+ jaeger,
messages::{
AllMessages, CollatorProtocolMessage, RuntimeApiMessage, RuntimeApiRequest,
ValidationFailed,
},
- ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal,
+ ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal, TimeoutExt,
};
use polkadot_node_subsystem_test_helpers as test_helpers;
use polkadot_primitives::{
- CandidateDescriptor, CollatorId, GroupRotationInfo, HeadData, PersistedValidationData,
- PvfExecTimeoutKind, ScheduledCore,
+ CandidateDescriptor, GroupRotationInfo, HeadData, PersistedValidationData, PvfExecTimeoutKind,
+ ScheduledCore, SessionIndex,
};
use sp_application_crypto::AppCrypto;
use sp_keyring::Sr25519Keyring;
@@ -41,6 +43,11 @@ use sp_tracing as _;
use statement_table::v2::Misbehavior;
use std::collections::HashMap;
+mod prospective_parachains;
+
+const ASYNC_BACKING_DISABLED_ERROR: RuntimeApiError =
+ RuntimeApiError::NotSupported { runtime_api_name: "test-runtime" };
+
fn validator_pubkeys(val_ids: &[Sr25519Keyring]) -> Vec {
val_ids.iter().map(|v| v.public().into()).collect()
}
@@ -53,6 +60,15 @@ fn table_statement_to_primitive(statement: TableStatement) -> Statement {
}
}
+fn dummy_pvd() -> PersistedValidationData {
+ PersistedValidationData {
+ parent_head: HeadData(vec![7, 8, 9]),
+ relay_parent_number: 0_u32.into(),
+ max_pov_size: 1024,
+ relay_parent_storage_root: dummy_hash(),
+ }
+}
+
struct TestState {
chain_ids: Vec,
keystore: KeystorePtr,
@@ -66,13 +82,18 @@ struct TestState {
relay_parent: Hash,
}
+impl TestState {
+ fn session(&self) -> SessionIndex {
+ self.signing_context.session_index
+ }
+}
+
impl Default for TestState {
fn default() -> Self {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
- let thread_a = ParaId::from(3);
- let chain_ids = vec![chain_a, chain_b, thread_a];
+ let chain_ids = vec![chain_a, chain_b];
let validators = vec![
Sr25519Keyring::Alice,
@@ -84,31 +105,28 @@ impl Default for TestState {
];
let keystore = Arc::new(sc_keystore::LocalKeystore::in_memory());
- // Make sure `Alice` key is in the keystore, so this mocked node will be a parachain validator.
+ // Make sure `Alice` key is in the keystore, so this mocked node will be a parachain
+ // validator.
Keystore::sr25519_generate_new(&*keystore, ValidatorId::ID, Some(&validators[0].to_seed()))
.expect("Insert key into keystore");
let validator_public = validator_pubkeys(&validators);
- let validator_groups = vec![vec![2, 0, 3, 5], vec![1], vec![4]]
+ let validator_groups = vec![vec![2, 0, 3, 5], vec![1]]
.into_iter()
.map(|g| g.into_iter().map(ValidatorIndex).collect())
.collect();
let group_rotation_info =
GroupRotationInfo { session_start_block: 0, group_rotation_frequency: 100, now: 1 };
- let thread_collator: CollatorId = Sr25519Keyring::Two.public().into();
let availability_cores = vec![
CoreState::Scheduled(ScheduledCore { para_id: chain_a, collator: None }),
CoreState::Scheduled(ScheduledCore { para_id: chain_b, collator: None }),
- CoreState::Scheduled(ScheduledCore {
- para_id: thread_a,
- collator: Some(thread_collator.clone()),
- }),
];
let mut head_data = HashMap::new();
head_data.insert(chain_a, HeadData(vec![4, 5, 6]));
+ head_data.insert(chain_b, HeadData(vec![5, 6, 7]));
let relay_parent = Hash::repeat_byte(5);
@@ -165,21 +183,22 @@ fn test_harness>(
));
}
-fn make_erasure_root(test: &TestState, pov: PoV) -> Hash {
- let available_data =
- AvailableData { validation_data: test.validation_data.clone(), pov: Arc::new(pov) };
+fn make_erasure_root(test: &TestState, pov: PoV, validation_data: PersistedValidationData) -> Hash {
+ let available_data = AvailableData { validation_data, pov: Arc::new(pov) };
let chunks = erasure_coding::obtain_chunks_v1(test.validators.len(), &available_data).unwrap();
erasure_coding::branches(&chunks).root()
}
-#[derive(Default)]
+#[derive(Default, Clone)]
struct TestCandidateBuilder {
para_id: ParaId,
head_data: HeadData,
pov_hash: Hash,
relay_parent: Hash,
erasure_root: Hash,
+ persisted_validation_data_hash: Hash,
+ validation_code: Vec,
}
impl TestCandidateBuilder {
@@ -192,9 +211,9 @@ impl TestCandidateBuilder {
erasure_root: self.erasure_root,
collator: dummy_collator(),
signature: dummy_collator_signature(),
- para_head: dummy_hash(),
- validation_code_hash: dummy_validation_code().hash(),
- persisted_validation_data_hash: dummy_hash(),
+ para_head: self.head_data.hash(),
+ validation_code_hash: ValidationCode(self.validation_code).hash(),
+ persisted_validation_data_hash: self.persisted_validation_data_hash,
},
commitments: CandidateCommitments {
head_data: self.head_data,
@@ -222,6 +241,15 @@ async fn test_startup(virtual_overseer: &mut VirtualOverseer, test_state: &TestS
))))
.await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+ ) if parent == test_state.relay_parent => {
+ tx.send(Err(ASYNC_BACKING_DISABLED_ERROR)).unwrap();
+ }
+ );
+
// Check that subsystem job issues a request for a validator set.
assert_matches!(
virtual_overseer.recv().await,
@@ -272,6 +300,8 @@ fn backing_second_works() {
test_startup(&mut virtual_overseer, &test_state).await;
let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
@@ -281,39 +311,59 @@ fn backing_second_works() {
relay_parent: test_state.relay_parent,
pov_hash,
head_data: expected_head_data.clone(),
- erasure_root: make_erasure_root(&test_state, pov.clone()),
- ..Default::default()
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
}
.build();
let second = CandidateBackingMessage::Second(
test_state.relay_parent,
candidate.to_plain(),
+ pvd.clone(),
pov.clone(),
);
virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
candidate_receipt,
- pov,
+ _pov,
timeout,
tx,
- )
- ) if pov == pov && &candidate_receipt.descriptor == candidate.descriptor() && timeout == PvfExecTimeoutKind::Backing && candidate.commitments.hash() == candidate_receipt.commitments_hash => {
- tx.send(Ok(
- ValidationResult::Valid(CandidateCommitments {
+ ),
+ ) if _pvd == pvd &&
+ _validation_code == validation_code &&
+ *_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate.commitments.hash() == candidate_receipt.commitments_hash =>
+ {
+ tx.send(Ok(ValidationResult::Valid(
+ CandidateCommitments {
head_data: expected_head_data.clone(),
horizontal_messages: Default::default(),
upward_messages: Default::default(),
new_validation_code: None,
processed_downward_messages: 0,
hrmp_watermark: 0,
- }, test_state.validation_data.clone()),
- )).unwrap();
+ },
+ test_state.validation_data.clone(),
+ )))
+ .unwrap();
}
);
@@ -361,6 +411,8 @@ fn backing_works() {
test_startup(&mut virtual_overseer, &test_state).await;
let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
let pov_hash = pov.hash();
@@ -371,7 +423,8 @@ fn backing_works() {
relay_parent: test_state.relay_parent,
pov_hash,
head_data: expected_head_data.clone(),
- erasure_root: make_erasure_root(&test_state, pov.clone()),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ validation_code: validation_code.0.clone(),
..Default::default()
}
.build();
@@ -392,9 +445,9 @@ fn backing_works() {
)
.expect("Insert key into keystore");
- let signed_a = SignedFullStatement::sign(
+ let signed_a = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Seconded(candidate_a.clone()),
+ StatementWithPVD::Seconded(candidate_a.clone(), pvd.clone()),
&test_state.signing_context,
ValidatorIndex(2),
&public2.into(),
@@ -403,9 +456,9 @@ fn backing_works() {
.flatten()
.expect("should be signed");
- let signed_b = SignedFullStatement::sign(
+ let signed_b = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Valid(candidate_a_hash),
+ StatementWithPVD::Valid(candidate_a_hash),
&test_state.signing_context,
ValidatorIndex(5),
&public1.into(),
@@ -419,6 +472,15 @@ fn backing_works() {
virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
// Sending a `Statement::Seconded` for our assignment will start
// validation process. The first thing requested is the PoV.
assert_matches!(
@@ -439,13 +501,20 @@ fn backing_works() {
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- c,
- pov,
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
timeout,
tx,
- )
- ) if pov == pov && c.descriptor() == candidate_a.descriptor() && timeout == PvfExecTimeoutKind::Backing && c.commitments_hash == candidate_a_commitments_hash=> {
+ ),
+ ) if _pvd == pvd &&
+ _validation_code == validation_code &&
+ *_pov == pov && &candidate_receipt.descriptor == candidate_a.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate_a_commitments_hash == candidate_receipt.commitments_hash =>
+ {
tx.send(Ok(
ValidationResult::Valid(CandidateCommitments {
head_data: expected_head_data.clone(),
@@ -470,22 +539,22 @@ fn backing_works() {
assert_matches!(
virtual_overseer.recv().await,
- AllMessages::Provisioner(
- ProvisionerMessage::ProvisionableData(
- _,
- ProvisionableData::BackedCandidate(candidate_receipt)
- )
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(hash, _stmt)
) => {
- assert_eq!(candidate_receipt, candidate_a.to_plain());
+ assert_eq!(test_state.relay_parent, hash);
}
);
assert_matches!(
virtual_overseer.recv().await,
- AllMessages::StatementDistribution(
- StatementDistributionMessage::Share(hash, _stmt)
+ AllMessages::Provisioner(
+ ProvisionerMessage::ProvisionableData(
+ _,
+ ProvisionableData::BackedCandidate(candidate_receipt)
+ )
) => {
- assert_eq!(test_state.relay_parent, hash);
+ assert_eq!(candidate_receipt, candidate_a.to_plain());
}
);
@@ -510,6 +579,8 @@ fn backing_works_while_validation_ongoing() {
test_startup(&mut virtual_overseer, &test_state).await;
let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
let pov_hash = pov.hash();
@@ -520,7 +591,8 @@ fn backing_works_while_validation_ongoing() {
relay_parent: test_state.relay_parent,
pov_hash,
head_data: expected_head_data.clone(),
- erasure_root: make_erasure_root(&test_state, pov.clone()),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ validation_code: validation_code.0.clone(),
..Default::default()
}
.build();
@@ -547,9 +619,9 @@ fn backing_works_while_validation_ongoing() {
)
.expect("Insert key into keystore");
- let signed_a = SignedFullStatement::sign(
+ let signed_a = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Seconded(candidate_a.clone()),
+ StatementWithPVD::Seconded(candidate_a.clone(), pvd.clone()),
&test_state.signing_context,
ValidatorIndex(2),
&public2.into(),
@@ -558,9 +630,9 @@ fn backing_works_while_validation_ongoing() {
.flatten()
.expect("should be signed");
- let signed_b = SignedFullStatement::sign(
+ let signed_b = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Valid(candidate_a_hash),
+ StatementWithPVD::Valid(candidate_a_hash),
&test_state.signing_context,
ValidatorIndex(5),
&public1.into(),
@@ -569,9 +641,9 @@ fn backing_works_while_validation_ongoing() {
.flatten()
.expect("should be signed");
- let signed_c = SignedFullStatement::sign(
+ let signed_c = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Valid(candidate_a_hash),
+ StatementWithPVD::Valid(candidate_a_hash),
&test_state.signing_context,
ValidatorIndex(3),
&public3.into(),
@@ -584,6 +656,15 @@ fn backing_works_while_validation_ongoing() {
CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
// Sending a `Statement::Seconded` for our assignment will start
// validation process. The first thing requested is PoV from the
// `PoVDistribution`.
@@ -605,13 +686,20 @@ fn backing_works_while_validation_ongoing() {
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- c,
- pov,
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
timeout,
tx,
- )
- ) if pov == pov && c.descriptor() == candidate_a.descriptor() && timeout == PvfExecTimeoutKind::Backing && candidate_a_commitments_hash == c.commitments_hash => {
+ ),
+ ) if _pvd == pvd &&
+ _validation_code == validation_code &&
+ *_pov == pov && &candidate_receipt.descriptor == candidate_a.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate_a_commitments_hash == candidate_receipt.commitments_hash =>
+ {
// we never validate the candidate. our local node
// shouldn't issue any statements.
std::mem::forget(tx);
@@ -644,8 +732,7 @@ fn backing_works_while_validation_ongoing() {
let (tx, rx) = oneshot::channel();
let msg = CandidateBackingMessage::GetBackedCandidates(
- test_state.relay_parent,
- vec![candidate_a.hash()],
+ vec![(candidate_a.hash(), test_state.relay_parent)],
tx,
);
@@ -689,6 +776,8 @@ fn backing_misbehavior_works() {
let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
let pov_hash = pov.hash();
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
@@ -696,8 +785,9 @@ fn backing_misbehavior_works() {
para_id: test_state.chain_ids[0],
relay_parent: test_state.relay_parent,
pov_hash,
- erasure_root: make_erasure_root(&test_state, pov.clone()),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
head_data: expected_head_data.clone(),
+ validation_code: validation_code.0.clone(),
..Default::default()
}
.build();
@@ -711,9 +801,9 @@ fn backing_misbehavior_works() {
Some(&test_state.validators[2].to_seed()),
)
.expect("Insert key into keystore");
- let seconded_2 = SignedFullStatement::sign(
+ let seconded_2 = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Seconded(candidate_a.clone()),
+ StatementWithPVD::Seconded(candidate_a.clone(), pvd.clone()),
&test_state.signing_context,
ValidatorIndex(2),
&public2.into(),
@@ -722,9 +812,9 @@ fn backing_misbehavior_works() {
.flatten()
.expect("should be signed");
- let valid_2 = SignedFullStatement::sign(
+ let valid_2 = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Valid(candidate_a_hash),
+ StatementWithPVD::Valid(candidate_a_hash),
&test_state.signing_context,
ValidatorIndex(2),
&public2.into(),
@@ -738,6 +828,15 @@ fn backing_misbehavior_works() {
virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
assert_matches!(
virtual_overseer.recv().await,
AllMessages::AvailabilityDistribution(
@@ -754,13 +853,20 @@ fn backing_misbehavior_works() {
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- c,
- pov,
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
timeout,
tx,
- )
- ) if pov == pov && c.descriptor() == candidate_a.descriptor() && timeout == PvfExecTimeoutKind::Backing && candidate_a_commitments_hash == c.commitments_hash => {
+ ),
+ ) if _pvd == pvd &&
+ _validation_code == validation_code &&
+ *_pov == pov && &candidate_receipt.descriptor == candidate_a.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate_a_commitments_hash == candidate_receipt.commitments_hash =>
+ {
tx.send(Ok(
ValidationResult::Valid(CandidateCommitments {
head_data: expected_head_data.clone(),
@@ -783,6 +889,18 @@ fn backing_misbehavior_works() {
}
);
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(
+ relay_parent,
+ signed_statement,
+ )
+ ) if relay_parent == test_state.relay_parent => {
+ assert_eq!(*signed_statement.payload(), StatementWithPVD::Valid(candidate_a_hash));
+ }
+ );
+
assert_matches!(
virtual_overseer.recv().await,
AllMessages::Provisioner(
@@ -796,18 +914,6 @@ fn backing_misbehavior_works() {
) if descriptor == candidate_a.descriptor
);
- assert_matches!(
- virtual_overseer.recv().await,
- AllMessages::StatementDistribution(
- StatementDistributionMessage::Share(
- relay_parent,
- signed_statement,
- )
- ) if relay_parent == test_state.relay_parent => {
- assert_eq!(*signed_statement.payload(), Statement::Valid(candidate_a_hash));
- }
- );
-
// This `Valid` statement is redundant after the `Seconded` statement already sent.
let statement =
CandidateBackingMessage::Statement(test_state.relay_parent, valid_2.clone());
@@ -860,8 +966,17 @@ fn backing_dont_second_invalid() {
test_startup(&mut virtual_overseer, &test_state).await;
let pov_block_a = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd_a = dummy_pvd();
+ let validation_code_a = ValidationCode(vec![1, 2, 3]);
let pov_block_b = PoV { block_data: BlockData(vec![45, 46, 47]) };
+ let pvd_b = {
+ let mut pvd_b = pvd_a.clone();
+ pvd_b.parent_head = HeadData(vec![14, 15, 16]);
+ pvd_b.max_pov_size = pvd_a.max_pov_size / 2;
+ pvd_b
+ };
+ let validation_code_b = ValidationCode(vec![4, 5, 6]);
let pov_hash_a = pov_block_a.hash();
let pov_hash_b = pov_block_b.hash();
@@ -872,7 +987,9 @@ fn backing_dont_second_invalid() {
para_id: test_state.chain_ids[0],
relay_parent: test_state.relay_parent,
pov_hash: pov_hash_a,
- erasure_root: make_erasure_root(&test_state, pov_block_a.clone()),
+ erasure_root: make_erasure_root(&test_state, pov_block_a.clone(), pvd_a.clone()),
+ persisted_validation_data_hash: pvd_a.hash(),
+ validation_code: validation_code_a.0.clone(),
..Default::default()
}
.build();
@@ -881,30 +998,48 @@ fn backing_dont_second_invalid() {
para_id: test_state.chain_ids[0],
relay_parent: test_state.relay_parent,
pov_hash: pov_hash_b,
- erasure_root: make_erasure_root(&test_state, pov_block_b.clone()),
+ erasure_root: make_erasure_root(&test_state, pov_block_b.clone(), pvd_b.clone()),
head_data: expected_head_data.clone(),
- ..Default::default()
+ persisted_validation_data_hash: pvd_b.hash(),
+ validation_code: validation_code_b.0.clone(),
}
.build();
let second = CandidateBackingMessage::Second(
test_state.relay_parent,
candidate_a.to_plain(),
+ pvd_a.clone(),
pov_block_a.clone(),
);
virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code_a.hash() => {
+ tx.send(Ok(Some(validation_code_a.clone()))).unwrap();
+ }
+ );
+
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- c,
- pov,
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
timeout,
tx,
- )
- ) if pov == pov && c.descriptor() == candidate_a.descriptor() && timeout == PvfExecTimeoutKind::Backing => {
+ ),
+ ) if _pvd == pvd_a &&
+ _validation_code == validation_code_a &&
+ *_pov == pov_block_a && &candidate_receipt.descriptor == candidate_a.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate_a.commitments.hash() == candidate_receipt.commitments_hash =>
+ {
tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::BadReturn))).unwrap();
}
);
@@ -919,21 +1054,38 @@ fn backing_dont_second_invalid() {
let second = CandidateBackingMessage::Second(
test_state.relay_parent,
candidate_b.to_plain(),
+ pvd_b.clone(),
pov_block_b.clone(),
);
virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code_b.hash() => {
+ tx.send(Ok(Some(validation_code_b.clone()))).unwrap();
+ }
+ );
+
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- c,
- pov,
+ CandidateValidationMessage::ValidateFromExhaustive(
+ pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
timeout,
tx,
- )
- ) if pov == pov && c.descriptor() == candidate_b.descriptor() && timeout == PvfExecTimeoutKind::Backing => {
+ ),
+ ) if pvd == pvd_b &&
+ _validation_code == validation_code_b &&
+ *_pov == pov_block_b && &candidate_receipt.descriptor == candidate_b.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate_b.commitments.hash() == candidate_receipt.commitments_hash =>
+ {
tx.send(Ok(
ValidationResult::Valid(CandidateCommitments {
head_data: expected_head_data.clone(),
@@ -942,7 +1094,7 @@ fn backing_dont_second_invalid() {
new_validation_code: None,
processed_downward_messages: 0,
hrmp_watermark: 0,
- }, test_state.validation_data.clone()),
+ }, pvd_b.clone()),
)).unwrap();
}
);
@@ -964,7 +1116,7 @@ fn backing_dont_second_invalid() {
signed_statement,
)
) if parent_hash == test_state.relay_parent => {
- assert_eq!(*signed_statement.payload(), Statement::Seconded(candidate_b));
+ assert_eq!(*signed_statement.payload(), StatementWithPVD::Seconded(candidate_b, pvd_b.clone()));
}
);
@@ -986,6 +1138,8 @@ fn backing_second_after_first_fails_works() {
test_startup(&mut virtual_overseer, &test_state).await;
let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
let pov_hash = pov.hash();
@@ -993,7 +1147,9 @@ fn backing_second_after_first_fails_works() {
para_id: test_state.chain_ids[0],
relay_parent: test_state.relay_parent,
pov_hash,
- erasure_root: make_erasure_root(&test_state, pov.clone()),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
..Default::default()
}
.build();
@@ -1005,9 +1161,9 @@ fn backing_second_after_first_fails_works() {
)
.expect("Insert key into keystore");
- let signed_a = SignedFullStatement::sign(
+ let signed_a = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Seconded(candidate.clone()),
+ StatementWithPVD::Seconded(candidate.clone(), pvd.clone()),
&test_state.signing_context,
ValidatorIndex(2),
&validator2.into(),
@@ -1022,6 +1178,15 @@ fn backing_second_after_first_fails_works() {
virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
// Subsystem requests PoV and requests validation.
assert_matches!(
virtual_overseer.recv().await,
@@ -1040,13 +1205,20 @@ fn backing_second_after_first_fails_works() {
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- c,
- pov,
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
timeout,
tx,
- )
- ) if pov == pov && c.descriptor() == candidate.descriptor() && timeout == PvfExecTimeoutKind::Backing && c.commitments_hash == candidate.commitments.hash() => {
+ ),
+ ) if _pvd == pvd &&
+ _validation_code == validation_code &&
+ *_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate.commitments.hash() == candidate_receipt.commitments_hash =>
+ {
tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::BadReturn))).unwrap();
}
);
@@ -1056,12 +1228,15 @@ fn backing_second_after_first_fails_works() {
let second = CandidateBackingMessage::Second(
test_state.relay_parent,
candidate.to_plain(),
+ pvd.clone(),
pov.clone(),
);
virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
let pov_to_second = PoV { block_data: BlockData(vec![3, 2, 1]) };
+ let pvd_to_second = dummy_pvd();
+ let validation_code_to_second = ValidationCode(vec![5, 6, 7]);
let pov_hash = pov_to_second.hash();
@@ -1069,7 +1244,13 @@ fn backing_second_after_first_fails_works() {
para_id: test_state.chain_ids[0],
relay_parent: test_state.relay_parent,
pov_hash,
- erasure_root: make_erasure_root(&test_state, pov_to_second.clone()),
+ erasure_root: make_erasure_root(
+ &test_state,
+ pov_to_second.clone(),
+ pvd_to_second.clone(),
+ ),
+ persisted_validation_data_hash: pvd_to_second.hash(),
+ validation_code: validation_code_to_second.0.clone(),
..Default::default()
}
.build();
@@ -1077,6 +1258,7 @@ fn backing_second_after_first_fails_works() {
let second = CandidateBackingMessage::Second(
test_state.relay_parent,
candidate_to_second.to_plain(),
+ pvd_to_second.clone(),
pov_to_second.clone(),
);
@@ -1085,15 +1267,19 @@ fn backing_second_after_first_fails_works() {
// triggered on the prev step.
virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code_to_second.hash() => {
+ tx.send(Ok(Some(validation_code_to_second.clone()))).unwrap();
+ }
+ );
+
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- _,
- pov,
- _,
- _,
- )
+ CandidateValidationMessage::ValidateFromExhaustive(_, _, _, pov, ..),
) => {
assert_eq!(&*pov, &pov_to_second);
}
@@ -1111,6 +1297,8 @@ fn backing_works_after_failed_validation() {
test_startup(&mut virtual_overseer, &test_state).await;
let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
let pov_hash = pov.hash();
@@ -1118,7 +1306,8 @@ fn backing_works_after_failed_validation() {
para_id: test_state.chain_ids[0],
relay_parent: test_state.relay_parent,
pov_hash,
- erasure_root: make_erasure_root(&test_state, pov.clone()),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ validation_code: validation_code.0.clone(),
..Default::default()
}
.build();
@@ -1129,9 +1318,9 @@ fn backing_works_after_failed_validation() {
Some(&test_state.validators[2].to_seed()),
)
.expect("Insert key into keystore");
- let signed_a = SignedFullStatement::sign(
+ let signed_a = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Seconded(candidate.clone()),
+ StatementWithPVD::Seconded(candidate.clone(), pvd.clone()),
&test_state.signing_context,
ValidatorIndex(2),
&public2.into(),
@@ -1146,6 +1335,15 @@ fn backing_works_after_failed_validation() {
virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
// Subsystem requests PoV and requests validation.
assert_matches!(
virtual_overseer.recv().await,
@@ -1164,13 +1362,20 @@ fn backing_works_after_failed_validation() {
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- c,
- pov,
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
timeout,
tx,
- )
- ) if pov == pov && c.descriptor() == candidate.descriptor() && timeout == PvfExecTimeoutKind::Backing && c.commitments_hash == candidate.commitments.hash() => {
+ ),
+ ) if _pvd == pvd &&
+ _validation_code == validation_code &&
+ *_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate.commitments.hash() == candidate_receipt.commitments_hash =>
+ {
tx.send(Err(ValidationFailed("Internal test error".into()))).unwrap();
}
);
@@ -1179,8 +1384,7 @@ fn backing_works_after_failed_validation() {
// and check that it is still alive.
let (tx, rx) = oneshot::channel();
let msg = CandidateBackingMessage::GetBackedCandidates(
- test_state.relay_parent,
- vec![candidate.hash()],
+ vec![(candidate.hash(), test_state.relay_parent)],
tx,
);
@@ -1190,118 +1394,6 @@ fn backing_works_after_failed_validation() {
});
}
-// Test that a `CandidateBackingMessage::Second` issues validation work
-// and in case validation is successful issues a `StatementDistributionMessage`.
-#[test]
-fn backing_doesnt_second_wrong_collator() {
- let mut test_state = TestState::default();
- test_state.availability_cores[0] = CoreState::Scheduled(ScheduledCore {
- para_id: ParaId::from(1),
- collator: Some(Sr25519Keyring::Bob.public().into()),
- });
-
- test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
- test_startup(&mut virtual_overseer, &test_state).await;
-
- let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
-
- let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
-
- let pov_hash = pov.hash();
- let candidate = TestCandidateBuilder {
- para_id: test_state.chain_ids[0],
- relay_parent: test_state.relay_parent,
- pov_hash,
- head_data: expected_head_data.clone(),
- erasure_root: make_erasure_root(&test_state, pov.clone()),
- ..Default::default()
- }
- .build();
-
- let second = CandidateBackingMessage::Second(
- test_state.relay_parent,
- candidate.to_plain(),
- pov.clone(),
- );
-
- virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
-
- assert_matches!(
- virtual_overseer.recv().await,
- AllMessages::CollatorProtocol(
- CollatorProtocolMessage::Invalid(parent, c)
- ) if parent == test_state.relay_parent && c == candidate.to_plain() => {
- }
- );
-
- virtual_overseer
- .send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
- ActiveLeavesUpdate::stop_work(test_state.relay_parent),
- )))
- .await;
- virtual_overseer
- });
-}
-
-#[test]
-fn validation_work_ignores_wrong_collator() {
- let mut test_state = TestState::default();
- test_state.availability_cores[0] = CoreState::Scheduled(ScheduledCore {
- para_id: ParaId::from(1),
- collator: Some(Sr25519Keyring::Bob.public().into()),
- });
-
- test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
- test_startup(&mut virtual_overseer, &test_state).await;
-
- let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
-
- let pov_hash = pov.hash();
-
- let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
-
- let candidate_a = TestCandidateBuilder {
- para_id: test_state.chain_ids[0],
- relay_parent: test_state.relay_parent,
- pov_hash,
- head_data: expected_head_data.clone(),
- erasure_root: make_erasure_root(&test_state, pov.clone()),
- ..Default::default()
- }
- .build();
-
- let public2 = Keystore::sr25519_generate_new(
- &*test_state.keystore,
- ValidatorId::ID,
- Some(&test_state.validators[2].to_seed()),
- )
- .expect("Insert key into keystore");
- let seconding = SignedFullStatement::sign(
- &test_state.keystore,
- Statement::Seconded(candidate_a.clone()),
- &test_state.signing_context,
- ValidatorIndex(2),
- &public2.into(),
- )
- .ok()
- .flatten()
- .expect("should be signed");
-
- let statement =
- CandidateBackingMessage::Statement(test_state.relay_parent, seconding.clone());
-
- virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
-
- // The statement will be ignored because it has the wrong collator.
- virtual_overseer
- .send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(
- ActiveLeavesUpdate::stop_work(test_state.relay_parent),
- )))
- .await;
- virtual_overseer
- });
-}
-
#[test]
fn candidate_backing_reorders_votes() {
use sp_core::Encode;
@@ -1382,6 +1474,8 @@ fn retry_works() {
test_startup(&mut virtual_overseer, &test_state).await;
let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
let pov_hash = pov.hash();
@@ -1389,7 +1483,9 @@ fn retry_works() {
para_id: test_state.chain_ids[0],
relay_parent: test_state.relay_parent,
pov_hash,
- erasure_root: make_erasure_root(&test_state, pov.clone()),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
..Default::default()
}
.build();
@@ -1412,9 +1508,9 @@ fn retry_works() {
Some(&test_state.validators[5].to_seed()),
)
.expect("Insert key into keystore");
- let signed_a = SignedFullStatement::sign(
+ let signed_a = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Seconded(candidate.clone()),
+ StatementWithPVD::Seconded(candidate.clone(), pvd.clone()),
&test_state.signing_context,
ValidatorIndex(2),
&public2.into(),
@@ -1422,9 +1518,9 @@ fn retry_works() {
.ok()
.flatten()
.expect("should be signed");
- let signed_b = SignedFullStatement::sign(
+ let signed_b = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Valid(candidate.hash()),
+ StatementWithPVD::Valid(candidate.hash()),
&test_state.signing_context,
ValidatorIndex(3),
&public3.into(),
@@ -1432,9 +1528,9 @@ fn retry_works() {
.ok()
.flatten()
.expect("should be signed");
- let signed_c = SignedFullStatement::sign(
+ let signed_c = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Valid(candidate.hash()),
+ StatementWithPVD::Valid(candidate.hash()),
&test_state.signing_context,
ValidatorIndex(5),
&public5.into(),
@@ -1448,6 +1544,15 @@ fn retry_works() {
CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
// Subsystem requests PoV and requests validation.
// We cancel - should mean retry on next backing statement.
assert_matches!(
@@ -1468,7 +1573,7 @@ fn retry_works() {
virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
// Not deterministic which message comes first:
- for _ in 0u32..2 {
+ for _ in 0u32..3 {
match virtual_overseer.recv().await {
AllMessages::Provisioner(ProvisionerMessage::ProvisionableData(
_,
@@ -1481,6 +1586,12 @@ fn retry_works() {
) if relay_parent == test_state.relay_parent => {
std::mem::drop(tx);
},
+ AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _,
+ RuntimeApiRequest::ValidationCodeByHash(hash, tx),
+ )) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ },
msg => {
assert!(false, "Unexpected message: {:?}", msg);
},
@@ -1491,6 +1602,15 @@ fn retry_works() {
CandidateBackingMessage::Statement(test_state.relay_parent, signed_c.clone());
virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
assert_matches!(
virtual_overseer.recv().await,
AllMessages::AvailabilityDistribution(
@@ -1509,13 +1629,19 @@ fn retry_works() {
assert_matches!(
virtual_overseer.recv().await,
AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromChainState(
- c,
- pov,
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
timeout,
- _tx,
- )
- ) if pov == pov && c.descriptor() == candidate.descriptor() && timeout == PvfExecTimeoutKind::Backing && c.commitments_hash == candidate.commitments.hash()
+ ..
+ ),
+ ) if _pvd == pvd &&
+ _validation_code == validation_code &&
+ *_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate.commitments.hash() == candidate_receipt.commitments_hash
);
virtual_overseer
});
@@ -1529,6 +1655,8 @@ fn observes_backing_even_if_not_validator() {
test_startup(&mut virtual_overseer, &test_state).await;
let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
let pov_hash = pov.hash();
@@ -1539,8 +1667,9 @@ fn observes_backing_even_if_not_validator() {
relay_parent: test_state.relay_parent,
pov_hash,
head_data: expected_head_data.clone(),
- erasure_root: make_erasure_root(&test_state, pov.clone()),
- ..Default::default()
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
}
.build();
@@ -1566,9 +1695,9 @@ fn observes_backing_even_if_not_validator() {
// Produce a 3-of-5 quorum on the candidate.
- let signed_a = SignedFullStatement::sign(
+ let signed_a = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Seconded(candidate_a.clone()),
+ StatementWithPVD::Seconded(candidate_a.clone(), pvd.clone()),
&test_state.signing_context,
ValidatorIndex(0),
&public0.into(),
@@ -1577,9 +1706,9 @@ fn observes_backing_even_if_not_validator() {
.flatten()
.expect("should be signed");
- let signed_b = SignedFullStatement::sign(
+ let signed_b = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Valid(candidate_a_hash),
+ StatementWithPVD::Valid(candidate_a_hash),
&test_state.signing_context,
ValidatorIndex(5),
&public1.into(),
@@ -1588,9 +1717,9 @@ fn observes_backing_even_if_not_validator() {
.flatten()
.expect("should be signed");
- let signed_c = SignedFullStatement::sign(
+ let signed_c = SignedFullStatementWithPVD::sign(
&test_state.keystore,
- Statement::Valid(candidate_a_hash),
+ StatementWithPVD::Valid(candidate_a_hash),
&test_state.signing_context,
ValidatorIndex(2),
&public2.into(),
@@ -1634,3 +1763,232 @@ fn observes_backing_even_if_not_validator() {
virtual_overseer
});
}
+
+// Tests that it's impossible to second multiple candidates per relay parent
+// without prospective parachains.
+#[test]
+fn cannot_second_multiple_candidates_per_parent() {
+ let test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ test_startup(&mut virtual_overseer, &test_state).await;
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
+
+ let pov_hash = pov.hash();
+ let candidate_builder = TestCandidateBuilder {
+ para_id: test_state.chain_ids[0],
+ relay_parent: test_state.relay_parent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ };
+ let candidate = candidate_builder.clone().build();
+
+ let second = CandidateBackingMessage::Second(
+ test_state.relay_parent,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CandidateValidation(
+ CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
+ timeout,
+ tx,
+ ),
+ ) if _pvd == pvd &&
+ _validation_code == validation_code &&
+ *_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate.commitments.hash() == candidate_receipt.commitments_hash =>
+ {
+ tx.send(Ok(ValidationResult::Valid(
+ CandidateCommitments {
+ head_data: expected_head_data.clone(),
+ horizontal_messages: Default::default(),
+ upward_messages: Default::default(),
+ new_validation_code: None,
+ processed_downward_messages: 0,
+ hrmp_watermark: 0,
+ },
+ test_state.validation_data.clone(),
+ )))
+ .unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::AvailabilityStore(
+ AvailabilityStoreMessage::StoreAvailableData { candidate_hash, tx, .. }
+ ) if candidate_hash == candidate.hash() => {
+ tx.send(Ok(())).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(
+ parent_hash,
+ _signed_statement,
+ )
+ ) if parent_hash == test_state.relay_parent => {}
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Seconded(hash, statement)) => {
+ assert_eq!(test_state.relay_parent, hash);
+ assert_matches!(statement.payload(), Statement::Seconded(_));
+ }
+ );
+
+ // Try to second candidate with the same relay parent again.
+
+ // Make sure the candidate hash is different.
+ let validation_code = ValidationCode(vec![4, 5, 6]);
+ let mut candidate_builder = candidate_builder;
+ candidate_builder.validation_code = validation_code.0.clone();
+ let candidate = candidate_builder.build();
+
+ let second = CandidateBackingMessage::Second(
+ test_state.relay_parent,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ // The validation is still requested.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(_, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CandidateValidation(
+ CandidateValidationMessage::ValidateFromExhaustive(.., tx),
+ ) => {
+ tx.send(Ok(ValidationResult::Valid(
+ CandidateCommitments {
+ head_data: expected_head_data.clone(),
+ horizontal_messages: Default::default(),
+ upward_messages: Default::default(),
+ new_validation_code: None,
+ processed_downward_messages: 0,
+ hrmp_watermark: 0,
+ },
+ test_state.validation_data.clone(),
+ )))
+ .unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::AvailabilityStore(
+ AvailabilityStoreMessage::StoreAvailableData { candidate_hash, tx, .. }
+ ) if candidate_hash == candidate.hash() => {
+ tx.send(Ok(())).unwrap();
+ }
+ );
+
+ // Validation done, but the candidate is rejected cause of 0-depth being already occupied.
+
+ assert!(virtual_overseer
+ .recv()
+ .timeout(std::time::Duration::from_millis(50))
+ .await
+ .is_none());
+
+ virtual_overseer
+ });
+}
+
+#[test]
+fn new_leaf_view_doesnt_clobber_old() {
+ let mut test_state = TestState::default();
+ let relay_parent_2 = Hash::repeat_byte(1);
+ assert_ne!(test_state.relay_parent, relay_parent_2);
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ test_startup(&mut virtual_overseer, &test_state).await;
+
+ // New leaf that doesn't clobber old.
+ {
+ let old_relay_parent = test_state.relay_parent;
+ test_state.relay_parent = relay_parent_2;
+ test_startup(&mut virtual_overseer, &test_state).await;
+ test_state.relay_parent = old_relay_parent;
+ }
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
+
+ let pov_hash = pov.hash();
+ let candidate = TestCandidateBuilder {
+ para_id: test_state.chain_ids[0],
+ relay_parent: test_state.relay_parent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ }
+ .build();
+
+ let second = CandidateBackingMessage::Second(
+ test_state.relay_parent,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ // If the old leaf was clobbered by the first, the seconded candidate
+ // would be ignored.
+ assert!(
+ virtual_overseer
+ .recv()
+ .timeout(std::time::Duration::from_millis(500))
+ .await
+ .is_some(),
+ "first leaf appears to be inactive"
+ );
+
+ virtual_overseer
+ });
+}
diff --git a/node/core/backing/src/tests/prospective_parachains.rs b/node/core/backing/src/tests/prospective_parachains.rs
new file mode 100644
index 000000000000..7c2773c8e3b6
--- /dev/null
+++ b/node/core/backing/src/tests/prospective_parachains.rs
@@ -0,0 +1,1690 @@
+// Copyright 2022 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot. If not, see .
+
+//! Tests for the backing subsystem with enabled prospective parachains.
+
+use polkadot_node_subsystem::{
+ messages::{ChainApiMessage, FragmentTreeMembership},
+ TimeoutExt,
+};
+use polkadot_primitives::{vstaging as vstaging_primitives, BlockNumber, Header, OccupiedCore};
+
+use super::*;
+
+const ASYNC_BACKING_PARAMETERS: vstaging_primitives::AsyncBackingParams =
+ vstaging_primitives::AsyncBackingParams { max_candidate_depth: 4, allowed_ancestry_len: 3 };
+
+struct TestLeaf {
+ activated: ActivatedLeaf,
+ min_relay_parents: Vec<(ParaId, u32)>,
+}
+
+fn get_parent_hash(hash: Hash) -> Hash {
+ Hash::from_low_u64_be(hash.to_low_u64_be() + 1)
+}
+
+async fn activate_leaf(
+ virtual_overseer: &mut VirtualOverseer,
+ leaf: TestLeaf,
+ test_state: &TestState,
+ seconded_in_view: usize,
+) {
+ let TestLeaf { activated, min_relay_parents } = leaf;
+ let leaf_hash = activated.hash;
+ let leaf_number = activated.number;
+ // Start work on some new parent.
+ virtual_overseer
+ .send(FromOrchestra::Signal(OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(
+ activated,
+ ))))
+ .await;
+
+ // Prospective parachains mode is temporarily defined by the Runtime API version.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(parent, RuntimeApiRequest::StagingAsyncBackingParams(tx))
+ ) if parent == leaf_hash => {
+ tx.send(Ok(ASYNC_BACKING_PARAMETERS)).unwrap();
+ }
+ );
+
+ let min_min = *min_relay_parents
+ .iter()
+ .map(|(_, block_num)| block_num)
+ .min()
+ .unwrap_or(&leaf_number);
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::GetMinimumRelayParents(parent, tx)
+ ) if parent == leaf_hash => {
+ tx.send(min_relay_parents).unwrap();
+ }
+ );
+
+ let ancestry_len = leaf_number + 1 - min_min;
+
+ let ancestry_hashes = std::iter::successors(Some(leaf_hash), |h| Some(get_parent_hash(*h)))
+ .take(ancestry_len as usize);
+ let ancestry_numbers = (min_min..=leaf_number).rev();
+ let ancestry_iter = ancestry_hashes.zip(ancestry_numbers).peekable();
+
+ let mut next_overseer_message = None;
+ // How many blocks were actually requested.
+ let mut requested_len = 0;
+ {
+ let mut ancestry_iter = ancestry_iter.clone();
+ while let Some((hash, number)) = ancestry_iter.next() {
+ // May be `None` for the last element.
+ let parent_hash =
+ ancestry_iter.peek().map(|(h, _)| *h).unwrap_or_else(|| get_parent_hash(hash));
+
+ let msg = virtual_overseer.recv().await;
+ // It may happen that some blocks were cached by implicit view,
+ // reuse the message.
+ if !matches!(&msg, AllMessages::ChainApi(ChainApiMessage::BlockHeader(..))) {
+ next_overseer_message.replace(msg);
+ break
+ }
+
+ assert_matches!(
+ msg,
+ AllMessages::ChainApi(
+ ChainApiMessage::BlockHeader(_hash, tx)
+ ) if _hash == hash => {
+ let header = Header {
+ parent_hash,
+ number,
+ state_root: Hash::zero(),
+ extrinsics_root: Hash::zero(),
+ digest: Default::default(),
+ };
+
+ tx.send(Ok(Some(header))).unwrap();
+ }
+ );
+ requested_len += 1;
+ }
+ }
+
+ for _ in 0..seconded_in_view {
+ let msg = match next_overseer_message.take() {
+ Some(msg) => msg,
+ None => virtual_overseer.recv().await,
+ };
+ assert_matches!(
+ msg,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::GetTreeMembership(.., tx),
+ ) => {
+ tx.send(Vec::new()).unwrap();
+ }
+ );
+ }
+
+ for (hash, number) in ancestry_iter.take(requested_len) {
+ // Check that subsystem job issues a request for a validator set.
+ let msg = match next_overseer_message.take() {
+ Some(msg) => msg,
+ None => virtual_overseer.recv().await,
+ };
+ assert_matches!(
+ msg,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(parent, RuntimeApiRequest::Validators(tx))
+ ) if parent == hash => {
+ tx.send(Ok(test_state.validator_public.clone())).unwrap();
+ }
+ );
+
+ // Check that subsystem job issues a request for the validator groups.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(parent, RuntimeApiRequest::ValidatorGroups(tx))
+ ) if parent == hash => {
+ let (validator_groups, mut group_rotation_info) = test_state.validator_groups.clone();
+ group_rotation_info.now = number;
+ tx.send(Ok((validator_groups, group_rotation_info))).unwrap();
+ }
+ );
+
+ // Check that subsystem job issues a request for the session index for child.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(parent, RuntimeApiRequest::SessionIndexForChild(tx))
+ ) if parent == hash => {
+ tx.send(Ok(test_state.signing_context.session_index)).unwrap();
+ }
+ );
+
+ // Check that subsystem job issues a request for the availability cores.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(parent, RuntimeApiRequest::AvailabilityCores(tx))
+ ) if parent == hash => {
+ tx.send(Ok(test_state.availability_cores.clone())).unwrap();
+ }
+ );
+ }
+}
+
+async fn assert_validate_seconded_candidate(
+ virtual_overseer: &mut VirtualOverseer,
+ relay_parent: Hash,
+ candidate: &CommittedCandidateReceipt,
+ pov: &PoV,
+ pvd: &PersistedValidationData,
+ validation_code: &ValidationCode,
+ expected_head_data: &HeadData,
+ fetch_pov: bool,
+) {
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::RuntimeApi(
+ RuntimeApiMessage::Request(parent, RuntimeApiRequest::ValidationCodeByHash(hash, tx))
+ ) if parent == relay_parent && hash == validation_code.hash() => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ }
+ );
+
+ if fetch_pov {
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::AvailabilityDistribution(
+ AvailabilityDistributionMessage::FetchPoV {
+ relay_parent: hash,
+ tx,
+ ..
+ }
+ ) if hash == relay_parent => {
+ tx.send(pov.clone()).unwrap();
+ }
+ );
+ }
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive(
+ _pvd,
+ _validation_code,
+ candidate_receipt,
+ _pov,
+ timeout,
+ tx,
+ )) if &_pvd == pvd &&
+ &_validation_code == validation_code &&
+ &*_pov == pov &&
+ &candidate_receipt.descriptor == candidate.descriptor() &&
+ timeout == PvfExecTimeoutKind::Backing &&
+ candidate.commitments.hash() == candidate_receipt.commitments_hash =>
+ {
+ tx.send(Ok(ValidationResult::Valid(
+ CandidateCommitments {
+ head_data: expected_head_data.clone(),
+ horizontal_messages: Default::default(),
+ upward_messages: Default::default(),
+ new_validation_code: None,
+ processed_downward_messages: 0,
+ hrmp_watermark: 0,
+ },
+ pvd.clone(),
+ )))
+ .unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::AvailabilityStore(
+ AvailabilityStoreMessage::StoreAvailableData { candidate_hash, tx, .. }
+ ) if candidate_hash == candidate.hash() => {
+ tx.send(Ok(())).unwrap();
+ }
+ );
+}
+
+async fn assert_hypothetical_frontier_requests(
+ virtual_overseer: &mut VirtualOverseer,
+ mut expected_requests: Vec<(
+ HypotheticalFrontierRequest,
+ Vec<(HypotheticalCandidate, FragmentTreeMembership)>,
+ )>,
+) {
+ // Requests come with no particular order.
+ let requests_num = expected_requests.len();
+
+ for _ in 0..requests_num {
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::GetHypotheticalFrontier(request, tx),
+ ) => {
+ let idx = match expected_requests.iter().position(|r| r.0 == request) {
+ Some(idx) => idx,
+ None => panic!(
+ "unexpected hypothetical frontier request, no match found for {:?}",
+ request
+ ),
+ };
+ let resp = std::mem::take(&mut expected_requests[idx].1);
+ tx.send(resp).unwrap();
+
+ expected_requests.remove(idx);
+ }
+ );
+ }
+}
+
+fn make_hypothetical_frontier_response(
+ depths: Vec,
+ hypothetical_candidate: HypotheticalCandidate,
+ relay_parent_hash: Hash,
+) -> Vec<(HypotheticalCandidate, FragmentTreeMembership)> {
+ vec![(hypothetical_candidate, vec![(relay_parent_hash, depths)])]
+}
+
+// Test that `seconding_sanity_check` works when a candidate is allowed
+// for all leaves.
+#[test]
+fn seconding_sanity_check_allowed() {
+ let test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ // Candidate is seconded in a parent of the activated `leaf_a`.
+ const LEAF_A_BLOCK_NUMBER: BlockNumber = 100;
+ const LEAF_A_ANCESTRY_LEN: BlockNumber = 3;
+ let para_id = test_state.chain_ids[0];
+
+ // `a` is grandparent of `b`.
+ let leaf_a_hash = Hash::from_low_u64_be(130);
+ let leaf_a_parent = get_parent_hash(leaf_a_hash);
+ let activated = ActivatedLeaf {
+ hash: leaf_a_hash,
+ number: LEAF_A_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_A_BLOCK_NUMBER - LEAF_A_ANCESTRY_LEN)];
+ let test_leaf_a = TestLeaf { activated, min_relay_parents };
+
+ const LEAF_B_BLOCK_NUMBER: BlockNumber = LEAF_A_BLOCK_NUMBER + 2;
+ const LEAF_B_ANCESTRY_LEN: BlockNumber = 4;
+
+ let leaf_b_hash = Hash::from_low_u64_be(128);
+ let activated = ActivatedLeaf {
+ hash: leaf_b_hash,
+ number: LEAF_B_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_B_BLOCK_NUMBER - LEAF_B_ANCESTRY_LEN)];
+ let test_leaf_b = TestLeaf { activated, min_relay_parents };
+
+ activate_leaf(&mut virtual_overseer, test_leaf_a, &test_state, 0).await;
+ activate_leaf(&mut virtual_overseer, test_leaf_b, &test_state, 0).await;
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data = test_state.head_data.get(¶_id).unwrap();
+
+ let pov_hash = pov.hash();
+ let candidate = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_a_parent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ }
+ .build();
+
+ let second = CandidateBackingMessage::Second(
+ leaf_a_hash,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ leaf_a_parent,
+ &candidate,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ false,
+ )
+ .await;
+
+ // `seconding_sanity_check`
+ let hypothetical_candidate = HypotheticalCandidate::Complete {
+ candidate_hash: candidate.hash(),
+ receipt: Arc::new(candidate.clone()),
+ persisted_validation_data: pvd.clone(),
+ };
+ let expected_request_a = HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_a_hash),
+ backed_in_path_only: false,
+ };
+ let expected_response_a = make_hypothetical_frontier_response(
+ vec![0, 1, 2, 3],
+ hypothetical_candidate.clone(),
+ leaf_a_hash,
+ );
+ let expected_request_b = HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_b_hash),
+ backed_in_path_only: false,
+ };
+ let expected_response_b =
+ make_hypothetical_frontier_response(vec![3], hypothetical_candidate, leaf_b_hash);
+ assert_hypothetical_frontier_requests(
+ &mut virtual_overseer,
+ vec![
+ (expected_request_a, expected_response_a),
+ (expected_request_b, expected_response_b),
+ ],
+ )
+ .await;
+ // Prospective parachains are notified.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(
+ req,
+ tx,
+ ),
+ ) if
+ req.candidate_receipt == candidate
+ && req.candidate_para == para_id
+ && pvd == req.persisted_validation_data => {
+ // Any non-empty response will do.
+ tx.send(vec![(leaf_a_hash, vec![0, 1, 2, 3])]).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(ProspectiveParachainsMessage::CandidateSeconded(
+ _,
+ _
+ ))
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(
+ parent_hash,
+ _signed_statement,
+ )
+ ) if parent_hash == leaf_a_parent => {}
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Seconded(hash, statement)) => {
+ assert_eq!(leaf_a_parent, hash);
+ assert_matches!(statement.payload(), Statement::Seconded(_));
+ }
+ );
+
+ virtual_overseer
+ });
+}
+
+// Test that `seconding_sanity_check` works when a candidate is disallowed
+// for at least one leaf.
+#[test]
+fn seconding_sanity_check_disallowed() {
+ let test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ // Candidate is seconded in a parent of the activated `leaf_a`.
+ const LEAF_A_BLOCK_NUMBER: BlockNumber = 100;
+ const LEAF_A_ANCESTRY_LEN: BlockNumber = 3;
+ let para_id = test_state.chain_ids[0];
+
+ let leaf_b_hash = Hash::from_low_u64_be(128);
+ // `a` is grandparent of `b`.
+ let leaf_a_hash = Hash::from_low_u64_be(130);
+ let leaf_a_parent = get_parent_hash(leaf_a_hash);
+ let activated = ActivatedLeaf {
+ hash: leaf_a_hash,
+ number: LEAF_A_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_A_BLOCK_NUMBER - LEAF_A_ANCESTRY_LEN)];
+ let test_leaf_a = TestLeaf { activated, min_relay_parents };
+
+ const LEAF_B_BLOCK_NUMBER: BlockNumber = LEAF_A_BLOCK_NUMBER + 2;
+ const LEAF_B_ANCESTRY_LEN: BlockNumber = 4;
+
+ let activated = ActivatedLeaf {
+ hash: leaf_b_hash,
+ number: LEAF_B_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_B_BLOCK_NUMBER - LEAF_B_ANCESTRY_LEN)];
+ let test_leaf_b = TestLeaf { activated, min_relay_parents };
+
+ activate_leaf(&mut virtual_overseer, test_leaf_a, &test_state, 0).await;
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data = test_state.head_data.get(¶_id).unwrap();
+
+ let pov_hash = pov.hash();
+ let candidate = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_a_parent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ }
+ .build();
+
+ let second = CandidateBackingMessage::Second(
+ leaf_a_hash,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ leaf_a_parent,
+ &candidate,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ false,
+ )
+ .await;
+
+ // `seconding_sanity_check`
+ let hypothetical_candidate = HypotheticalCandidate::Complete {
+ candidate_hash: candidate.hash(),
+ receipt: Arc::new(candidate.clone()),
+ persisted_validation_data: pvd.clone(),
+ };
+ let expected_request_a = HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_a_hash),
+ backed_in_path_only: false,
+ };
+ let expected_response_a = make_hypothetical_frontier_response(
+ vec![0, 1, 2, 3],
+ hypothetical_candidate,
+ leaf_a_hash,
+ );
+ assert_hypothetical_frontier_requests(
+ &mut virtual_overseer,
+ vec![(expected_request_a, expected_response_a)],
+ )
+ .await;
+ // Prospective parachains are notified.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(
+ req,
+ tx,
+ ),
+ ) if
+ req.candidate_receipt == candidate
+ && req.candidate_para == para_id
+ && pvd == req.persisted_validation_data => {
+ // Any non-empty response will do.
+ tx.send(vec![(leaf_a_hash, vec![0, 2, 3])]).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(ProspectiveParachainsMessage::CandidateSeconded(
+ _,
+ _
+ ))
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(
+ parent_hash,
+ _signed_statement,
+ )
+ ) if parent_hash == leaf_a_parent => {}
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Seconded(hash, statement)) => {
+ assert_eq!(leaf_a_parent, hash);
+ assert_matches!(statement.payload(), Statement::Seconded(_));
+ }
+ );
+
+ // A seconded candidate occupies a depth, try to second another one.
+ // It is allowed in a new leaf but not allowed in the old one.
+ // Expect it to be rejected.
+ activate_leaf(&mut virtual_overseer, test_leaf_b, &test_state, 1).await;
+ let leaf_a_grandparent = get_parent_hash(leaf_a_parent);
+ let candidate = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_a_grandparent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ }
+ .build();
+
+ let second = CandidateBackingMessage::Second(
+ leaf_a_hash,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ leaf_a_grandparent,
+ &candidate,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ false,
+ )
+ .await;
+
+ // `seconding_sanity_check`
+
+ let hypothetical_candidate = HypotheticalCandidate::Complete {
+ candidate_hash: candidate.hash(),
+ receipt: Arc::new(candidate),
+ persisted_validation_data: pvd,
+ };
+ let expected_request_a = HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_a_hash),
+ backed_in_path_only: false,
+ };
+ let expected_response_a = make_hypothetical_frontier_response(
+ vec![3],
+ hypothetical_candidate.clone(),
+ leaf_a_hash,
+ );
+ let expected_request_b = HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_b_hash),
+ backed_in_path_only: false,
+ };
+ let expected_response_b =
+ make_hypothetical_frontier_response(vec![1], hypothetical_candidate, leaf_b_hash);
+ assert_hypothetical_frontier_requests(
+ &mut virtual_overseer,
+ vec![
+ (expected_request_a, expected_response_a), // All depths are occupied.
+ (expected_request_b, expected_response_b),
+ ],
+ )
+ .await;
+
+ assert!(virtual_overseer
+ .recv()
+ .timeout(std::time::Duration::from_millis(50))
+ .await
+ .is_none());
+
+ virtual_overseer
+ });
+}
+
+// Test that a seconded candidate which is not approved by prospective parachains
+// subsystem doesn't change the view.
+#[test]
+fn prospective_parachains_reject_candidate() {
+ let test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ // Candidate is seconded in a parent of the activated `leaf_a`.
+ const LEAF_A_BLOCK_NUMBER: BlockNumber = 100;
+ const LEAF_A_ANCESTRY_LEN: BlockNumber = 3;
+ let para_id = test_state.chain_ids[0];
+
+ let leaf_a_hash = Hash::from_low_u64_be(130);
+ let leaf_a_parent = get_parent_hash(leaf_a_hash);
+ let activated = ActivatedLeaf {
+ hash: leaf_a_hash,
+ number: LEAF_A_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_A_BLOCK_NUMBER - LEAF_A_ANCESTRY_LEN)];
+ let test_leaf_a = TestLeaf { activated, min_relay_parents };
+
+ activate_leaf(&mut virtual_overseer, test_leaf_a, &test_state, 0).await;
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data = test_state.head_data.get(¶_id).unwrap();
+
+ let pov_hash = pov.hash();
+ let candidate = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_a_parent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ }
+ .build();
+
+ let second = CandidateBackingMessage::Second(
+ leaf_a_hash,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ leaf_a_parent,
+ &candidate,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ false,
+ )
+ .await;
+
+ // `seconding_sanity_check`
+ let hypothetical_candidate = HypotheticalCandidate::Complete {
+ candidate_hash: candidate.hash(),
+ receipt: Arc::new(candidate.clone()),
+ persisted_validation_data: pvd.clone(),
+ };
+ let expected_request_a = vec![(
+ HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_a_hash),
+ backed_in_path_only: false,
+ },
+ make_hypothetical_frontier_response(
+ vec![0, 1, 2, 3],
+ hypothetical_candidate,
+ leaf_a_hash,
+ ),
+ )];
+ assert_hypothetical_frontier_requests(&mut virtual_overseer, expected_request_a.clone())
+ .await;
+
+ // Prospective parachains are notified.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(
+ req,
+ tx,
+ ),
+ ) if
+ req.candidate_receipt == candidate
+ && req.candidate_para == para_id
+ && pvd == req.persisted_validation_data => {
+ // Reject it.
+ tx.send(Vec::new()).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Invalid(
+ relay_parent,
+ candidate_receipt,
+ )) if candidate_receipt.descriptor() == candidate.descriptor() &&
+ candidate_receipt.commitments_hash == candidate.commitments.hash() &&
+ relay_parent == leaf_a_parent
+ );
+
+ // Try seconding the same candidate.
+
+ let second = CandidateBackingMessage::Second(
+ leaf_a_hash,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ leaf_a_parent,
+ &candidate,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ false,
+ )
+ .await;
+
+ // `seconding_sanity_check`
+ assert_hypothetical_frontier_requests(&mut virtual_overseer, expected_request_a).await;
+ // Prospective parachains are notified.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(
+ req,
+ tx,
+ ),
+ ) if
+ req.candidate_receipt == candidate
+ && req.candidate_para == para_id
+ && pvd == req.persisted_validation_data => {
+ // Any non-empty response will do.
+ tx.send(vec![(leaf_a_hash, vec![0, 2, 3])]).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(ProspectiveParachainsMessage::CandidateSeconded(
+ _,
+ _
+ ))
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(
+ parent_hash,
+ _signed_statement,
+ )
+ ) if parent_hash == leaf_a_parent => {}
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Seconded(hash, statement)) => {
+ assert_eq!(leaf_a_parent, hash);
+ assert_matches!(statement.payload(), Statement::Seconded(_));
+ }
+ );
+
+ virtual_overseer
+ });
+}
+
+// Test that a validator can second multiple candidates per single relay parent.
+#[test]
+fn second_multiple_candidates_per_relay_parent() {
+ let test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ // Candidate `a` is seconded in a parent of the activated `leaf`.
+ const LEAF_BLOCK_NUMBER: BlockNumber = 100;
+ const LEAF_ANCESTRY_LEN: BlockNumber = 3;
+ let para_id = test_state.chain_ids[0];
+
+ let leaf_hash = Hash::from_low_u64_be(130);
+ let leaf_parent = get_parent_hash(leaf_hash);
+ let leaf_grandparent = get_parent_hash(leaf_parent);
+ let activated = ActivatedLeaf {
+ hash: leaf_hash,
+ number: LEAF_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_BLOCK_NUMBER - LEAF_ANCESTRY_LEN)];
+ let test_leaf_a = TestLeaf { activated, min_relay_parents };
+
+ activate_leaf(&mut virtual_overseer, test_leaf_a, &test_state, 0).await;
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data = test_state.head_data.get(¶_id).unwrap();
+
+ let pov_hash = pov.hash();
+ let candidate_a = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_parent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ };
+ let mut candidate_b = candidate_a.clone();
+ candidate_b.relay_parent = leaf_grandparent;
+
+ // With depths.
+ let candidate_a = (candidate_a.build(), 1);
+ let candidate_b = (candidate_b.build(), 2);
+
+ for candidate in &[candidate_a, candidate_b] {
+ let (candidate, depth) = candidate;
+ let second = CandidateBackingMessage::Second(
+ leaf_hash,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ candidate.descriptor().relay_parent,
+ &candidate,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ false,
+ )
+ .await;
+
+ // `seconding_sanity_check`
+ let hypothetical_candidate = HypotheticalCandidate::Complete {
+ candidate_hash: candidate.hash(),
+ receipt: Arc::new(candidate.clone()),
+ persisted_validation_data: pvd.clone(),
+ };
+ let expected_request_a = vec![(
+ HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_hash),
+ backed_in_path_only: false,
+ },
+ make_hypothetical_frontier_response(
+ vec![*depth],
+ hypothetical_candidate,
+ leaf_hash,
+ ),
+ )];
+ assert_hypothetical_frontier_requests(
+ &mut virtual_overseer,
+ expected_request_a.clone(),
+ )
+ .await;
+
+ // Prospective parachains are notified.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(
+ req,
+ tx,
+ ),
+ ) if
+ &req.candidate_receipt == candidate
+ && req.candidate_para == para_id
+ && pvd == req.persisted_validation_data
+ => {
+ // Any non-empty response will do.
+ tx.send(vec![(leaf_hash, vec![0, 2, 3])]).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::CandidateSeconded(_, _)
+ )
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(
+ parent_hash,
+ _signed_statement,
+ )
+ ) if parent_hash == candidate.descriptor().relay_parent => {}
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Seconded(hash, statement)) => {
+ assert_eq!(candidate.descriptor().relay_parent, hash);
+ assert_matches!(statement.payload(), Statement::Seconded(_));
+ }
+ );
+ }
+
+ virtual_overseer
+ });
+}
+
+// Test that the candidate reaches quorum successfully.
+#[test]
+fn backing_works() {
+ let test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ // Candidate `a` is seconded in a parent of the activated `leaf`.
+ const LEAF_BLOCK_NUMBER: BlockNumber = 100;
+ const LEAF_ANCESTRY_LEN: BlockNumber = 3;
+ let para_id = test_state.chain_ids[0];
+
+ let leaf_hash = Hash::from_low_u64_be(130);
+ let leaf_parent = get_parent_hash(leaf_hash);
+ let activated = ActivatedLeaf {
+ hash: leaf_hash,
+ number: LEAF_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_BLOCK_NUMBER - LEAF_ANCESTRY_LEN)];
+ let test_leaf_a = TestLeaf { activated, min_relay_parents };
+
+ activate_leaf(&mut virtual_overseer, test_leaf_a, &test_state, 0).await;
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data = test_state.head_data.get(¶_id).unwrap();
+
+ let pov_hash = pov.hash();
+
+ let candidate_a = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_parent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ validation_code: validation_code.0.clone(),
+ persisted_validation_data_hash: pvd.hash(),
+ }
+ .build();
+
+ let candidate_a_hash = candidate_a.hash();
+ let candidate_a_para_head = candidate_a.descriptor().para_head;
+
+ let public1 = Keystore::sr25519_generate_new(
+ &*test_state.keystore,
+ ValidatorId::ID,
+ Some(&test_state.validators[5].to_seed()),
+ )
+ .expect("Insert key into keystore");
+ let public2 = Keystore::sr25519_generate_new(
+ &*test_state.keystore,
+ ValidatorId::ID,
+ Some(&test_state.validators[2].to_seed()),
+ )
+ .expect("Insert key into keystore");
+
+ // Signing context should have a parent hash candidate is based on.
+ let signing_context =
+ SigningContext { parent_hash: leaf_parent, session_index: test_state.session() };
+ let signed_a = SignedFullStatementWithPVD::sign(
+ &test_state.keystore,
+ StatementWithPVD::Seconded(candidate_a.clone(), pvd.clone()),
+ &signing_context,
+ ValidatorIndex(2),
+ &public2.into(),
+ )
+ .ok()
+ .flatten()
+ .expect("should be signed");
+
+ let signed_b = SignedFullStatementWithPVD::sign(
+ &test_state.keystore,
+ StatementWithPVD::Valid(candidate_a_hash),
+ &signing_context,
+ ValidatorIndex(5),
+ &public1.into(),
+ )
+ .ok()
+ .flatten()
+ .expect("should be signed");
+
+ let statement = CandidateBackingMessage::Statement(leaf_parent, signed_a.clone());
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+
+ // Prospective parachains are notified about candidate seconded first.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(
+ req,
+ tx,
+ ),
+ ) if
+ req.candidate_receipt == candidate_a
+ && req.candidate_para == para_id
+ && pvd == req.persisted_validation_data => {
+ // Any non-empty response will do.
+ tx.send(vec![(leaf_hash, vec![0, 2, 3])]).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(ProspectiveParachainsMessage::CandidateSeconded(
+ _,
+ _
+ ))
+ );
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ candidate_a.descriptor().relay_parent,
+ &candidate_a,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ true,
+ )
+ .await;
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(hash, _stmt)
+ ) => {
+ assert_eq!(leaf_parent, hash);
+ }
+ );
+
+ // Prospective parachains and collator protocol are notified about candidate backed.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::CandidateBacked(
+ candidate_para_id, candidate_hash
+ ),
+ ) if candidate_a_hash == candidate_hash && candidate_para_id == para_id
+ );
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Backed {
+ para_id: _para_id,
+ para_head,
+ }) if para_id == _para_id && candidate_a_para_head == para_head
+ );
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(StatementDistributionMessage::Backed (
+ candidate_hash
+ )) if candidate_a_hash == candidate_hash
+ );
+
+ let statement = CandidateBackingMessage::Statement(leaf_parent, signed_b.clone());
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
+
+ virtual_overseer
+ });
+}
+
+// Tests that validators start work on consecutive prospective parachain blocks.
+#[test]
+fn concurrent_dependent_candidates() {
+ let test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ // Candidate `a` is seconded in a grandparent of the activated `leaf`,
+ // candidate `b` -- in parent.
+ const LEAF_BLOCK_NUMBER: BlockNumber = 100;
+ const LEAF_ANCESTRY_LEN: BlockNumber = 3;
+ let para_id = test_state.chain_ids[0];
+
+ let leaf_hash = Hash::from_low_u64_be(130);
+ let leaf_parent = get_parent_hash(leaf_hash);
+ let leaf_grandparent = get_parent_hash(leaf_parent);
+ let activated = ActivatedLeaf {
+ hash: leaf_hash,
+ number: LEAF_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_BLOCK_NUMBER - LEAF_ANCESTRY_LEN)];
+ let test_leaf_a = TestLeaf { activated, min_relay_parents };
+
+ activate_leaf(&mut virtual_overseer, test_leaf_a, &test_state, 0).await;
+
+ let head_data = &[
+ HeadData(vec![10, 20, 30]), // Before `a`.
+ HeadData(vec![11, 21, 31]), // After `a`.
+ HeadData(vec![12, 22]), // After `b`.
+ ];
+
+ let pov_a = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd_a = PersistedValidationData {
+ parent_head: head_data[0].clone(),
+ relay_parent_number: LEAF_BLOCK_NUMBER - 2,
+ relay_parent_storage_root: Hash::zero(),
+ max_pov_size: 1024,
+ };
+
+ let pov_b = PoV { block_data: BlockData(vec![22, 14, 100]) };
+ let pvd_b = PersistedValidationData {
+ parent_head: head_data[1].clone(),
+ relay_parent_number: LEAF_BLOCK_NUMBER - 1,
+ relay_parent_storage_root: Hash::zero(),
+ max_pov_size: 1024,
+ };
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let candidate_a = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_grandparent,
+ pov_hash: pov_a.hash(),
+ head_data: head_data[1].clone(),
+ erasure_root: make_erasure_root(&test_state, pov_a.clone(), pvd_a.clone()),
+ persisted_validation_data_hash: pvd_a.hash(),
+ validation_code: validation_code.0.clone(),
+ }
+ .build();
+ let candidate_b = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_parent,
+ pov_hash: pov_b.hash(),
+ head_data: head_data[2].clone(),
+ erasure_root: make_erasure_root(&test_state, pov_b.clone(), pvd_b.clone()),
+ persisted_validation_data_hash: pvd_b.hash(),
+ validation_code: validation_code.0.clone(),
+ }
+ .build();
+ let candidate_a_hash = candidate_a.hash();
+ let candidate_b_hash = candidate_b.hash();
+
+ let public1 = Keystore::sr25519_generate_new(
+ &*test_state.keystore,
+ ValidatorId::ID,
+ Some(&test_state.validators[5].to_seed()),
+ )
+ .expect("Insert key into keystore");
+ let public2 = Keystore::sr25519_generate_new(
+ &*test_state.keystore,
+ ValidatorId::ID,
+ Some(&test_state.validators[2].to_seed()),
+ )
+ .expect("Insert key into keystore");
+
+ // Signing context should have a parent hash candidate is based on.
+ let signing_context =
+ SigningContext { parent_hash: leaf_grandparent, session_index: test_state.session() };
+ let signed_a = SignedFullStatementWithPVD::sign(
+ &test_state.keystore,
+ StatementWithPVD::Seconded(candidate_a.clone(), pvd_a.clone()),
+ &signing_context,
+ ValidatorIndex(2),
+ &public2.into(),
+ )
+ .ok()
+ .flatten()
+ .expect("should be signed");
+
+ let signing_context =
+ SigningContext { parent_hash: leaf_parent, session_index: test_state.session() };
+ let signed_b = SignedFullStatementWithPVD::sign(
+ &test_state.keystore,
+ StatementWithPVD::Seconded(candidate_b.clone(), pvd_b.clone()),
+ &signing_context,
+ ValidatorIndex(5),
+ &public1.into(),
+ )
+ .ok()
+ .flatten()
+ .expect("should be signed");
+
+ let statement_a = CandidateBackingMessage::Statement(leaf_grandparent, signed_a.clone());
+ let statement_b = CandidateBackingMessage::Statement(leaf_parent, signed_b.clone());
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: statement_a }).await;
+ // At this point the subsystem waits for response, the previous message is received,
+ // send a second one without blocking.
+ let _ = virtual_overseer
+ .tx
+ .start_send_unpin(FromOrchestra::Communication { msg: statement_b });
+
+ let mut valid_statements = HashSet::new();
+ let mut backed_statements = HashSet::new();
+
+ loop {
+ let msg = virtual_overseer
+ .recv()
+ .timeout(std::time::Duration::from_secs(1))
+ .await
+ .expect("overseer recv timed out");
+
+ // Order is not guaranteed since we have 2 statements being handled concurrently.
+ match msg {
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(_, tx),
+ ) => {
+ tx.send(vec![(leaf_hash, vec![0, 2, 3])]).unwrap();
+ },
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::CandidateSeconded(_, _),
+ ) => {},
+ AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _,
+ RuntimeApiRequest::ValidationCodeByHash(_, tx),
+ )) => {
+ tx.send(Ok(Some(validation_code.clone()))).unwrap();
+ },
+ AllMessages::AvailabilityDistribution(
+ AvailabilityDistributionMessage::FetchPoV { candidate_hash, tx, .. },
+ ) => {
+ let pov = if candidate_hash == candidate_a_hash {
+ &pov_a
+ } else if candidate_hash == candidate_b_hash {
+ &pov_b
+ } else {
+ panic!("unknown candidate hash")
+ };
+ tx.send(pov.clone()).unwrap();
+ },
+ AllMessages::CandidateValidation(
+ CandidateValidationMessage::ValidateFromExhaustive(.., candidate, _, _, tx),
+ ) => {
+ let candidate_hash = candidate.hash();
+ let (head_data, pvd) = if candidate_hash == candidate_a_hash {
+ (&head_data[1], &pvd_a)
+ } else if candidate_hash == candidate_b_hash {
+ (&head_data[2], &pvd_b)
+ } else {
+ panic!("unknown candidate hash")
+ };
+ tx.send(Ok(ValidationResult::Valid(
+ CandidateCommitments {
+ head_data: head_data.clone(),
+ horizontal_messages: Default::default(),
+ upward_messages: Default::default(),
+ new_validation_code: None,
+ processed_downward_messages: 0,
+ hrmp_watermark: 0,
+ },
+ pvd.clone(),
+ )))
+ .unwrap();
+ },
+ AllMessages::AvailabilityStore(AvailabilityStoreMessage::StoreAvailableData {
+ tx,
+ ..
+ }) => {
+ tx.send(Ok(())).unwrap();
+ },
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::CandidateBacked(..),
+ ) => {},
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Backed { .. }) => {},
+ AllMessages::StatementDistribution(StatementDistributionMessage::Share(
+ _,
+ statement,
+ )) => {
+ assert_eq!(statement.validator_index(), ValidatorIndex(0));
+ let payload = statement.payload();
+ assert_matches!(
+ payload.clone(),
+ StatementWithPVD::Valid(hash)
+ if hash == candidate_a_hash || hash == candidate_b_hash =>
+ {
+ assert!(valid_statements.insert(hash));
+ }
+ );
+ },
+ AllMessages::StatementDistribution(StatementDistributionMessage::Backed(hash)) => {
+ // Ensure that `Share` was received first for the candidate.
+ assert!(valid_statements.contains(&hash));
+ backed_statements.insert(hash);
+
+ if backed_statements.len() == 2 {
+ break
+ }
+ },
+ _ => panic!("unexpected message received from overseer: {:?}", msg),
+ }
+ }
+
+ assert!(valid_statements.contains(&candidate_a_hash));
+ assert!(valid_statements.contains(&candidate_b_hash));
+ assert!(backed_statements.contains(&candidate_a_hash));
+ assert!(backed_statements.contains(&candidate_b_hash));
+
+ virtual_overseer
+ });
+}
+
+// Test that multiple candidates from different paras can occupy the same depth
+// in a given relay parent.
+#[test]
+fn seconding_sanity_check_occupy_same_depth() {
+ let test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ // Candidate `a` is seconded in a parent of the activated `leaf`.
+ const LEAF_BLOCK_NUMBER: BlockNumber = 100;
+ const LEAF_ANCESTRY_LEN: BlockNumber = 3;
+
+ let para_id_a = test_state.chain_ids[0];
+ let para_id_b = test_state.chain_ids[1];
+
+ let leaf_hash = Hash::from_low_u64_be(130);
+ let leaf_parent = get_parent_hash(leaf_hash);
+
+ let activated = ActivatedLeaf {
+ hash: leaf_hash,
+ number: LEAF_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+
+ let min_block_number = LEAF_BLOCK_NUMBER - LEAF_ANCESTRY_LEN;
+ let min_relay_parents = vec![(para_id_a, min_block_number), (para_id_b, min_block_number)];
+ let test_leaf_a = TestLeaf { activated, min_relay_parents };
+
+ activate_leaf(&mut virtual_overseer, test_leaf_a, &test_state, 0).await;
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data_a = test_state.head_data.get(¶_id_a).unwrap();
+ let expected_head_data_b = test_state.head_data.get(¶_id_b).unwrap();
+
+ let pov_hash = pov.hash();
+ let candidate_a = TestCandidateBuilder {
+ para_id: para_id_a,
+ relay_parent: leaf_parent,
+ pov_hash,
+ head_data: expected_head_data_a.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ };
+
+ let mut candidate_b = candidate_a.clone();
+ candidate_b.para_id = para_id_b;
+ candidate_b.head_data = expected_head_data_b.clone();
+ // A rotation happens, test validator is assigned to second para here.
+ candidate_b.relay_parent = leaf_hash;
+
+ let candidate_a = (candidate_a.build(), expected_head_data_a, para_id_a);
+ let candidate_b = (candidate_b.build(), expected_head_data_b, para_id_b);
+
+ for candidate in &[candidate_a, candidate_b] {
+ let (candidate, expected_head_data, para_id) = candidate;
+ let second = CandidateBackingMessage::Second(
+ leaf_hash,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ candidate.descriptor().relay_parent,
+ &candidate,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ false,
+ )
+ .await;
+
+ // `seconding_sanity_check`
+ let hypothetical_candidate = HypotheticalCandidate::Complete {
+ candidate_hash: candidate.hash(),
+ receipt: Arc::new(candidate.clone()),
+ persisted_validation_data: pvd.clone(),
+ };
+ let expected_request_a = vec![(
+ HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_hash),
+ backed_in_path_only: false,
+ },
+ // Send the same membership for both candidates.
+ make_hypothetical_frontier_response(vec![0, 1], hypothetical_candidate, leaf_hash),
+ )];
+
+ assert_hypothetical_frontier_requests(
+ &mut virtual_overseer,
+ expected_request_a.clone(),
+ )
+ .await;
+
+ // Prospective parachains are notified.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(
+ req,
+ tx,
+ ),
+ ) if
+ &req.candidate_receipt == candidate
+ && &req.candidate_para == para_id
+ && pvd == req.persisted_validation_data
+ => {
+ // Any non-empty response will do.
+ tx.send(vec![(leaf_hash, vec![0, 2, 3])]).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::CandidateSeconded(_, _)
+ )
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(
+ parent_hash,
+ _signed_statement,
+ )
+ ) if parent_hash == candidate.descriptor().relay_parent => {}
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Seconded(hash, statement)) => {
+ assert_eq!(candidate.descriptor().relay_parent, hash);
+ assert_matches!(statement.payload(), Statement::Seconded(_));
+ }
+ );
+ }
+
+ virtual_overseer
+ });
+}
+
+// Test that the subsystem doesn't skip occupied cores assignments.
+#[test]
+fn occupied_core_assignment() {
+ let mut test_state = TestState::default();
+ test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
+ // Candidate is seconded in a parent of the activated `leaf_a`.
+ const LEAF_A_BLOCK_NUMBER: BlockNumber = 100;
+ const LEAF_A_ANCESTRY_LEN: BlockNumber = 3;
+ let para_id = test_state.chain_ids[0];
+
+ // Set the core state to occupied.
+ let mut candidate_descriptor = ::test_helpers::dummy_candidate_descriptor(Hash::zero());
+ candidate_descriptor.para_id = para_id;
+ test_state.availability_cores[0] = CoreState::Occupied(OccupiedCore {
+ group_responsible: Default::default(),
+ next_up_on_available: None,
+ occupied_since: 100_u32,
+ time_out_at: 200_u32,
+ next_up_on_time_out: None,
+ availability: Default::default(),
+ candidate_descriptor,
+ candidate_hash: Default::default(),
+ });
+
+ let leaf_a_hash = Hash::from_low_u64_be(130);
+ let leaf_a_parent = get_parent_hash(leaf_a_hash);
+ let activated = ActivatedLeaf {
+ hash: leaf_a_hash,
+ number: LEAF_A_BLOCK_NUMBER,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ };
+ let min_relay_parents = vec![(para_id, LEAF_A_BLOCK_NUMBER - LEAF_A_ANCESTRY_LEN)];
+ let test_leaf_a = TestLeaf { activated, min_relay_parents };
+
+ activate_leaf(&mut virtual_overseer, test_leaf_a, &test_state, 0).await;
+
+ let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
+ let pvd = dummy_pvd();
+ let validation_code = ValidationCode(vec![1, 2, 3]);
+
+ let expected_head_data = test_state.head_data.get(¶_id).unwrap();
+
+ let pov_hash = pov.hash();
+ let candidate = TestCandidateBuilder {
+ para_id,
+ relay_parent: leaf_a_parent,
+ pov_hash,
+ head_data: expected_head_data.clone(),
+ erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+ persisted_validation_data_hash: pvd.hash(),
+ validation_code: validation_code.0.clone(),
+ }
+ .build();
+
+ let second = CandidateBackingMessage::Second(
+ leaf_a_hash,
+ candidate.to_plain(),
+ pvd.clone(),
+ pov.clone(),
+ );
+
+ virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
+
+ assert_validate_seconded_candidate(
+ &mut virtual_overseer,
+ leaf_a_parent,
+ &candidate,
+ &pov,
+ &pvd,
+ &validation_code,
+ expected_head_data,
+ false,
+ )
+ .await;
+
+ // `seconding_sanity_check`
+ let hypothetical_candidate = HypotheticalCandidate::Complete {
+ candidate_hash: candidate.hash(),
+ receipt: Arc::new(candidate.clone()),
+ persisted_validation_data: pvd.clone(),
+ };
+ let expected_request = vec![(
+ HypotheticalFrontierRequest {
+ candidates: vec![hypothetical_candidate.clone()],
+ fragment_tree_relay_parent: Some(leaf_a_hash),
+ backed_in_path_only: false,
+ },
+ make_hypothetical_frontier_response(
+ vec![0, 1, 2, 3],
+ hypothetical_candidate,
+ leaf_a_hash,
+ ),
+ )];
+ assert_hypothetical_frontier_requests(&mut virtual_overseer, expected_request).await;
+ // Prospective parachains are notified.
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(
+ ProspectiveParachainsMessage::IntroduceCandidate(
+ req,
+ tx,
+ ),
+ ) if
+ req.candidate_receipt == candidate
+ && req.candidate_para == para_id
+ && pvd == req.persisted_validation_data
+ => {
+ // Any non-empty response will do.
+ tx.send(vec![(leaf_a_hash, vec![0, 1, 2, 3])]).unwrap();
+ }
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::ProspectiveParachains(ProspectiveParachainsMessage::CandidateSeconded(
+ _,
+ _
+ ))
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::StatementDistribution(
+ StatementDistributionMessage::Share(
+ parent_hash,
+ _signed_statement,
+ )
+ ) if parent_hash == leaf_a_parent => {}
+ );
+
+ assert_matches!(
+ virtual_overseer.recv().await,
+ AllMessages::CollatorProtocol(CollatorProtocolMessage::Seconded(hash, statement)) => {
+ assert_eq!(leaf_a_parent, hash);
+ assert_matches!(statement.payload(), Statement::Seconded(_));
+ }
+ );
+
+ virtual_overseer
+ });
+}
diff --git a/node/core/bitfield-signing/Cargo.toml b/node/core/bitfield-signing/Cargo.toml
index b94cc6708c74..ee147fb5c22a 100644
--- a/node/core/bitfield-signing/Cargo.toml
+++ b/node/core/bitfield-signing/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-bitfield-signing"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/bitfield-signing/src/lib.rs b/node/core/bitfield-signing/src/lib.rs
index 1e4d556de7ca..f29e827e1090 100644
--- a/node/core/bitfield-signing/src/lib.rs
+++ b/node/core/bitfield-signing/src/lib.rs
@@ -137,8 +137,8 @@ async fn get_availability_cores(
/// - get the list of core states from the runtime
/// - for each core, concurrently determine chunk availability (see `get_core_availability`)
-/// - return the bitfield if there were no errors at any point in this process
-/// (otherwise, it's prone to false negatives)
+/// - return the bitfield if there were no errors at any point in this process (otherwise, it's
+/// prone to false negatives)
async fn construct_availability_bitfield(
relay_parent: Hash,
span: &jaeger::Span,
diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
index 515aabbb3b41..0401c892d426 100644
--- a/node/core/candidate-validation/Cargo.toml
+++ b/node/core/candidate-validation/Cargo.toml
@@ -1,8 +1,10 @@
[package]
name = "polkadot-node-core-candidate-validation"
+description = "Polkadot crate that implements the Candidate Validation subsystem. Handles requests to validate candidates according to a PVF."
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
async-trait = "0.1.57"
@@ -19,6 +21,7 @@ polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-metrics = { path = "../../metrics" }
+polkadot-overseer = { path = "../../overseer" }
[target.'cfg(not(any(target_os = "android", target_os = "unknown")))'.dependencies]
polkadot-node-core-pvf = { path = "../pvf" }
diff --git a/node/core/candidate-validation/src/lib.rs b/node/core/candidate-validation/src/lib.rs
index b3055afd5772..f53f2a6aee06 100644
--- a/node/core/candidate-validation/src/lib.rs
+++ b/node/core/candidate-validation/src/lib.rs
@@ -67,15 +67,15 @@ mod tests;
const LOG_TARGET: &'static str = "parachain::candidate-validation";
-/// The amount of time to wait before retrying after a retry-able backing validation error. We use a lower value for the
-/// backing case, to fit within the lower backing timeout.
+/// The amount of time to wait before retrying after a retry-able backing validation error. We use a
+/// lower value for the backing case, to fit within the lower backing timeout.
#[cfg(not(test))]
const PVF_BACKING_EXECUTION_RETRY_DELAY: Duration = Duration::from_millis(500);
#[cfg(test)]
const PVF_BACKING_EXECUTION_RETRY_DELAY: Duration = Duration::from_millis(200);
-/// The amount of time to wait before retrying after a retry-able approval validation error. We use a higher value for
-/// the approval case since we have more time, and if we wait longer it is more likely that transient conditions will
-/// resolve.
+/// The amount of time to wait before retrying after a retry-able approval validation error. We use
+/// a higher value for the approval case since we have more time, and if we wait longer it is more
+/// likely that transient conditions will resolve.
#[cfg(not(test))]
const PVF_APPROVAL_EXECUTION_RETRY_DELAY: Duration = Duration::from_secs(3);
#[cfg(test)]
@@ -93,9 +93,12 @@ const DEFAULT_APPROVAL_EXECUTION_TIMEOUT: Duration = Duration::from_secs(12);
pub struct Config {
/// The path where candidate validation can store compiled artifacts for PVFs.
pub artifacts_cache_path: PathBuf,
- /// The path to the executable which can be used for spawning PVF compilation & validation
- /// workers.
- pub program_path: PathBuf,
+ /// The version of the node. `None` can be passed to skip the version check (only for tests).
+ pub node_version: Option,
+ /// Path to the preparation worker binary
+ pub prep_worker_path: PathBuf,
+ /// Path to the execution worker binary
+ pub exec_worker_path: PathBuf,
}
/// The candidate validation subsystem.
@@ -104,7 +107,7 @@ pub struct CandidateValidationSubsystem {
pub metrics: Metrics,
#[allow(missing_docs)]
pub pvf_metrics: polkadot_node_core_pvf::Metrics,
- config: Config,
+ config: Option,
}
impl CandidateValidationSubsystem {
@@ -113,7 +116,7 @@ impl CandidateValidationSubsystem {
///
/// Check out [`IsolationStrategy`] to get more details.
pub fn with_config(
- config: Config,
+ config: Option,
metrics: Metrics,
pvf_metrics: polkadot_node_core_pvf::Metrics,
) -> Self {
@@ -124,16 +127,14 @@ impl CandidateValidationSubsystem {
#[overseer::subsystem(CandidateValidation, error=SubsystemError, prefix=self::overseer)]
impl CandidateValidationSubsystem {
fn start(self, ctx: Context) -> SpawnedSubsystem {
- let future = run(
- ctx,
- self.metrics,
- self.pvf_metrics,
- self.config.artifacts_cache_path,
- self.config.program_path,
- )
- .map_err(|e| SubsystemError::with_origin("candidate-validation", e))
- .boxed();
- SpawnedSubsystem { name: "candidate-validation-subsystem", future }
+ if let Some(config) = self.config {
+ let future = run(ctx, self.metrics, self.pvf_metrics, config)
+ .map_err(|e| SubsystemError::with_origin("candidate-validation", e))
+ .boxed();
+ SpawnedSubsystem { name: "candidate-validation-subsystem", future }
+ } else {
+ polkadot_overseer::DummySubsystem.start(ctx)
+ }
}
}
@@ -142,11 +143,15 @@ async fn run(
mut ctx: Context,
metrics: Metrics,
pvf_metrics: polkadot_node_core_pvf::Metrics,
- cache_path: PathBuf,
- program_path: PathBuf,
+ Config { artifacts_cache_path, node_version, prep_worker_path, exec_worker_path }: Config,
) -> SubsystemResult<()> {
let (validation_host, task) = polkadot_node_core_pvf::start(
- polkadot_node_core_pvf::Config::new(cache_path, program_path),
+ polkadot_node_core_pvf::Config::new(
+ artifacts_cache_path,
+ node_version,
+ prep_worker_path,
+ exec_worker_path,
+ ),
pvf_metrics,
);
ctx.spawn_blocking("pvf-validation-host", task.boxed())?;
@@ -446,9 +451,9 @@ where
const ASSUMPTIONS: &[OccupiedCoreAssumption] = &[
OccupiedCoreAssumption::Included,
OccupiedCoreAssumption::TimedOut,
- // `TimedOut` and `Free` both don't perform any speculation and therefore should be the same
- // for our purposes here. In other words, if `TimedOut` matched then the `Free` must be
- // matched as well.
+ // `TimedOut` and `Free` both don't perform any speculation and therefore should be the
+ // same for our purposes here. In other words, if `TimedOut` matched then the `Free` must
+ // be matched as well.
];
// Consider running these checks in parallel to reduce validation latency.
@@ -477,9 +482,10 @@ where
AssumptionCheckOutcome::Matches(validation_data, validation_code) =>
Ok(Some((validation_data, validation_code))),
AssumptionCheckOutcome::DoesNotMatch => {
- // If neither the assumption of the occupied core having the para included or the assumption
- // of the occupied core timing out are valid, then the persisted_validation_data_hash in the descriptor
- // is not based on the relay parent and is thus invalid.
+ // If neither the assumption of the occupied core having the para included or the
+ // assumption of the occupied core timing out are valid, then the
+ // persisted_validation_data_hash in the descriptor is not based on the relay parent and
+ // is thus invalid.
Ok(None)
},
AssumptionCheckOutcome::BadRequest =>
@@ -699,7 +705,8 @@ where
"Invalid candidate (commitments hash)"
);
- // If validation produced a new set of commitments, we treat the candidate as invalid.
+ // If validation produced a new set of commitments, we treat the candidate as
+ // invalid.
Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))
} else {
Ok(ValidationResult::Valid(outputs, persisted_validation_data))
@@ -739,7 +746,8 @@ trait ValidationBackend {
prep_timeout,
PrepareJobKind::Compilation,
);
- // We keep track of the total time that has passed and stop retrying if we are taking too long.
+ // We keep track of the total time that has passed and stop retrying if we are taking too
+ // long.
let total_time_start = Instant::now();
let mut validation_result =
@@ -775,8 +783,8 @@ trait ValidationBackend {
_ => break,
}
- // If we got a possibly transient error, retry once after a brief delay, on the assumption
- // that the conditions that caused this error may have resolved on their own.
+ // If we got a possibly transient error, retry once after a brief delay, on the
+ // assumption that the conditions that caused this error may have resolved on their own.
{
// Wait a brief delay before retrying.
futures_timer::Delay::new(retry_delay).await;
diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
index 8400a2a5bf86..69d737ca2973 100644
--- a/node/core/chain-api/Cargo.toml
+++ b/node/core/chain-api/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-chain-api"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml
index b4104bc6f12d..071fec4415a4 100644
--- a/node/core/chain-selection/Cargo.toml
+++ b/node/core/chain-selection/Cargo.toml
@@ -4,6 +4,7 @@ description = "Chain Selection Subsystem"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/chain-selection/src/lib.rs b/node/core/chain-selection/src/lib.rs
index 4b512347dae4..aa5bb9548ad2 100644
--- a/node/core/chain-selection/src/lib.rs
+++ b/node/core/chain-selection/src/lib.rs
@@ -44,13 +44,15 @@ mod tree;
mod tests;
const LOG_TARGET: &str = "parachain::chain-selection";
-/// Timestamp based on the 1 Jan 1970 UNIX base, which is persistent across node restarts and OS reboots.
+/// Timestamp based on the 1 Jan 1970 UNIX base, which is persistent across node restarts and OS
+/// reboots.
type Timestamp = u64;
// If a block isn't approved in 120 seconds, nodes will abandon it
// and begin building on another chain.
const STAGNANT_TIMEOUT: Timestamp = 120;
-// Delay prunning of the stagnant keys in prune only mode by 25 hours to avoid interception with the finality
+// Delay prunning of the stagnant keys in prune only mode by 25 hours to avoid interception with the
+// finality
const STAGNANT_PRUNE_DELAY: Timestamp = 25 * 60 * 60;
// Maximum number of stagnant entries cleaned during one `STAGNANT_TIMEOUT` iteration
const MAX_STAGNANT_ENTRIES: usize = 1000;
diff --git a/node/core/chain-selection/src/tests.rs b/node/core/chain-selection/src/tests.rs
index 8b475bd2e13c..c04f9aaf6606 100644
--- a/node/core/chain-selection/src/tests.rs
+++ b/node/core/chain-selection/src/tests.rs
@@ -568,7 +568,7 @@ fn assert_backend_contains<'a>(
fn assert_backend_contains_chains(backend: &TestBackend, chains: Vec>) {
for chain in chains {
- assert_backend_contains(backend, chain.iter().map(|&(ref hdr, _)| hdr))
+ assert_backend_contains(backend, chain.iter().map(|(hdr, _)| hdr))
}
}
@@ -688,7 +688,7 @@ fn import_chain_on_finalized_incrementally() {
.await;
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 1);
- assert_backend_contains(&backend, chain.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![head_hash]);
assert_leaves_query(&mut virtual_overseer, vec![head_hash]).await;
@@ -721,8 +721,8 @@ fn import_two_subtrees_on_finalized() {
import_blocks_into(&mut virtual_overseer, &backend, None, chain_b.clone()).await;
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 1);
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![b_hash, a_hash]);
assert_leaves_query(&mut virtual_overseer, vec![b_hash, a_hash]).await;
@@ -755,8 +755,8 @@ fn import_two_subtrees_on_nonzero_finalized() {
import_blocks_into(&mut virtual_overseer, &backend, None, chain_b.clone()).await;
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 101);
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![b_hash, a_hash]);
assert_leaves_query(&mut virtual_overseer, vec![b_hash, a_hash]).await;
@@ -799,9 +799,9 @@ fn leaves_ordered_by_weight_and_then_number() {
.await;
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 1);
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_c.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_c.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![c2_hash, a3_hash, b2_hash]);
assert_leaves_query(&mut virtual_overseer, vec![c2_hash, a3_hash, b2_hash]).await;
virtual_overseer
@@ -844,8 +844,8 @@ fn subtrees_imported_even_with_gaps() {
.await;
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 1);
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![b5_hash, a3_hash]);
assert_leaves_query(&mut virtual_overseer, vec![b5_hash, a3_hash]).await;
@@ -878,7 +878,7 @@ fn reversion_removes_viability_of_chain() {
)
.await;
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![]);
assert_finalized_leaves_query(&mut virtual_overseer, finalized_number, finalized_hash)
.await;
@@ -914,7 +914,7 @@ fn reversion_removes_viability_and_finds_ancestor_as_leaf() {
)
.await;
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![a1_hash]);
assert_leaves_query(&mut virtual_overseer, vec![a1_hash]).await;
@@ -954,15 +954,15 @@ fn ancestor_of_unviable_is_not_leaf_if_has_children() {
import_blocks_into(&mut virtual_overseer, &backend, None, chain_b.clone()).await;
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![a2_hash, b2_hash]);
import_blocks_into(&mut virtual_overseer, &backend, None, chain_a_ext.clone()).await;
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_a_ext.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_a_ext.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![b2_hash]);
assert_leaves_query(&mut virtual_overseer, vec![b2_hash]).await;
@@ -995,7 +995,7 @@ fn self_and_future_reversions_are_ignored() {
)
.await;
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![a3_hash]);
assert_leaves_query(&mut virtual_overseer, vec![a3_hash]).await;
@@ -1028,7 +1028,7 @@ fn revert_finalized_is_ignored() {
)
.await;
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![a3_hash]);
assert_leaves_query(&mut virtual_overseer, vec![a3_hash]).await;
@@ -1072,8 +1072,8 @@ fn reversion_affects_viability_of_all_subtrees() {
import_blocks_into(&mut virtual_overseer, &backend, None, chain_b.clone()).await;
- assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
- assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
+ assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![a1_hash]);
assert_leaves_query(&mut virtual_overseer, vec![a1_hash]).await;
@@ -2034,12 +2034,12 @@ fn revert_blocks_message_triggers_proper_reversion() {
.await;
// Checking mini chain
- assert_backend_contains(&backend, built_chain.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, built_chain.iter().map(|(h, _)| h));
assert_leaves(&backend, vec![head_hash]);
assert_leaves_query(&mut virtual_overseer, vec![head_hash]).await;
- let block_1_hash = backend.load_blocks_by_number(1).unwrap().get(0).unwrap().clone();
- let block_2_hash = backend.load_blocks_by_number(2).unwrap().get(0).unwrap().clone();
+ let block_1_hash = *backend.load_blocks_by_number(1).unwrap().get(0).unwrap();
+ let block_2_hash = *backend.load_blocks_by_number(2).unwrap().get(0).unwrap();
// Sending revert blocks message
let (_, write_rx) = backend.await_next_write();
@@ -2098,7 +2098,7 @@ fn revert_blocks_against_finalized_is_ignored() {
.await;
// Checking mini chain
- assert_backend_contains(&backend, built_chain.iter().map(|&(ref h, _)| h));
+ assert_backend_contains(&backend, built_chain.iter().map(|(h, _)| h));
// Sending dispute concluded against message
virtual_overseer
diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml
index b26e3cc0cfba..e4069f7f3330 100644
--- a/node/core/dispute-coordinator/Cargo.toml
+++ b/node/core/dispute-coordinator/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-dispute-coordinator"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
@@ -10,7 +11,7 @@ gum = { package = "tracing-gum", path = "../../gum" }
parity-scale-codec = "3.6.1"
kvdb = "0.13.0"
thiserror = "1.0.31"
-lru = "0.9.0"
+lru = "0.11.0"
fatality = "0.0.6"
polkadot-primitives = { path = "../../../primitives" }
diff --git a/node/core/dispute-coordinator/src/db/v1.rs b/node/core/dispute-coordinator/src/db/v1.rs
index 2d14f5151003..f0f17d2325d6 100644
--- a/node/core/dispute-coordinator/src/db/v1.rs
+++ b/node/core/dispute-coordinator/src/db/v1.rs
@@ -52,8 +52,8 @@ const CLEANED_VOTES_WATERMARK_KEY: &[u8; 23] = b"cleaned-votes-watermark";
/// this should not be done at once, but rather in smaller batches so nodes won't get stalled by
/// this.
///
-/// 300 is with session duration of 1 hour and 30 parachains around <3_000_000 key purges in the worst
-/// case. Which is already quite a lot, at the same time we have around 21_000 sessions on
+/// 300 is with session duration of 1 hour and 30 parachains around <3_000_000 key purges in the
+/// worst case. Which is already quite a lot, at the same time we have around 21_000 sessions on
/// Kusama. This means at 300 purged sessions per session, cleaning everything up will take
/// around 3 days. Depending on how severe disk usage becomes, we might want to bump the batch
/// size, at the cost of risking issues at session boundaries (performance).
@@ -346,7 +346,8 @@ pub(crate) fn note_earliest_session(
if pruned_disputes.len() != 0 {
overlay_db.write_recent_disputes(new_recent_disputes);
- // Note: Deleting old candidate votes is handled in `write` based on the earliest session.
+ // Note: Deleting old candidate votes is handled in `write` based on the
+ // earliest session.
}
}
},
diff --git a/node/core/dispute-coordinator/src/import.rs b/node/core/dispute-coordinator/src/import.rs
index 912521834075..0da3723ebf22 100644
--- a/node/core/dispute-coordinator/src/import.rs
+++ b/node/core/dispute-coordinator/src/import.rs
@@ -19,12 +19,12 @@
//! This module encapsulates the actual logic for importing new votes and provides easy access of
//! the current state for votes for a particular candidate.
//!
-//! In particular there is `CandidateVoteState` which tells what can be concluded for a particular set of
-//! votes. E.g. whether a dispute is ongoing, whether it is confirmed, concluded, ..
+//! In particular there is `CandidateVoteState` which tells what can be concluded for a particular
+//! set of votes. E.g. whether a dispute is ongoing, whether it is confirmed, concluded, ..
//!
//! Then there is `ImportResult` which reveals information about what changed once additional votes
-//! got imported on top of an existing `CandidateVoteState` and reveals "dynamic" information, like whether
-//! due to the import a dispute was raised/got confirmed, ...
+//! got imported on top of an existing `CandidateVoteState` and reveals "dynamic" information, like
+//! whether due to the import a dispute was raised/got confirmed, ...
use std::collections::{BTreeMap, HashMap, HashSet};
diff --git a/node/core/dispute-coordinator/src/initialized.rs b/node/core/dispute-coordinator/src/initialized.rs
index 2a1d8fd4b83c..c1d02ef976cb 100644
--- a/node/core/dispute-coordinator/src/initialized.rs
+++ b/node/core/dispute-coordinator/src/initialized.rs
@@ -92,8 +92,8 @@ pub struct InitialData {
pub(crate) struct Initialized {
keystore: Arc,
runtime_info: RuntimeInfo,
- /// This is the highest `SessionIndex` seen via `ActiveLeavesUpdate`. It doesn't matter if it was
- /// cached successfully or not. It is used to detect ancient disputes.
+ /// This is the highest `SessionIndex` seen via `ActiveLeavesUpdate`. It doesn't matter if it
+ /// was cached successfully or not. It is used to detect ancient disputes.
highest_session_seen: SessionIndex,
/// Will be set to `true` if an error occured during the last caching attempt
gaps_in_cache: bool,
@@ -308,8 +308,8 @@ impl Initialized {
Ok(session_idx)
if self.gaps_in_cache || session_idx > self.highest_session_seen =>
{
- // Fetch the last `DISPUTE_WINDOW` number of sessions unless there are no gaps in
- // cache and we are not missing too many `SessionInfo`s
+ // Fetch the last `DISPUTE_WINDOW` number of sessions unless there are no gaps
+ // in cache and we are not missing too many `SessionInfo`s
let mut lower_bound = session_idx.saturating_sub(DISPUTE_WINDOW.get() - 1);
if !self.gaps_in_cache && self.highest_session_seen > lower_bound {
lower_bound = self.highest_session_seen + 1
@@ -1133,8 +1133,8 @@ impl Initialized {
}
// Participate in dispute if we did not cast a vote before and actually have keys to cast a
- // local vote. Disputes should fall in one of the categories below, otherwise we will refrain
- // from participation:
+ // local vote. Disputes should fall in one of the categories below, otherwise we will
+ // refrain from participation:
// - `is_included` lands in prioritised queue
// - `is_confirmed` | `is_backed` lands in best effort queue
// We don't participate in disputes on finalized candidates.
diff --git a/node/core/dispute-coordinator/src/lib.rs b/node/core/dispute-coordinator/src/lib.rs
index 02bb6ef9ecda..a2c500e08e28 100644
--- a/node/core/dispute-coordinator/src/lib.rs
+++ b/node/core/dispute-coordinator/src/lib.rs
@@ -17,12 +17,13 @@
//! Implements the dispute coordinator subsystem.
//!
//! This is the central subsystem of the node-side components which participate in disputes.
-//! This subsystem wraps a database which tracks all statements observed by all validators over some window of sessions.
-//! Votes older than this session window are pruned.
+//! This subsystem wraps a database which tracks all statements observed by all validators over some
+//! window of sessions. Votes older than this session window are pruned.
//!
-//! This subsystem will be the point which produce dispute votes, either positive or negative, based on locally-observed
-//! validation results as well as a sink for votes received by other subsystems. When importing a dispute vote from
-//! another node, this will trigger dispute participation to recover and validate the block.
+//! This subsystem will be the point which produce dispute votes, either positive or negative, based
+//! on locally-observed validation results as well as a sink for votes received by other subsystems.
+//! When importing a dispute vote from another node, this will trigger dispute participation to
+//! recover and validate the block.
use std::{num::NonZeroUsize, sync::Arc};
@@ -92,10 +93,10 @@ mod spam_slots;
/// Handling of participation requests via `Participation`.
///
-/// `Participation` provides an API (`Participation::queue_participation`) for queuing of dispute participations and will process those
-/// participation requests, such that most important/urgent disputes will be resolved and processed
-/// first and more importantly it will order requests in a way so disputes will get resolved, even
-/// if there are lots of them.
+/// `Participation` provides an API (`Participation::queue_participation`) for queuing of dispute
+/// participations and will process those participation requests, such that most important/urgent
+/// disputes will be resolved and processed first and more importantly it will order requests in a
+/// way so disputes will get resolved, even if there are lots of them.
pub(crate) mod participation;
/// Pure processing of vote imports.
diff --git a/node/core/dispute-coordinator/src/participation/queues/mod.rs b/node/core/dispute-coordinator/src/participation/queues/mod.rs
index 4d8ee585ea29..8a4374999f88 100644
--- a/node/core/dispute-coordinator/src/participation/queues/mod.rs
+++ b/node/core/dispute-coordinator/src/participation/queues/mod.rs
@@ -294,8 +294,8 @@ impl Queues {
return Self::pop_impl(&mut self.priority)
}
- // `pop_best_effort` and `pop_priority` do the same but on different `BTreeMap`s. This function has
- // the extracted implementation
+ // `pop_best_effort` and `pop_priority` do the same but on different `BTreeMap`s. This function
+ // has the extracted implementation
fn pop_impl(
target: &mut BTreeMap,
) -> Option<(CandidateComparator, ParticipationRequest)> {
@@ -331,9 +331,10 @@ impl Queues {
#[derive(Copy, Clone)]
#[cfg_attr(test, derive(Debug))]
struct CandidateComparator {
- /// Block number of the relay parent. It's wrapped in an `Option<>` because there are cases when
- /// it can't be obtained. For example when the node is lagging behind and new leaves are received
- /// with a slight delay. Candidates with unknown relay parent are treated with the lowest priority.
+ /// Block number of the relay parent. It's wrapped in an `Option<>` because there are cases
+ /// when it can't be obtained. For example when the node is lagging behind and new leaves are
+ /// received with a slight delay. Candidates with unknown relay parent are treated with the
+ /// lowest priority.
///
/// The order enforced by `CandidateComparator` is important because we want to participate in
/// the oldest disputes first.
@@ -346,9 +347,10 @@ struct CandidateComparator {
/// that is not stable. If a new fork appears after the fact, we would start ordering the same
/// candidate differently, which would result in the same candidate getting queued twice.
relay_parent_block_number: Option,
- /// By adding the `CandidateHash`, we can guarantee a unique ordering across candidates with the
- /// same relay parent block number. Candidates without `relay_parent_block_number` are ordered by
- /// the `candidate_hash` (and treated with the lowest priority, as already mentioned).
+ /// By adding the `CandidateHash`, we can guarantee a unique ordering across candidates with
+ /// the same relay parent block number. Candidates without `relay_parent_block_number` are
+ /// ordered by the `candidate_hash` (and treated with the lowest priority, as already
+ /// mentioned).
candidate_hash: CandidateHash,
}
@@ -364,11 +366,11 @@ impl CandidateComparator {
/// Create a candidate comparator for a given candidate.
///
/// Returns:
- /// - `Ok(CandidateComparator{Some(relay_parent_block_number), candidate_hash})` when the
+ /// - `Ok(CandidateComparator{Some(relay_parent_block_number), candidate_hash})` when the
/// relay parent can be obtained. This is the happy case.
/// - `Ok(CandidateComparator{None, candidate_hash})` in case the candidate's relay parent
/// can't be obtained.
- /// - `FatalError` in case the chain API call fails with an unexpected error.
+ /// - `FatalError` in case the chain API call fails with an unexpected error.
pub async fn new(
sender: &mut impl overseer::DisputeCoordinatorSenderTrait,
candidate: &CandidateReceipt,
diff --git a/node/core/dispute-coordinator/src/participation/queues/tests.rs b/node/core/dispute-coordinator/src/participation/queues/tests.rs
index 8293a935d11a..d4f43639ce87 100644
--- a/node/core/dispute-coordinator/src/participation/queues/tests.rs
+++ b/node/core/dispute-coordinator/src/participation/queues/tests.rs
@@ -44,7 +44,7 @@ fn make_dummy_comparator(
fn clone_request(request: &ParticipationRequest) -> ParticipationRequest {
ParticipationRequest {
candidate_receipt: request.candidate_receipt.clone(),
- candidate_hash: request.candidate_hash.clone(),
+ candidate_hash: request.candidate_hash,
session: request.session,
request_timer: None,
}
@@ -53,8 +53,8 @@ fn clone_request(request: &ParticipationRequest) -> ParticipationRequest {
/// Check that dequeuing acknowledges order.
///
/// Any priority item will be dequeued before any best effort items, priority and best effort with
-/// known parent block number items will be processed in order. Best effort items without known parent
-/// block number should be treated with lowest priority.
+/// known parent block number items will be processed in order. Best effort items without known
+/// parent block number should be treated with lowest priority.
#[test]
fn ordering_works_as_expected() {
let metrics = Metrics::default();
diff --git a/node/core/dispute-coordinator/src/participation/tests.rs b/node/core/dispute-coordinator/src/participation/tests.rs
index ab58db4e7628..32725a3ac658 100644
--- a/node/core/dispute-coordinator/src/participation/tests.rs
+++ b/node/core/dispute-coordinator/src/participation/tests.rs
@@ -305,7 +305,8 @@ fn reqs_get_queued_on_no_recent_block() {
// Responds to messages from the test and verifies its behaviour
let request_handler = async {
- // If we receive `BlockNumber` request this implicitly proves that the participation is queued
+ // If we receive `BlockNumber` request this implicitly proves that the participation is
+ // queued
assert_matches!(
ctx_handle.recv().await,
AllMessages::ChainApi(ChainApiMessage::BlockNumber(_, tx)) => {
diff --git a/node/core/dispute-coordinator/src/scraping/candidates.rs b/node/core/dispute-coordinator/src/scraping/candidates.rs
index 89323907a732..38956700545c 100644
--- a/node/core/dispute-coordinator/src/scraping/candidates.rs
+++ b/node/core/dispute-coordinator/src/scraping/candidates.rs
@@ -98,7 +98,8 @@ mod ref_counted_candidates_tests {
/// Keeps track of scraped candidates. Supports `insert`, `remove_up_to_height` and `contains`
/// operations.
pub struct ScrapedCandidates {
- /// Main data structure which keeps the candidates we know about. `contains` does lookups only here.
+ /// Main data structure which keeps the candidates we know about. `contains` does lookups only
+ /// here.
candidates: RefCountedCandidates,
/// Keeps track at which block number a candidate was inserted. Used in `remove_up_to_height`.
/// Without this tracking we won't be able to remove all candidates before block X.
@@ -117,7 +118,8 @@ impl ScrapedCandidates {
self.candidates.contains(candidate_hash)
}
- // Removes all candidates up to a given height. The candidates at the block height are NOT removed.
+ // Removes all candidates up to a given height. The candidates at the block height are NOT
+ // removed.
pub fn remove_up_to_height(&mut self, height: &BlockNumber) -> HashSet {
let mut candidates_modified: HashSet = HashSet::new();
let not_stale = self.candidates_by_block_number.split_off(&height);
diff --git a/node/core/dispute-coordinator/src/scraping/mod.rs b/node/core/dispute-coordinator/src/scraping/mod.rs
index a1e385b5ff85..f93ad0abab91 100644
--- a/node/core/dispute-coordinator/src/scraping/mod.rs
+++ b/node/core/dispute-coordinator/src/scraping/mod.rs
@@ -120,7 +120,8 @@ impl Inclusions {
) {
for candidate in candidates_modified {
if let Some(blocks_including) = self.inclusions_inner.get_mut(&candidate) {
- // Returns everything after the given key, including the key. This works because the blocks are sorted in ascending order.
+ // Returns everything after the given key, including the key. This works because the
+ // blocks are sorted in ascending order.
*blocks_including = blocks_including.split_off(height);
}
}
@@ -150,8 +151,8 @@ impl Inclusions {
///
/// Concretely:
///
-/// - Monitors for `CandidateIncluded` events to keep track of candidates that have been
-/// included on chains.
+/// - Monitors for `CandidateIncluded` events to keep track of candidates that have been included on
+/// chains.
/// - Monitors for `CandidateBacked` events to keep track of all backed candidates.
/// - Calls `FetchOnChainVotes` for each block to gather potentially missed votes from chain.
///
@@ -294,11 +295,11 @@ impl ChainScraper {
/// Prune finalized candidates.
///
- /// We keep each candidate for `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION` blocks after finalization.
- /// After that we treat it as low priority.
+ /// We keep each candidate for `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION` blocks after
+ /// finalization. After that we treat it as low priority.
pub fn process_finalized_block(&mut self, finalized_block_number: &BlockNumber) {
- // `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION - 1` because `finalized_block_number`counts to the
- // candidate lifetime.
+ // `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION - 1` because
+ // `finalized_block_number`counts to the candidate lifetime.
match finalized_block_number.checked_sub(DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION - 1)
{
Some(key_to_prune) => {
diff --git a/node/core/dispute-coordinator/src/scraping/tests.rs b/node/core/dispute-coordinator/src/scraping/tests.rs
index 57e0731056b7..3dd58a060d70 100644
--- a/node/core/dispute-coordinator/src/scraping/tests.rs
+++ b/node/core/dispute-coordinator/src/scraping/tests.rs
@@ -136,8 +136,7 @@ fn make_candidate_receipt(relay_parent: Hash) -> CandidateReceipt {
para_head: zeros,
validation_code_hash: zeros.into(),
};
- let candidate = CandidateReceipt { descriptor, commitments_hash: zeros };
- candidate
+ CandidateReceipt { descriptor, commitments_hash: zeros }
}
/// Get a dummy `ActivatedLeaf` for a given block number.
@@ -183,7 +182,8 @@ fn get_backed_candidate_event(block_number: BlockNumber) -> Vec
GroupIndex::from(0),
)]
}
-/// Hash for a 'magic' candidate. This is meant to be a special candidate used to verify special cases.
+/// Hash for a 'magic' candidate. This is meant to be a special candidate used to verify special
+/// cases.
fn get_magic_candidate_hash() -> Hash {
BlakeTwo256::hash(&"abc".encode())
}
@@ -425,7 +425,7 @@ fn scraper_requests_candidates_of_non_finalized_ancestors() {
&chain,
finalized_block_number,
BLOCKS_TO_SKIP -
- (finalized_block_number - DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION) as usize, // Expect the provider not to go past finalized block.
+ (finalized_block_number - DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION) as usize, /* Expect the provider not to go past finalized block. */
get_backed_and_included_candidate_events,
);
join(process_active_leaves_update(ctx.sender(), &mut ordering, next_update), overseer_fut)
@@ -468,7 +468,8 @@ fn scraper_prunes_finalized_candidates() {
let candidate = make_candidate_receipt(get_block_number_hash(TEST_TARGET_BLOCK_NUMBER));
- // After `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION` blocks the candidate should be removed
+ // After `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION` blocks the candidate should be
+ // removed
finalized_block_number =
TEST_TARGET_BLOCK_NUMBER + DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION;
process_finalized_block(&mut scraper, &finalized_block_number);
@@ -518,8 +519,9 @@ fn scraper_handles_backed_but_not_included_candidate() {
finalized_block_number += 1;
process_finalized_block(&mut scraper, &finalized_block_number);
- // `FIRST_TEST_BLOCK` is finalized, which is within `BACKED_CANDIDATE_LIFETIME_AFTER_FINALIZATION` window.
- // The candidate should still be backed.
+ // `FIRST_TEST_BLOCK` is finalized, which is within
+ // `BACKED_CANDIDATE_LIFETIME_AFTER_FINALIZATION` window. The candidate should still be
+ // backed.
let candidate = make_candidate_receipt(get_block_number_hash(TEST_TARGET_BLOCK_NUMBER));
assert!(!scraper.is_candidate_included(&candidate.hash()));
assert!(scraper.is_candidate_backed(&candidate.hash()));
@@ -576,7 +578,8 @@ fn scraper_handles_the_same_candidate_incuded_in_two_different_block_heights() {
.await;
// Finalize blocks to enforce pruning of scraped events.
- // The magic candidate was added twice, so it shouldn't be removed if we finalize two more blocks.
+ // The magic candidate was added twice, so it shouldn't be removed if we finalize two more
+ // blocks.
finalized_block_number = test_targets.first().expect("there are two block nums") +
DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION;
process_finalized_block(&mut scraper, &finalized_block_number);
@@ -641,7 +644,8 @@ fn inclusions_per_candidate_properly_adds_and_prunes() {
])
);
- // After `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION` blocks the earlier inclusion should be removed
+ // After `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION` blocks the earlier inclusion should
+ // be removed
finalized_block_number =
TEST_TARGET_BLOCK_NUMBER + DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION;
process_finalized_block(&mut scraper, &finalized_block_number);
diff --git a/node/core/dispute-coordinator/src/tests.rs b/node/core/dispute-coordinator/src/tests.rs
index f2590aea1511..75eae8200dc6 100644
--- a/node/core/dispute-coordinator/src/tests.rs
+++ b/node/core/dispute-coordinator/src/tests.rs
@@ -399,10 +399,10 @@ impl TestState {
let mut response = Vec::new();
for i in target_header.number.saturating_sub(k as u32)..target_header.number {
response.push(
- self.block_num_to_header
+ *self
+ .block_num_to_header
.get(&i)
- .expect("headers and block_num_to_header should always be in sync")
- .clone(),
+ .expect("headers and block_num_to_header should always be in sync"),
);
}
let _ = response_channel.send(Ok(response));
@@ -552,7 +552,7 @@ impl TestState {
let (ctx, ctx_handle) = make_buffered_subsystem_context(TaskExecutor::new(), 1);
let subsystem = DisputeCoordinatorSubsystem::new(
self.db.clone(),
- self.config.clone(),
+ self.config,
self.subsystem_keystore.clone(),
Metrics::default(),
);
@@ -574,27 +574,27 @@ where
// Add two more blocks after the genesis (which is created in `default()`)
let h1 = Header {
- parent_hash: test_state.last_block.clone(),
+ parent_hash: test_state.last_block,
number: 1,
digest: dummy_digest(),
state_root: dummy_hash(),
extrinsics_root: dummy_hash(),
};
let h1_hash = h1.hash();
- test_state.headers.insert(h1_hash.clone(), h1);
- test_state.block_num_to_header.insert(1, h1_hash.clone());
+ test_state.headers.insert(h1_hash, h1);
+ test_state.block_num_to_header.insert(1, h1_hash);
test_state.last_block = h1_hash;
let h2 = Header {
- parent_hash: test_state.last_block.clone(),
+ parent_hash: test_state.last_block,
number: 2,
digest: dummy_digest(),
state_root: dummy_hash(),
extrinsics_root: dummy_hash(),
};
let h2_hash = h2.hash();
- test_state.headers.insert(h2_hash.clone(), h2);
- test_state.block_num_to_header.insert(2, h2_hash.clone());
+ test_state.headers.insert(h2_hash, h2);
+ test_state.block_num_to_header.insert(2, h2_hash);
test_state.last_block = h2_hash;
test_state.resume(test)
@@ -734,8 +734,9 @@ fn too_many_unconfirmed_statements_are_considered_spam() {
.await;
// Participation has to fail here, otherwise the dispute will be confirmed. However
- // participation won't happen at all because the dispute is neither backed, not confirmed
- // nor the candidate is included. Or in other words - we'll refrain from participation.
+ // participation won't happen at all because the dispute is neither backed, not
+ // confirmed nor the candidate is included. Or in other words - we'll refrain from
+ // participation.
{
let (tx, rx) = oneshot::channel();
@@ -2050,7 +2051,8 @@ fn concluded_supermajority_against_non_active_after_time() {
ImportStatementsResult::ValidImport => {}
);
- // Use a different expected commitments hash to ensure the candidate validation returns invalid.
+ // Use a different expected commitments hash to ensure the candidate validation returns
+ // invalid.
participation_with_distribution(
&mut virtual_overseer,
&candidate_hash,
@@ -2351,7 +2353,8 @@ fn resume_dispute_with_local_statement() {
assert_eq!(messages.len(), 1, "A message should have gone out.");
- // Assert that subsystem is not sending Participation messages because we issued a local statement
+ // Assert that subsystem is not sending Participation messages because we issued a local
+ // statement
assert!(virtual_overseer.recv().timeout(TEST_TIMEOUT).await.is_none());
virtual_overseer.send(FromOrchestra::Signal(OverseerSignal::Conclude)).await;
@@ -2445,7 +2448,8 @@ fn resume_dispute_without_local_statement_or_local_key() {
Box::pin(async move {
test_state.handle_resume_sync(&mut virtual_overseer, session).await;
- // Assert that subsystem is not sending Participation messages because we issued a local statement
+ // Assert that subsystem is not sending Participation messages because we issued a
+ // local statement
assert!(virtual_overseer.recv().timeout(TEST_TIMEOUT).await.is_none());
virtual_overseer.send(FromOrchestra::Signal(OverseerSignal::Conclude)).await;
@@ -2751,7 +2755,8 @@ fn redundant_votes_ignored() {
}
#[test]
-/// Make sure no disputes are recorded when there are no opposing votes, even if we reached supermajority.
+/// Make sure no disputes are recorded when there are no opposing votes, even if we reached
+/// supermajority.
fn no_onesided_disputes() {
test_harness(|mut test_state, mut virtual_overseer| {
Box::pin(async move {
@@ -3124,16 +3129,17 @@ fn participation_requests_reprioritized_for_newly_included() {
candidate_receipt.descriptor.pov_hash = Hash::from(
[repetition; 32], // Altering this receipt so its hash will be changed
);
- // Set consecutive parents (starting from zero). They will order the candidates for participation.
+ // Set consecutive parents (starting from zero). They will order the candidates for
+ // participation.
let parent_block_num: BlockNumber = repetition as BlockNumber - 1;
candidate_receipt.descriptor.relay_parent =
- test_state.block_num_to_header.get(&parent_block_num).unwrap().clone();
+ *test_state.block_num_to_header.get(&parent_block_num).unwrap();
receipts.push(candidate_receipt.clone());
}
- // Mark all candidates as backed, so their participation requests make it to best effort.
- // These calls must all occur before including the candidates due to test overseer
- // oddities.
+ // Mark all candidates as backed, so their participation requests make it to best
+ // effort. These calls must all occur before including the candidates due to test
+ // overseer oddities.
let mut candidate_events = Vec::new();
for r in receipts.iter() {
candidate_events.push(make_candidate_backed_event(r.clone()))
@@ -3172,7 +3178,8 @@ fn participation_requests_reprioritized_for_newly_included() {
.await;
// Handle corresponding messages to unblock import
- // we need to handle `ApprovalVotingMessage::GetApprovalSignaturesForCandidate` for import
+ // we need to handle `ApprovalVotingMessage::GetApprovalSignaturesForCandidate` for
+ // import
handle_approval_vote_request(
&mut virtual_overseer,
&candidate_hash,
@@ -3180,8 +3187,9 @@ fn participation_requests_reprioritized_for_newly_included() {
)
.await;
- // We'll trigger participation for the first `MAX_PARALLEL_PARTICIPATIONS` candidates.
- // The rest will be queued => we need to handle `ChainApiMessage::BlockNumber` for them.
+ // We'll trigger participation for the first `MAX_PARALLEL_PARTICIPATIONS`
+ // candidates. The rest will be queued => we need to handle
+ // `ChainApiMessage::BlockNumber` for them.
if idx >= crate::participation::MAX_PARALLEL_PARTICIPATIONS {
// We send the `idx` as parent block number, because it is used for ordering.
// This way we get predictable ordering and participation.
@@ -3201,11 +3209,13 @@ fn participation_requests_reprioritized_for_newly_included() {
)
.await;
- // NB: The checks below are a bit racy. In theory candidate 2 can be processed even before candidate 0 and this is okay. If any
- // of the asserts in the two functions after this comment fail -> rework `participation_with_distribution` to expect a set of
+ // NB: The checks below are a bit racy. In theory candidate 2 can be processed even
+ // before candidate 0 and this is okay. If any of the asserts in the two functions after
+ // this comment fail -> rework `participation_with_distribution` to expect a set of
// commitment hashes instead of just one.
- // This is the candidate for which participation was started initially (`MAX_PARALLEL_PARTICIPATIONS` threshold was not yet hit)
+ // This is the candidate for which participation was started initially
+ // (`MAX_PARALLEL_PARTICIPATIONS` threshold was not yet hit)
participation_with_distribution(
&mut virtual_overseer,
&receipts.get(0).expect("There is more than one candidate").hash(),
@@ -3326,7 +3336,8 @@ fn informs_chain_selection_when_dispute_concluded_against() {
ImportStatementsResult::ValidImport => {}
);
- // Use a different expected commitments hash to ensure the candidate validation returns invalid.
+ // Use a different expected commitments hash to ensure the candidate validation returns
+ // invalid.
participation_with_distribution(
&mut virtual_overseer,
&candidate_hash,
@@ -3440,7 +3451,8 @@ fn session_info_is_requested_only_once() {
test_state.handle_resume_sync(&mut virtual_overseer, session).await;
- // This leaf activation shouldn't fetch `SessionInfo` because the session is already cached
+ // This leaf activation shouldn't fetch `SessionInfo` because the session is already
+ // cached
test_state
.activate_leaf_at_session(
&mut virtual_overseer,
@@ -3475,8 +3487,8 @@ fn session_info_is_requested_only_once() {
});
}
-// Big jump means the new session we see with a leaf update is at least a `DISPUTE_WINDOW` bigger than
-// the already known one. In this case The whole `DISPUTE_WINDOW` should be fetched.
+// Big jump means the new session we see with a leaf update is at least a `DISPUTE_WINDOW` bigger
+// than the already known one. In this case The whole `DISPUTE_WINDOW` should be fetched.
#[test]
fn session_info_big_jump_works() {
test_harness(|mut test_state, mut virtual_overseer| {
@@ -3485,7 +3497,8 @@ fn session_info_big_jump_works() {
test_state.handle_resume_sync(&mut virtual_overseer, session_on_startup).await;
- // This leaf activation shouldn't fetch `SessionInfo` because the session is already cached
+ // This leaf activation shouldn't fetch `SessionInfo` because the session is already
+ // cached
test_state
.activate_leaf_at_session(
&mut virtual_overseer,
@@ -3525,8 +3538,8 @@ fn session_info_big_jump_works() {
});
}
-// Small jump means the new session we see with a leaf update is at less than last known one + `DISPUTE_WINDOW`. In this
-// case fetching should start from last known one + 1.
+// Small jump means the new session we see with a leaf update is at less than last known one +
+// `DISPUTE_WINDOW`. In this case fetching should start from last known one + 1.
#[test]
fn session_info_small_jump_works() {
test_harness(|mut test_state, mut virtual_overseer| {
@@ -3535,7 +3548,8 @@ fn session_info_small_jump_works() {
test_state.handle_resume_sync(&mut virtual_overseer, session_on_startup).await;
- // This leaf activation shouldn't fetch `SessionInfo` because the session is already cached
+ // This leaf activation shouldn't fetch `SessionInfo` because the session is already
+ // cached
test_state
.activate_leaf_at_session(
&mut virtual_overseer,
diff --git a/node/core/parachains-inherent/Cargo.toml b/node/core/parachains-inherent/Cargo.toml
index d4301cb22270..fdf785fbe66b 100644
--- a/node/core/parachains-inherent/Cargo.toml
+++ b/node/core/parachains-inherent/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-parachains-inherent"
version.workspace = true
authors.workspace = true
edition.workspace = true
+license.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/parachains-inherent/src/lib.rs b/node/core/parachains-inherent/src/lib.rs
index f27481ee5a7d..3063147fb136 100644
--- a/node/core/parachains-inherent/src/lib.rs
+++ b/node/core/parachains-inherent/src/lib.rs
@@ -16,11 +16,12 @@
//! The parachain inherent data provider
//!
-//! Parachain backing and approval is an off-chain process, but the parachain needs to progress on chain as well. To
-//! make it progress on chain a block producer needs to forward information about the state of a parachain to the
-//! runtime. This information is forwarded through an inherent to the runtime. Here we provide the
-//! [`ParachainInherentDataProvider`] that requests the relevant data from the provisioner subsystem and creates the
-//! the inherent data that the runtime will use to create an inherent.
+//! Parachain backing and approval is an off-chain process, but the parachain needs to progress on
+//! chain as well. To make it progress on chain a block producer needs to forward information about
+//! the state of a parachain to the runtime. This information is forwarded through an inherent to
+//! the runtime. Here we provide the [`ParachainInherentDataProvider`] that requests the relevant
+//! data from the provisioner subsystem and creates the the inherent data that the runtime will use
+//! to create an inherent.
#![deny(unused_crate_dependencies, unused_results)]
diff --git a/node/core/prospective-parachains/Cargo.toml b/node/core/prospective-parachains/Cargo.toml
new file mode 100644
index 000000000000..8afd0e4e8d17
--- /dev/null
+++ b/node/core/prospective-parachains/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "polkadot-node-core-prospective-parachains"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[dependencies]
+futures = "0.3.19"
+gum = { package = "tracing-gum", path = "../../gum" }
+parity-scale-codec = "3.6.4"
+thiserror = "1.0.30"
+fatality = "0.0.6"
+bitvec = "1"
+
+polkadot-primitives = { path = "../../../primitives" }
+polkadot-node-primitives = { path = "../../primitives" }
+polkadot-node-subsystem = { path = "../../subsystem" }
+polkadot-node-subsystem-util = { path = "../../subsystem-util" }
+
+[dev-dependencies]
+assert_matches = "1"
+polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
+polkadot-node-subsystem-types = { path = "../../subsystem-types" }
+polkadot-primitives-test-helpers = { path = "../../../primitives/test-helpers" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/node/core/prospective-parachains/src/error.rs b/node/core/prospective-parachains/src/error.rs
new file mode 100644
index 000000000000..0ad98d1ff908
--- /dev/null
+++ b/node/core/prospective-parachains/src/error.rs
@@ -0,0 +1,87 @@
+// Copyright 2022 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot. If not, see .
+
+//! Error types.
+
+use futures::channel::oneshot;
+
+use polkadot_node_subsystem::{
+ errors::{ChainApiError, RuntimeApiError},
+ SubsystemError,
+};
+use polkadot_node_subsystem_util::runtime;
+
+use crate::LOG_TARGET;
+use fatality::Nested;
+
+#[allow(missing_docs)]
+#[fatality::fatality(splitable)]
+pub enum Error {
+ #[fatal]
+ #[error("SubsystemError::Context error: {0}")]
+ SubsystemContext(String),
+
+ #[fatal]
+ #[error("Spawning a task failed: {0}")]
+ SpawnFailed(SubsystemError),
+
+ #[fatal]
+ #[error("Participation worker receiver exhausted.")]
+ ParticipationWorkerReceiverExhausted,
+
+ #[fatal]
+ #[error("Receiving message from overseer failed: {0}")]
+ SubsystemReceive(#[source] SubsystemError),
+
+ #[error("Error while accessing runtime information")]
+ Runtime(#[from] runtime::Error),
+
+ #[error(transparent)]
+ RuntimeApi(#[from] RuntimeApiError),
+
+ #[error(transparent)]
+ ChainApi(#[from] ChainApiError),
+
+ #[error(transparent)]
+ Subsystem(SubsystemError),
+
+ #[error("Request to chain API subsystem dropped")]
+ ChainApiRequestCanceled(oneshot::Canceled),
+
+ #[error("Request to runtime API subsystem dropped")]
+ RuntimeApiRequestCanceled(oneshot::Canceled),
+}
+
+/// General `Result` type.
+pub type Result = std::result::Result;
+/// Result for non-fatal only failures.
+pub type JfyiErrorResult = std::result::Result;
+/// Result for fatal only failures.
+pub type FatalResult = std::result::Result;
+
+/// Utility for eating top level errors and log them.
+///
+/// We basically always want to try and continue on error. This utility function is meant to
+/// consume top-level errors by simply logging them
+pub fn log_error(result: Result<()>, ctx: &'static str) -> FatalResult<()> {
+ match result.into_nested()? {
+ Ok(()) => Ok(()),
+ Err(jfyi) => {
+ gum::debug!(target: LOG_TARGET, error = ?jfyi, ctx);
+ Ok(())
+ },
+ }
+}
diff --git a/node/core/prospective-parachains/src/fragment_tree.rs b/node/core/prospective-parachains/src/fragment_tree.rs
new file mode 100644
index 000000000000..ec06f2d6070e
--- /dev/null
+++ b/node/core/prospective-parachains/src/fragment_tree.rs
@@ -0,0 +1,1991 @@
+// Copyright 2022 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot. If not, see .
+
+//! A tree utility for managing parachain fragments not referenced by the relay-chain.
+//!
+//! # Overview
+//!
+//! This module exposes two main types: [`FragmentTree`] and [`CandidateStorage`] which are meant to
+//! be used in close conjunction. Each fragment tree is associated with a particular relay-parent
+//! and each node in the tree represents a candidate. Each parachain has a single candidate storage,
+//! but can have multiple trees for each relay chain block in the view.
+//!
+//! A tree has an associated [`Scope`] which defines limits on candidates within the tree.
+//! Candidates themselves have their own [`Constraints`] which are either the constraints from the
+//! scope, or, if there are previous nodes in the tree, a modified version of the previous
+//! candidate's constraints.
+//!
+//! This module also makes use of types provided by the Inclusion Emulator module, such as
+//! [`Fragment`] and [`Constraints`]. These perform the actual job of checking for validity of
+//! prospective fragments.
+//!
+//! # Usage
+//!
+//! It's expected that higher-level code will have a tree for each relay-chain block which might
+//! reasonably have blocks built upon it.
+//!
+//! Because a para only has a single candidate storage, trees only store indices into the storage.
+//! The storage is meant to be pruned when trees are dropped by higher-level code.
+//!
+//! # Cycles
+//!
+//! Nodes do not uniquely refer to a parachain block for two reasons.
+//! 1. There's no requirement that head-data is unique for a parachain. Furthermore, a parachain
+//! is under no obligation to be acyclic, and this is mostly just because it's totally
+//! inefficient to enforce it. Practical use-cases are acyclic, but there is still more than
+//! one way to reach the same head-data.
+//! 2. and candidates only refer to their parent by its head-data. This whole issue could be
+//! resolved by having candidates reference their parent by candidate hash.
+//!
+//! The implication is that when we receive a candidate receipt, there are actually multiple
+//! possibilities for any candidates between the para-head recorded in the relay parent's state
+//! and the candidate in question.
+//!
+//! This means that our candidates need to handle multiple parents and that depth is an
+//! attribute of a node in a tree, not a candidate. Put another way, the same candidate might
+//! have different depths in different parts of the tree.
+//!
+//! As an extreme example, a candidate which produces head-data which is the same as its parent
+//! can correspond to multiple nodes within the same [`FragmentTree`]. Such cycles are bounded
+//! by the maximum depth allowed by the tree. An example with `max_depth: 4`:
+//!
+//! ```text
+//! committed head
+//! |
+//! depth 0: head_a
+//! |
+//! depth 1: head_b
+//! |
+//! depth 2: head_a
+//! |
+//! depth 3: head_b
+//! |
+//! depth 4: head_a
+//! ```
+//!
+//! As long as the [`CandidateStorage`] has bounded input on the number of candidates supplied,
+//! [`FragmentTree`] complexity is bounded. This means that higher-level code needs to be selective
+//! about limiting the amount of candidates that are considered.
+//!
+//! The code in this module is not designed for speed or efficiency, but conceptual simplicity.
+//! Our assumption is that the amount of candidates and parachains we consider will be reasonably
+//! bounded and in practice will not exceed a few thousand at any time. This naive implementation
+//! will still perform fairly well under these conditions, despite being somewhat wasteful of
+//! memory.
+
+use std::{
+ borrow::Cow,
+ collections::{
+ hash_map::{Entry, HashMap},
+ BTreeMap, HashSet,
+ },
+};
+
+use super::LOG_TARGET;
+use bitvec::prelude::*;
+use polkadot_node_subsystem_util::inclusion_emulator::staging::{
+ ConstraintModifications, Constraints, Fragment, ProspectiveCandidate, RelayChainBlockInfo,
+};
+use polkadot_primitives::vstaging::{
+ BlockNumber, CandidateHash, CommittedCandidateReceipt, Hash, HeadData, Id as ParaId,
+ PersistedValidationData,
+};
+
+/// Kinds of failures to import a candidate into storage.
+#[derive(Debug, Clone, PartialEq)]
+pub enum CandidateStorageInsertionError {
+ /// An error indicating that a supplied candidate didn't match the persisted
+ /// validation data provided alongside it.
+ PersistedValidationDataMismatch,
+ /// The candidate was already known.
+ CandidateAlreadyKnown(CandidateHash),
+}
+
+/// Stores candidates and information about them such as their relay-parents and their backing
+/// states.
+pub(crate) struct CandidateStorage {
+ // Index from head data hash to candidate hashes with that head data as a parent.
+ by_parent_head: HashMap>,
+
+ // Index from head data hash to candidate hashes outputting that head data.
+ by_output_head: HashMap>,
+
+ // Index from candidate hash to fragment node.
+ by_candidate_hash: HashMap,
+}
+
+impl CandidateStorage {
+ /// Create a new `CandidateStorage`.
+ pub fn new() -> Self {
+ CandidateStorage {
+ by_parent_head: HashMap::new(),
+ by_output_head: HashMap::new(),
+ by_candidate_hash: HashMap::new(),
+ }
+ }
+
+ /// Introduce a new candidate.
+ pub fn add_candidate(
+ &mut self,
+ candidate: CommittedCandidateReceipt,
+ persisted_validation_data: PersistedValidationData,
+ ) -> Result {
+ let candidate_hash = candidate.hash();
+
+ if self.by_candidate_hash.contains_key(&candidate_hash) {
+ return Err(CandidateStorageInsertionError::CandidateAlreadyKnown(candidate_hash))
+ }
+
+ if persisted_validation_data.hash() != candidate.descriptor.persisted_validation_data_hash {
+ return Err(CandidateStorageInsertionError::PersistedValidationDataMismatch)
+ }
+
+ let parent_head_hash = persisted_validation_data.parent_head.hash();
+ let output_head_hash = candidate.commitments.head_data.hash();
+ let entry = CandidateEntry {
+ candidate_hash,
+ relay_parent: candidate.descriptor.relay_parent,
+ state: CandidateState::Introduced,
+ candidate: ProspectiveCandidate {
+ commitments: Cow::Owned(candidate.commitments),
+ collator: candidate.descriptor.collator,
+ collator_signature: candidate.descriptor.signature,
+ persisted_validation_data,
+ pov_hash: candidate.descriptor.pov_hash,
+ validation_code_hash: candidate.descriptor.validation_code_hash,
+ },
+ };
+
+ self.by_parent_head.entry(parent_head_hash).or_default().insert(candidate_hash);
+ self.by_output_head.entry(output_head_hash).or_default().insert(candidate_hash);
+ // sanity-checked already.
+ self.by_candidate_hash.insert(candidate_hash, entry);
+
+ Ok(candidate_hash)
+ }
+
+ /// Remove a candidate from the store.
+ pub fn remove_candidate(&mut self, candidate_hash: &CandidateHash) {
+ if let Some(entry) = self.by_candidate_hash.remove(candidate_hash) {
+ let parent_head_hash = entry.candidate.persisted_validation_data.parent_head.hash();
+ if let Entry::Occupied(mut e) = self.by_parent_head.entry(parent_head_hash) {
+ e.get_mut().remove(&candidate_hash);
+ if e.get().is_empty() {
+ e.remove();
+ }
+ }
+ }
+ }
+
+ /// Note that an existing candidate has been seconded.
+ pub fn mark_seconded(&mut self, candidate_hash: &CandidateHash) {
+ if let Some(entry) = self.by_candidate_hash.get_mut(candidate_hash) {
+ if entry.state != CandidateState::Backed {
+ entry.state = CandidateState::Seconded;
+ }
+ }
+ }
+
+ /// Note that an existing candidate has been backed.
+ pub fn mark_backed(&mut self, candidate_hash: &CandidateHash) {
+ if let Some(entry) = self.by_candidate_hash.get_mut(candidate_hash) {
+ entry.state = CandidateState::Backed;
+ }
+ }
+
+ /// Whether a candidate is recorded as being backed.
+ pub fn is_backed(&self, candidate_hash: &CandidateHash) -> bool {
+ self.by_candidate_hash
+ .get(candidate_hash)
+ .map_or(false, |e| e.state == CandidateState::Backed)
+ }
+
+ /// Whether a candidate is contained within the storage already.
+ pub fn contains(&self, candidate_hash: &CandidateHash) -> bool {
+ self.by_candidate_hash.contains_key(candidate_hash)
+ }
+
+ /// Retain only candidates which pass the predicate.
+ pub(crate) fn retain(&mut self, pred: impl Fn(&CandidateHash) -> bool) {
+ self.by_candidate_hash.retain(|h, _v| pred(h));
+ self.by_parent_head.retain(|_parent, children| {
+ children.retain(|h| pred(h));
+ !children.is_empty()
+ });
+ self.by_output_head.retain(|_output, candidates| {
+ candidates.retain(|h| pred(h));
+ !candidates.is_empty()
+ });
+ }
+
+ /// Get head-data by hash.
+ pub(crate) fn head_data_by_hash(&self, hash: &Hash) -> Option<&HeadData> {
+ // First, search for candidates outputting this head data and extract the head data
+ // from their commitments if they exist.
+ //
+ // Otherwise, search for candidates building upon this head data and extract the head data
+ // from their persisted validation data if they exist.
+ self.by_output_head
+ .get(hash)
+ .and_then(|m| m.iter().next())
+ .and_then(|a_candidate| self.by_candidate_hash.get(a_candidate))
+ .map(|e| &e.candidate.commitments.head_data)
+ .or_else(|| {
+ self.by_parent_head
+ .get(hash)
+ .and_then(|m| m.iter().next())
+ .and_then(|a_candidate| self.by_candidate_hash.get(a_candidate))
+ .map(|e| &e.candidate.persisted_validation_data.parent_head)
+ })
+ }
+
+ /// Returns candidate's relay parent, if present.
+ pub(crate) fn relay_parent_by_candidate_hash(
+ &self,
+ candidate_hash: &CandidateHash,
+ ) -> Option {
+ self.by_candidate_hash.get(candidate_hash).map(|entry| entry.relay_parent)
+ }
+
+ fn iter_para_children<'a>(
+ &'a self,
+ parent_head_hash: &Hash,
+ ) -> impl Iterator
- + 'a {
+ let by_candidate_hash = &self.by_candidate_hash;
+ self.by_parent_head
+ .get(parent_head_hash)
+ .into_iter()
+ .flat_map(|hashes| hashes.iter())
+ .filter_map(move |h| by_candidate_hash.get(h))
+ }
+
+ fn get(&'_ self, candidate_hash: &CandidateHash) -> Option<&'_ CandidateEntry> {
+ self.by_candidate_hash.get(candidate_hash)
+ }
+
+ #[cfg(test)]
+ pub fn len(&self) -> (usize, usize) {
+ (self.by_parent_head.len(), self.by_candidate_hash.len())
+ }
+}
+
+/// The state of a candidate.
+///
+/// Candidates aren't even considered until they've at least been seconded.
+#[derive(Debug, PartialEq)]
+enum CandidateState {
+ /// The candidate has been introduced in a spam-protected way but
+ /// is not necessarily backed.
+ Introduced,
+ /// The candidate has been seconded.
+ Seconded,
+ /// The candidate has been completely backed by the group.
+ Backed,
+}
+
+#[derive(Debug)]
+struct CandidateEntry {
+ candidate_hash: CandidateHash,
+ relay_parent: Hash,
+ candidate: ProspectiveCandidate<'static>,
+ state: CandidateState,
+}
+
+/// A candidate existing on-chain but pending availability, for special treatment
+/// in the [`Scope`].
+#[derive(Debug, Clone)]
+pub(crate) struct PendingAvailability {
+ /// The candidate hash.
+ pub candidate_hash: CandidateHash,
+ /// The block info of the relay parent.
+ pub relay_parent: RelayChainBlockInfo,
+}
+
+/// The scope of a [`FragmentTree`].
+#[derive(Debug)]
+pub(crate) struct Scope {
+ para: ParaId,
+ relay_parent: RelayChainBlockInfo,
+ ancestors: BTreeMap,
+ ancestors_by_hash: HashMap,
+ pending_availability: Vec,
+ base_constraints: Constraints,
+ max_depth: usize,
+}
+
+/// An error variant indicating that ancestors provided to a scope
+/// had unexpected order.
+#[derive(Debug)]
+pub struct UnexpectedAncestor {
+ /// The block number that this error occurred at.
+ pub number: BlockNumber,
+ /// The previous seen block number, which did not match `number`.
+ pub prev: BlockNumber,
+}
+
+impl Scope {
+ /// Define a new [`Scope`].
+ ///
+ /// All arguments are straightforward except the ancestors.
+ ///
+ /// Ancestors should be in reverse order, starting with the parent
+ /// of the `relay_parent`, and proceeding backwards in block number
+ /// increments of 1. Ancestors not following these conditions will be
+ /// rejected.
+ ///
+ /// This function will only consume ancestors up to the `min_relay_parent_number` of
+ /// the `base_constraints`.
+ ///
+ /// Only ancestors whose children have the same session as the relay-parent's
+ /// children should be provided.
+ ///
+ /// It is allowed to provide zero ancestors.
+ pub fn with_ancestors(
+ para: ParaId,
+ relay_parent: RelayChainBlockInfo,
+ base_constraints: Constraints,
+ pending_availability: Vec,
+ max_depth: usize,
+ ancestors: impl IntoIterator
- ,
+ ) -> Result {
+ let mut ancestors_map = BTreeMap::new();
+ let mut ancestors_by_hash = HashMap::new();
+ {
+ let mut prev = relay_parent.number;
+ for ancestor in ancestors {
+ if prev == 0 {
+ return Err(UnexpectedAncestor { number: ancestor.number, prev })
+ } else if ancestor.number != prev - 1 {
+ return Err(UnexpectedAncestor { number: ancestor.number, prev })
+ } else if prev == base_constraints.min_relay_parent_number {
+ break
+ } else {
+ prev = ancestor.number;
+ ancestors_by_hash.insert(ancestor.hash, ancestor.clone());
+ ancestors_map.insert(ancestor.number, ancestor);
+ }
+ }
+ }
+
+ Ok(Scope {
+ para,
+ relay_parent,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ ancestors: ancestors_map,
+ ancestors_by_hash,
+ })
+ }
+
+ /// Get the earliest relay-parent allowed in the scope of the fragment tree.
+ pub fn earliest_relay_parent(&self) -> RelayChainBlockInfo {
+ self.ancestors
+ .iter()
+ .next()
+ .map(|(_, v)| v.clone())
+ .unwrap_or_else(|| self.relay_parent.clone())
+ }
+
+ /// Get the ancestor of the fragment tree by hash.
+ pub fn ancestor_by_hash(&self, hash: &Hash) -> Option {
+ if hash == &self.relay_parent.hash {
+ return Some(self.relay_parent.clone())
+ }
+
+ self.ancestors_by_hash.get(hash).map(|info| info.clone())
+ }
+
+ /// Whether the candidate in question is one pending availability in this scope.
+ pub fn get_pending_availability(
+ &self,
+ candidate_hash: &CandidateHash,
+ ) -> Option<&PendingAvailability> {
+ self.pending_availability.iter().find(|c| &c.candidate_hash == candidate_hash)
+ }
+
+ /// Get the base constraints of the scope
+ pub fn base_constraints(&self) -> &Constraints {
+ &self.base_constraints
+ }
+}
+
+/// We use indices into a flat vector to refer to nodes in the tree.
+/// Every tree also has an implicit root.
+#[derive(Debug, Clone, Copy, PartialEq)]
+enum NodePointer {
+ Root,
+ Storage(usize),
+}
+
+/// A hypothetical candidate, which may or may not exist in
+/// the fragment tree already.
+pub(crate) enum HypotheticalCandidate<'a> {
+ Complete {
+ receipt: Cow<'a, CommittedCandidateReceipt>,
+ persisted_validation_data: Cow<'a, PersistedValidationData>,
+ },
+ Incomplete {
+ relay_parent: Hash,
+ parent_head_data_hash: Hash,
+ },
+}
+
+impl<'a> HypotheticalCandidate<'a> {
+ fn parent_head_data_hash(&self) -> Hash {
+ match *self {
+ HypotheticalCandidate::Complete { ref persisted_validation_data, .. } =>
+ persisted_validation_data.as_ref().parent_head.hash(),
+ HypotheticalCandidate::Incomplete { ref parent_head_data_hash, .. } =>
+ *parent_head_data_hash,
+ }
+ }
+
+ fn relay_parent(&self) -> Hash {
+ match *self {
+ HypotheticalCandidate::Complete { ref receipt, .. } =>
+ receipt.descriptor().relay_parent,
+ HypotheticalCandidate::Incomplete { ref relay_parent, .. } => *relay_parent,
+ }
+ }
+}
+
+/// This is a tree of candidates based on some underlying storage of candidates and a scope.
+///
+/// All nodes in the tree must be either pending availability or within the scope. Within the scope
+/// means it's built off of the relay-parent or an ancestor.
+pub(crate) struct FragmentTree {
+ scope: Scope,
+
+ // Invariant: a contiguous prefix of the 'nodes' storage will contain
+ // the top-level children.
+ nodes: Vec,
+
+ // The candidates stored in this tree, mapped to a bitvec indicating the depths
+ // where the candidate is stored.
+ candidates: HashMap>,
+}
+
+impl FragmentTree {
+ /// Create a new [`FragmentTree`] with given scope and populated from the storage.
+ ///
+ /// Can be populated recursively (i.e. `populate` will pick up candidates that build on other
+ /// candidates).
+ pub fn populate(scope: Scope, storage: &CandidateStorage) -> Self {
+ gum::trace!(
+ target: LOG_TARGET,
+ relay_parent = ?scope.relay_parent.hash,
+ relay_parent_num = scope.relay_parent.number,
+ para_id = ?scope.para,
+ ancestors = scope.ancestors.len(),
+ "Instantiating Fragment Tree",
+ );
+
+ let mut tree = FragmentTree { scope, nodes: Vec::new(), candidates: HashMap::new() };
+
+ tree.populate_from_bases(storage, vec![NodePointer::Root]);
+
+ tree
+ }
+
+ /// Get the scope of the Fragment Tree.
+ pub fn scope(&self) -> &Scope {
+ &self.scope
+ }
+
+ // Inserts a node and updates child references in a non-root parent.
+ fn insert_node(&mut self, node: FragmentNode) {
+ let pointer = NodePointer::Storage(self.nodes.len());
+ let parent_pointer = node.parent;
+ let candidate_hash = node.candidate_hash;
+
+ let max_depth = self.scope.max_depth;
+
+ self.candidates
+ .entry(candidate_hash)
+ .or_insert_with(|| bitvec![u16, Msb0; 0; max_depth + 1])
+ .set(node.depth, true);
+
+ match parent_pointer {
+ NodePointer::Storage(ptr) => {
+ self.nodes.push(node);
+ self.nodes[ptr].children.push((pointer, candidate_hash))
+ },
+ NodePointer::Root => {
+ // Maintain the invariant of node storage beginning with depth-0.
+ if self.nodes.last().map_or(true, |last| last.parent == NodePointer::Root) {
+ self.nodes.push(node);
+ } else {
+ let pos =
+ self.nodes.iter().take_while(|n| n.parent == NodePointer::Root).count();
+ self.nodes.insert(pos, node);
+ }
+ },
+ }
+ }
+
+ fn node_has_candidate_child(
+ &self,
+ pointer: NodePointer,
+ candidate_hash: &CandidateHash,
+ ) -> bool {
+ self.node_candidate_child(pointer, candidate_hash).is_some()
+ }
+
+ fn node_candidate_child(
+ &self,
+ pointer: NodePointer,
+ candidate_hash: &CandidateHash,
+ ) -> Option {
+ match pointer {
+ NodePointer::Root => self
+ .nodes
+ .iter()
+ .take_while(|n| n.parent == NodePointer::Root)
+ .enumerate()
+ .find(|(_, n)| &n.candidate_hash == candidate_hash)
+ .map(|(i, _)| NodePointer::Storage(i)),
+ NodePointer::Storage(ptr) =>
+ self.nodes.get(ptr).and_then(|n| n.candidate_child(candidate_hash)),
+ }
+ }
+
+ /// Returns an O(n) iterator over the hashes of candidates contained in the
+ /// tree.
+ pub(crate) fn candidates(&self) -> impl Iterator
- + '_ {
+ self.candidates.keys().cloned()
+ }
+
+ /// Whether the candidate exists and at what depths.
+ pub(crate) fn candidate(&self, candidate: &CandidateHash) -> Option> {
+ self.candidates.get(candidate).map(|d| d.iter_ones().collect())
+ }
+
+ /// Add a candidate and recursively populate from storage.
+ ///
+ /// Candidates can be added either as children of the root or children of other candidates.
+ pub(crate) fn add_and_populate(&mut self, hash: CandidateHash, storage: &CandidateStorage) {
+ let candidate_entry = match storage.get(&hash) {
+ None => return,
+ Some(e) => e,
+ };
+
+ let candidate_parent = &candidate_entry.candidate.persisted_validation_data.parent_head;
+
+ // Select an initial set of bases, whose required relay-parent matches that of the
+ // candidate.
+ let root_base = if &self.scope.base_constraints.required_parent == candidate_parent {
+ Some(NodePointer::Root)
+ } else {
+ None
+ };
+
+ let non_root_bases = self
+ .nodes
+ .iter()
+ .enumerate()
+ .filter(|(_, n)| {
+ n.cumulative_modifications.required_parent.as_ref() == Some(candidate_parent)
+ })
+ .map(|(i, _)| NodePointer::Storage(i));
+
+ let bases = root_base.into_iter().chain(non_root_bases).collect();
+
+ // Pass this into the population function, which will sanity-check stuff like depth,
+ // fragments, etc. and then recursively populate.
+ self.populate_from_bases(storage, bases);
+ }
+
+ /// Returns `true` if the path from the root to the node's parent (inclusive)
+ /// only contains backed candidates, `false` otherwise.
+ fn path_contains_backed_only_candidates(
+ &self,
+ mut parent_pointer: NodePointer,
+ candidate_storage: &CandidateStorage,
+ ) -> bool {
+ while let NodePointer::Storage(ptr) = parent_pointer {
+ let node = &self.nodes[ptr];
+ let candidate_hash = &node.candidate_hash;
+
+ if candidate_storage.get(candidate_hash).map_or(true, |candidate_entry| {
+ !matches!(candidate_entry.state, CandidateState::Backed)
+ }) {
+ return false
+ }
+ parent_pointer = node.parent;
+ }
+
+ true
+ }
+
+ /// Returns the hypothetical depths where a candidate with the given hash and parent head data
+ /// would be added to the tree, without applying other candidates recursively on top of it.
+ ///
+ /// If the candidate is already known, this returns the actual depths where this
+ /// candidate is part of the tree.
+ ///
+ /// Setting `backed_in_path_only` to `true` ensures this function only returns such membership
+ /// that every candidate in the path from the root is backed.
+ pub(crate) fn hypothetical_depths(
+ &self,
+ hash: CandidateHash,
+ candidate: HypotheticalCandidate,
+ candidate_storage: &CandidateStorage,
+ backed_in_path_only: bool,
+ ) -> Vec {
+ // if `true`, we always have to traverse the tree.
+ if !backed_in_path_only {
+ // if known.
+ if let Some(depths) = self.candidates.get(&hash) {
+ return depths.iter_ones().collect()
+ }
+ }
+
+ // if out of scope.
+ let candidate_relay_parent = candidate.relay_parent();
+ let candidate_relay_parent = if self.scope.relay_parent.hash == candidate_relay_parent {
+ self.scope.relay_parent.clone()
+ } else if let Some(info) = self.scope.ancestors_by_hash.get(&candidate_relay_parent) {
+ info.clone()
+ } else {
+ return Vec::new()
+ };
+
+ let max_depth = self.scope.max_depth;
+ let mut depths = bitvec![u16, Msb0; 0; max_depth + 1];
+
+ // iterate over all nodes where parent head-data matches,
+ // relay-parent number is <= candidate, and depth < max_depth.
+ let node_pointers = (0..self.nodes.len()).map(NodePointer::Storage);
+ for parent_pointer in std::iter::once(NodePointer::Root).chain(node_pointers) {
+ let (modifications, child_depth, earliest_rp) = match parent_pointer {
+ NodePointer::Root =>
+ (ConstraintModifications::identity(), 0, self.scope.earliest_relay_parent()),
+ NodePointer::Storage(ptr) => {
+ let node = &self.nodes[ptr];
+ let parent_rp = self
+ .scope
+ .ancestor_by_hash(&node.relay_parent())
+ .or_else(|| {
+ self.scope
+ .get_pending_availability(&node.candidate_hash)
+ .map(|_| self.scope.earliest_relay_parent())
+ })
+ .expect("All nodes in tree are either pending availability or within scope; qed");
+
+ (node.cumulative_modifications.clone(), node.depth + 1, parent_rp)
+ },
+ };
+
+ if child_depth > max_depth {
+ continue
+ }
+
+ if earliest_rp.number > candidate_relay_parent.number {
+ continue
+ }
+
+ let child_constraints =
+ match self.scope.base_constraints.apply_modifications(&modifications) {
+ Err(e) => {
+ gum::debug!(
+ target: LOG_TARGET,
+ new_parent_head = ?modifications.required_parent,
+ err = ?e,
+ "Failed to apply modifications",
+ );
+
+ continue
+ },
+ Ok(c) => c,
+ };
+
+ let parent_head_hash = candidate.parent_head_data_hash();
+ if parent_head_hash != child_constraints.required_parent.hash() {
+ continue
+ }
+
+ // We do additional checks for complete candidates.
+ if let HypotheticalCandidate::Complete { ref receipt, ref persisted_validation_data } =
+ candidate
+ {
+ let prospective_candidate = ProspectiveCandidate {
+ commitments: Cow::Borrowed(&receipt.commitments),
+ collator: receipt.descriptor().collator.clone(),
+ collator_signature: receipt.descriptor().signature.clone(),
+ persisted_validation_data: persisted_validation_data.as_ref().clone(),
+ pov_hash: receipt.descriptor().pov_hash,
+ validation_code_hash: receipt.descriptor().validation_code_hash,
+ };
+
+ if Fragment::new(
+ candidate_relay_parent.clone(),
+ child_constraints,
+ prospective_candidate,
+ )
+ .is_err()
+ {
+ continue
+ }
+ }
+
+ // Check that the path only contains backed candidates, if necessary.
+ if !backed_in_path_only ||
+ self.path_contains_backed_only_candidates(parent_pointer, candidate_storage)
+ {
+ depths.set(child_depth, true);
+ }
+ }
+
+ depths.iter_ones().collect()
+ }
+
+ /// Select a candidate after the given `required_path` which passes
+ /// the predicate.
+ ///
+ /// If there are multiple possibilities, this will select the first one.
+ ///
+ /// This returns `None` if there is no candidate meeting those criteria.
+ ///
+ /// The intention of the `required_path` is to allow queries on the basis of
+ /// one or more candidates which were previously pending availability becoming
+ /// available and opening up more room on the core.
+ pub(crate) fn select_child(
+ &self,
+ required_path: &[CandidateHash],
+ pred: impl Fn(&CandidateHash) -> bool,
+ ) -> Option {
+ let base_node = {
+ // traverse the required path.
+ let mut node = NodePointer::Root;
+ for required_step in required_path {
+ node = self.node_candidate_child(node, &required_step)?;
+ }
+
+ node
+ };
+
+ // TODO [now]: taking the first selection might introduce bias
+ // or become gameable.
+ //
+ // For plausibly unique parachains, this shouldn't matter much.
+ // figure out alternative selection criteria?
+ match base_node {
+ NodePointer::Root => self
+ .nodes
+ .iter()
+ .take_while(|n| n.parent == NodePointer::Root)
+ .filter(|n| self.scope.get_pending_availability(&n.candidate_hash).is_none())
+ .filter(|n| pred(&n.candidate_hash))
+ .map(|n| n.candidate_hash)
+ .next(),
+ NodePointer::Storage(ptr) => self.nodes[ptr]
+ .children
+ .iter()
+ .filter(|n| self.scope.get_pending_availability(&n.1).is_none())
+ .filter(|n| pred(&n.1))
+ .map(|n| n.1)
+ .next(),
+ }
+ }
+
+ fn populate_from_bases(&mut self, storage: &CandidateStorage, initial_bases: Vec) {
+ // Populate the tree breadth-first.
+ let mut last_sweep_start = None;
+
+ loop {
+ let sweep_start = self.nodes.len();
+
+ if Some(sweep_start) == last_sweep_start {
+ break
+ }
+
+ let parents: Vec = if let Some(last_start) = last_sweep_start {
+ (last_start..self.nodes.len()).map(NodePointer::Storage).collect()
+ } else {
+ initial_bases.clone()
+ };
+
+ // 1. get parent head and find constraints
+ // 2. iterate all candidates building on the right head and viable relay parent
+ // 3. add new node
+ for parent_pointer in parents {
+ let (modifications, child_depth, earliest_rp) = match parent_pointer {
+ NodePointer::Root =>
+ (ConstraintModifications::identity(), 0, self.scope.earliest_relay_parent()),
+ NodePointer::Storage(ptr) => {
+ let node = &self.nodes[ptr];
+ let parent_rp = self
+ .scope
+ .ancestor_by_hash(&node.relay_parent())
+ .or_else(|| {
+ // if the relay-parent is out of scope _and_ it is in the tree,
+ // it must be a candidate pending availability.
+ self.scope
+ .get_pending_availability(&node.candidate_hash)
+ .map(|c| c.relay_parent.clone())
+ })
+ .expect("All nodes in tree are either pending availability or within scope; qed");
+
+ (node.cumulative_modifications.clone(), node.depth + 1, parent_rp)
+ },
+ };
+
+ if child_depth > self.scope.max_depth {
+ continue
+ }
+
+ let child_constraints =
+ match self.scope.base_constraints.apply_modifications(&modifications) {
+ Err(e) => {
+ gum::debug!(
+ target: LOG_TARGET,
+ new_parent_head = ?modifications.required_parent,
+ err = ?e,
+ "Failed to apply modifications",
+ );
+
+ continue
+ },
+ Ok(c) => c,
+ };
+
+ // Add nodes to tree wherever
+ // 1. parent hash is correct
+ // 2. relay-parent does not move backwards.
+ // 3. all non-pending-availability candidates have relay-parent in scope.
+ // 4. candidate outputs fulfill constraints
+ let required_head_hash = child_constraints.required_parent.hash();
+ for candidate in storage.iter_para_children(&required_head_hash) {
+ let pending = self.scope.get_pending_availability(&candidate.candidate_hash);
+ let relay_parent = pending
+ .map(|p| p.relay_parent.clone())
+ .or_else(|| self.scope.ancestor_by_hash(&candidate.relay_parent));
+
+ let relay_parent = match relay_parent {
+ Some(r) => r,
+ None => continue,
+ };
+
+ // require: pending availability candidates don't move backwards
+ // and only those can be out-of-scope.
+ //
+ // earliest_rp can be before the earliest relay parent in the scope
+ // when the parent is a pending availability candidate as well, but
+ // only other pending candidates can have a relay parent out of scope.
+ let min_relay_parent_number = pending
+ .map(|p| match parent_pointer {
+ NodePointer::Root => p.relay_parent.number,
+ NodePointer::Storage(_) => earliest_rp.number,
+ })
+ .unwrap_or_else(|| {
+ std::cmp::max(
+ earliest_rp.number,
+ self.scope.earliest_relay_parent().number,
+ )
+ });
+
+ if relay_parent.number < min_relay_parent_number {
+ continue // relay parent moved backwards.
+ }
+
+ // don't add candidates where the parent already has it as a child.
+ if self.node_has_candidate_child(parent_pointer, &candidate.candidate_hash) {
+ continue
+ }
+
+ let fragment = {
+ let mut constraints = child_constraints.clone();
+ if let Some(ref p) = pending {
+ // overwrite for candidates pending availability as a special-case.
+ constraints.min_relay_parent_number = p.relay_parent.number;
+ }
+
+ let f = Fragment::new(
+ relay_parent.clone(),
+ constraints,
+ candidate.candidate.partial_clone(),
+ );
+
+ match f {
+ Ok(f) => f.into_owned(),
+ Err(e) => {
+ gum::debug!(
+ target: LOG_TARGET,
+ err = ?e,
+ ?relay_parent,
+ candidate_hash = ?candidate.candidate_hash,
+ "Failed to instantiate fragment",
+ );
+
+ continue
+ },
+ }
+ };
+
+ let mut cumulative_modifications = modifications.clone();
+ cumulative_modifications.stack(fragment.constraint_modifications());
+
+ let node = FragmentNode {
+ parent: parent_pointer,
+ fragment,
+ candidate_hash: candidate.candidate_hash,
+ depth: child_depth,
+ cumulative_modifications,
+ children: Vec::new(),
+ };
+
+ self.insert_node(node);
+ }
+ }
+
+ last_sweep_start = Some(sweep_start);
+ }
+ }
+}
+
+struct FragmentNode {
+ // A pointer to the parent node.
+ parent: NodePointer,
+ fragment: Fragment<'static>,
+ candidate_hash: CandidateHash,
+ depth: usize,
+ cumulative_modifications: ConstraintModifications,
+ children: Vec<(NodePointer, CandidateHash)>,
+}
+
+impl FragmentNode {
+ fn relay_parent(&self) -> Hash {
+ self.fragment.relay_parent().hash
+ }
+
+ fn candidate_child(&self, candidate_hash: &CandidateHash) -> Option {
+ self.children.iter().find(|(_, c)| c == candidate_hash).map(|(p, _)| *p)
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use assert_matches::assert_matches;
+ use polkadot_node_subsystem_util::inclusion_emulator::staging::InboundHrmpLimitations;
+ use polkadot_primitives::vstaging::{
+ BlockNumber, CandidateCommitments, CandidateDescriptor, HeadData,
+ };
+ use polkadot_primitives_test_helpers as test_helpers;
+
+ fn make_constraints(
+ min_relay_parent_number: BlockNumber,
+ valid_watermarks: Vec,
+ required_parent: HeadData,
+ ) -> Constraints {
+ Constraints {
+ min_relay_parent_number,
+ max_pov_size: 1_000_000,
+ max_code_size: 1_000_000,
+ ump_remaining: 10,
+ ump_remaining_bytes: 1_000,
+ max_ump_num_per_candidate: 10,
+ dmp_remaining_messages: [0; 10].into(),
+ hrmp_inbound: InboundHrmpLimitations { valid_watermarks },
+ hrmp_channels_out: HashMap::new(),
+ max_hrmp_num_per_candidate: 0,
+ required_parent,
+ validation_code_hash: Hash::repeat_byte(42).into(),
+ upgrade_restriction: None,
+ future_validation_code: None,
+ }
+ }
+
+ fn make_committed_candidate(
+ para_id: ParaId,
+ relay_parent: Hash,
+ relay_parent_number: BlockNumber,
+ parent_head: HeadData,
+ para_head: HeadData,
+ hrmp_watermark: BlockNumber,
+ ) -> (PersistedValidationData, CommittedCandidateReceipt) {
+ let persisted_validation_data = PersistedValidationData {
+ parent_head,
+ relay_parent_number,
+ relay_parent_storage_root: Hash::repeat_byte(69),
+ max_pov_size: 1_000_000,
+ };
+
+ let candidate = CommittedCandidateReceipt {
+ descriptor: CandidateDescriptor {
+ para_id,
+ relay_parent,
+ collator: test_helpers::dummy_collator(),
+ persisted_validation_data_hash: persisted_validation_data.hash(),
+ pov_hash: Hash::repeat_byte(1),
+ erasure_root: Hash::repeat_byte(1),
+ signature: test_helpers::dummy_collator_signature(),
+ para_head: para_head.hash(),
+ validation_code_hash: Hash::repeat_byte(42).into(),
+ },
+ commitments: CandidateCommitments {
+ upward_messages: Default::default(),
+ horizontal_messages: Default::default(),
+ new_validation_code: None,
+ head_data: para_head,
+ processed_downward_messages: 1,
+ hrmp_watermark,
+ },
+ };
+
+ (persisted_validation_data, candidate)
+ }
+
+ #[test]
+ fn scope_rejects_ancestors_that_skip_blocks() {
+ let para_id = ParaId::from(5u32);
+ let relay_parent = RelayChainBlockInfo {
+ number: 10,
+ hash: Hash::repeat_byte(10),
+ storage_root: Hash::repeat_byte(69),
+ };
+
+ let ancestors = vec![RelayChainBlockInfo {
+ number: 8,
+ hash: Hash::repeat_byte(8),
+ storage_root: Hash::repeat_byte(69),
+ }];
+
+ let max_depth = 2;
+ let base_constraints = make_constraints(8, vec![8, 9], vec![1, 2, 3].into());
+ let pending_availability = Vec::new();
+
+ assert_matches!(
+ Scope::with_ancestors(
+ para_id,
+ relay_parent,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ ancestors
+ ),
+ Err(UnexpectedAncestor { number: 8, prev: 10 })
+ );
+ }
+
+ #[test]
+ fn scope_rejects_ancestor_for_0_block() {
+ let para_id = ParaId::from(5u32);
+ let relay_parent = RelayChainBlockInfo {
+ number: 0,
+ hash: Hash::repeat_byte(0),
+ storage_root: Hash::repeat_byte(69),
+ };
+
+ let ancestors = vec![RelayChainBlockInfo {
+ number: 99999,
+ hash: Hash::repeat_byte(99),
+ storage_root: Hash::repeat_byte(69),
+ }];
+
+ let max_depth = 2;
+ let base_constraints = make_constraints(0, vec![], vec![1, 2, 3].into());
+ let pending_availability = Vec::new();
+
+ assert_matches!(
+ Scope::with_ancestors(
+ para_id,
+ relay_parent,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ ancestors,
+ ),
+ Err(UnexpectedAncestor { number: 99999, prev: 0 })
+ );
+ }
+
+ #[test]
+ fn scope_only_takes_ancestors_up_to_min() {
+ let para_id = ParaId::from(5u32);
+ let relay_parent = RelayChainBlockInfo {
+ number: 5,
+ hash: Hash::repeat_byte(0),
+ storage_root: Hash::repeat_byte(69),
+ };
+
+ let ancestors = vec![
+ RelayChainBlockInfo {
+ number: 4,
+ hash: Hash::repeat_byte(4),
+ storage_root: Hash::repeat_byte(69),
+ },
+ RelayChainBlockInfo {
+ number: 3,
+ hash: Hash::repeat_byte(3),
+ storage_root: Hash::repeat_byte(69),
+ },
+ RelayChainBlockInfo {
+ number: 2,
+ hash: Hash::repeat_byte(2),
+ storage_root: Hash::repeat_byte(69),
+ },
+ ];
+
+ let max_depth = 2;
+ let base_constraints = make_constraints(3, vec![2], vec![1, 2, 3].into());
+ let pending_availability = Vec::new();
+
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ ancestors,
+ )
+ .unwrap();
+
+ assert_eq!(scope.ancestors.len(), 2);
+ assert_eq!(scope.ancestors_by_hash.len(), 2);
+ }
+
+ #[test]
+ fn storage_add_candidate() {
+ let mut storage = CandidateStorage::new();
+ let relay_parent = Hash::repeat_byte(69);
+
+ let (pvd, candidate) = make_committed_candidate(
+ ParaId::from(5u32),
+ relay_parent,
+ 8,
+ vec![4, 5, 6].into(),
+ vec![1, 2, 3].into(),
+ 7,
+ );
+
+ let candidate_hash = candidate.hash();
+ let parent_head_hash = pvd.parent_head.hash();
+
+ storage.add_candidate(candidate, pvd).unwrap();
+ assert!(storage.contains(&candidate_hash));
+ assert_eq!(storage.iter_para_children(&parent_head_hash).count(), 1);
+
+ assert_eq!(storage.relay_parent_by_candidate_hash(&candidate_hash), Some(relay_parent));
+ }
+
+ #[test]
+ fn storage_retain() {
+ let mut storage = CandidateStorage::new();
+
+ let (pvd, candidate) = make_committed_candidate(
+ ParaId::from(5u32),
+ Hash::repeat_byte(69),
+ 8,
+ vec![4, 5, 6].into(),
+ vec![1, 2, 3].into(),
+ 7,
+ );
+
+ let candidate_hash = candidate.hash();
+ let output_head_hash = candidate.commitments.head_data.hash();
+ let parent_head_hash = pvd.parent_head.hash();
+
+ storage.add_candidate(candidate, pvd).unwrap();
+ storage.retain(|_| true);
+ assert!(storage.contains(&candidate_hash));
+ assert_eq!(storage.iter_para_children(&parent_head_hash).count(), 1);
+ assert!(storage.head_data_by_hash(&output_head_hash).is_some());
+
+ storage.retain(|_| false);
+ assert!(!storage.contains(&candidate_hash));
+ assert_eq!(storage.iter_para_children(&parent_head_hash).count(), 0);
+ assert!(storage.head_data_by_hash(&output_head_hash).is_none());
+ }
+
+ // [`FragmentTree::populate`] should pick up candidates that build on other candidates.
+ #[test]
+ fn populate_works_recursively() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+ let relay_parent_b = Hash::repeat_byte(2);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(),
+ 0,
+ );
+ let candidate_a_hash = candidate_a.hash();
+
+ let (pvd_b, candidate_b) = make_committed_candidate(
+ para_id,
+ relay_parent_b,
+ 1,
+ vec![0x0b].into(),
+ vec![0x0c].into(),
+ 1,
+ );
+ let candidate_b_hash = candidate_b.hash();
+
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let ancestors = vec![RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ }];
+
+ let relay_parent_b_info = RelayChainBlockInfo {
+ number: pvd_b.relay_parent_number,
+ hash: relay_parent_b,
+ storage_root: pvd_b.relay_parent_storage_root,
+ };
+
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ storage.add_candidate(candidate_b, pvd_b).unwrap();
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_b_info,
+ base_constraints,
+ pending_availability,
+ 4,
+ ancestors,
+ )
+ .unwrap();
+ let tree = FragmentTree::populate(scope, &storage);
+
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 2);
+ assert!(candidates.contains(&candidate_a_hash));
+ assert!(candidates.contains(&candidate_b_hash));
+
+ assert_eq!(tree.nodes.len(), 2);
+ assert_eq!(tree.nodes[0].parent, NodePointer::Root);
+ assert_eq!(tree.nodes[0].candidate_hash, candidate_a_hash);
+ assert_eq!(tree.nodes[0].depth, 0);
+
+ assert_eq!(tree.nodes[1].parent, NodePointer::Storage(0));
+ assert_eq!(tree.nodes[1].candidate_hash, candidate_b_hash);
+ assert_eq!(tree.nodes[1].depth, 1);
+ }
+
+ #[test]
+ fn children_of_root_are_contiguous() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+ let relay_parent_b = Hash::repeat_byte(2);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(),
+ 0,
+ );
+
+ let (pvd_b, candidate_b) = make_committed_candidate(
+ para_id,
+ relay_parent_b,
+ 1,
+ vec![0x0b].into(),
+ vec![0x0c].into(),
+ 1,
+ );
+
+ let (pvd_a2, candidate_a2) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b, 1].into(),
+ 0,
+ );
+ let candidate_a2_hash = candidate_a2.hash();
+
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let ancestors = vec![RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ }];
+
+ let relay_parent_b_info = RelayChainBlockInfo {
+ number: pvd_b.relay_parent_number,
+ hash: relay_parent_b,
+ storage_root: pvd_b.relay_parent_storage_root,
+ };
+
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ storage.add_candidate(candidate_b, pvd_b).unwrap();
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_b_info,
+ base_constraints,
+ pending_availability,
+ 4,
+ ancestors,
+ )
+ .unwrap();
+ let mut tree = FragmentTree::populate(scope, &storage);
+
+ storage.add_candidate(candidate_a2, pvd_a2).unwrap();
+ tree.add_and_populate(candidate_a2_hash, &storage);
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 3);
+
+ assert_eq!(tree.nodes[0].parent, NodePointer::Root);
+ assert_eq!(tree.nodes[1].parent, NodePointer::Root);
+ assert_eq!(tree.nodes[2].parent, NodePointer::Storage(0));
+ }
+
+ #[test]
+ fn add_candidate_child_of_root() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(),
+ 0,
+ );
+
+ let (pvd_b, candidate_b) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0c].into(),
+ 0,
+ );
+ let candidate_b_hash = candidate_b.hash();
+
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let relay_parent_a_info = RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ };
+
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_a_info,
+ base_constraints,
+ pending_availability,
+ 4,
+ vec![],
+ )
+ .unwrap();
+ let mut tree = FragmentTree::populate(scope, &storage);
+
+ storage.add_candidate(candidate_b, pvd_b).unwrap();
+ tree.add_and_populate(candidate_b_hash, &storage);
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 2);
+
+ assert_eq!(tree.nodes[0].parent, NodePointer::Root);
+ assert_eq!(tree.nodes[1].parent, NodePointer::Root);
+ }
+
+ #[test]
+ fn add_candidate_child_of_non_root() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(),
+ 0,
+ );
+
+ let (pvd_b, candidate_b) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0b].into(),
+ vec![0x0c].into(),
+ 0,
+ );
+ let candidate_b_hash = candidate_b.hash();
+
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let relay_parent_a_info = RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ };
+
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_a_info,
+ base_constraints,
+ pending_availability,
+ 4,
+ vec![],
+ )
+ .unwrap();
+ let mut tree = FragmentTree::populate(scope, &storage);
+
+ storage.add_candidate(candidate_b, pvd_b).unwrap();
+ tree.add_and_populate(candidate_b_hash, &storage);
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 2);
+
+ assert_eq!(tree.nodes[0].parent, NodePointer::Root);
+ assert_eq!(tree.nodes[1].parent, NodePointer::Storage(0));
+ }
+
+ #[test]
+ fn graceful_cycle_of_0() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0a].into(), // input same as output
+ 0,
+ );
+ let candidate_a_hash = candidate_a.hash();
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let relay_parent_a_info = RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ };
+
+ let max_depth = 4;
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_a_info,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ vec![],
+ )
+ .unwrap();
+ let tree = FragmentTree::populate(scope, &storage);
+
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 1);
+ assert_eq!(tree.nodes.len(), max_depth + 1);
+
+ assert_eq!(tree.nodes[0].parent, NodePointer::Root);
+ assert_eq!(tree.nodes[1].parent, NodePointer::Storage(0));
+ assert_eq!(tree.nodes[2].parent, NodePointer::Storage(1));
+ assert_eq!(tree.nodes[3].parent, NodePointer::Storage(2));
+ assert_eq!(tree.nodes[4].parent, NodePointer::Storage(3));
+
+ assert_eq!(tree.nodes[0].candidate_hash, candidate_a_hash);
+ assert_eq!(tree.nodes[1].candidate_hash, candidate_a_hash);
+ assert_eq!(tree.nodes[2].candidate_hash, candidate_a_hash);
+ assert_eq!(tree.nodes[3].candidate_hash, candidate_a_hash);
+ assert_eq!(tree.nodes[4].candidate_hash, candidate_a_hash);
+ }
+
+ #[test]
+ fn graceful_cycle_of_1() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(), // input same as output
+ 0,
+ );
+ let candidate_a_hash = candidate_a.hash();
+
+ let (pvd_b, candidate_b) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0b].into(),
+ vec![0x0a].into(), // input same as output
+ 0,
+ );
+ let candidate_b_hash = candidate_b.hash();
+
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let relay_parent_a_info = RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ };
+
+ let max_depth = 4;
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ storage.add_candidate(candidate_b, pvd_b).unwrap();
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_a_info,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ vec![],
+ )
+ .unwrap();
+ let tree = FragmentTree::populate(scope, &storage);
+
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 2);
+ assert_eq!(tree.nodes.len(), max_depth + 1);
+
+ assert_eq!(tree.nodes[0].parent, NodePointer::Root);
+ assert_eq!(tree.nodes[1].parent, NodePointer::Storage(0));
+ assert_eq!(tree.nodes[2].parent, NodePointer::Storage(1));
+ assert_eq!(tree.nodes[3].parent, NodePointer::Storage(2));
+ assert_eq!(tree.nodes[4].parent, NodePointer::Storage(3));
+
+ assert_eq!(tree.nodes[0].candidate_hash, candidate_a_hash);
+ assert_eq!(tree.nodes[1].candidate_hash, candidate_b_hash);
+ assert_eq!(tree.nodes[2].candidate_hash, candidate_a_hash);
+ assert_eq!(tree.nodes[3].candidate_hash, candidate_b_hash);
+ assert_eq!(tree.nodes[4].candidate_hash, candidate_a_hash);
+ }
+
+ #[test]
+ fn hypothetical_depths_known_and_unknown() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(), // input same as output
+ 0,
+ );
+ let candidate_a_hash = candidate_a.hash();
+
+ let (pvd_b, candidate_b) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0b].into(),
+ vec![0x0a].into(), // input same as output
+ 0,
+ );
+ let candidate_b_hash = candidate_b.hash();
+
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let relay_parent_a_info = RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ };
+
+ let max_depth = 4;
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ storage.add_candidate(candidate_b, pvd_b).unwrap();
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_a_info,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ vec![],
+ )
+ .unwrap();
+ let tree = FragmentTree::populate(scope, &storage);
+
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 2);
+ assert_eq!(tree.nodes.len(), max_depth + 1);
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_a_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0a]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ false,
+ ),
+ vec![0, 2, 4],
+ );
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_b_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0b]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ false,
+ ),
+ vec![1, 3],
+ );
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ CandidateHash(Hash::repeat_byte(21)),
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0a]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ false,
+ ),
+ vec![0, 2, 4],
+ );
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ CandidateHash(Hash::repeat_byte(22)),
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0b]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ false,
+ ),
+ vec![1, 3]
+ );
+ }
+
+ #[test]
+ fn hypothetical_depths_stricter_on_complete() {
+ let storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(),
+ 1000, // watermark is illegal
+ );
+
+ let candidate_a_hash = candidate_a.hash();
+
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let relay_parent_a_info = RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ };
+
+ let max_depth = 4;
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_a_info,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ vec![],
+ )
+ .unwrap();
+ let tree = FragmentTree::populate(scope, &storage);
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_a_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0a]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ false,
+ ),
+ vec![0],
+ );
+
+ assert!(tree
+ .hypothetical_depths(
+ candidate_a_hash,
+ HypotheticalCandidate::Complete {
+ receipt: Cow::Owned(candidate_a),
+ persisted_validation_data: Cow::Owned(pvd_a),
+ },
+ &storage,
+ false,
+ )
+ .is_empty());
+ }
+
+ #[test]
+ fn hypothetical_depths_backed_in_path() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(),
+ 0,
+ );
+ let candidate_a_hash = candidate_a.hash();
+
+ let (pvd_b, candidate_b) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0b].into(),
+ vec![0x0c].into(),
+ 0,
+ );
+ let candidate_b_hash = candidate_b.hash();
+
+ let (pvd_c, candidate_c) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0b].into(),
+ vec![0x0d].into(),
+ 0,
+ );
+
+ let base_constraints = make_constraints(0, vec![0], vec![0x0a].into());
+ let pending_availability = Vec::new();
+
+ let relay_parent_a_info = RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ };
+
+ let max_depth = 4;
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ storage.add_candidate(candidate_b, pvd_b).unwrap();
+ storage.add_candidate(candidate_c, pvd_c).unwrap();
+
+ // `A` and `B` are backed, `C` is not.
+ storage.mark_backed(&candidate_a_hash);
+ storage.mark_backed(&candidate_b_hash);
+
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_a_info,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ vec![],
+ )
+ .unwrap();
+ let tree = FragmentTree::populate(scope, &storage);
+
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 3);
+ assert_eq!(tree.nodes.len(), 3);
+
+ let candidate_d_hash = CandidateHash(Hash::repeat_byte(0xAA));
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_d_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0a]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ true,
+ ),
+ vec![0],
+ );
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_d_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0c]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ true,
+ ),
+ vec![2],
+ );
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_d_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0d]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ true,
+ ),
+ Vec::::new(),
+ );
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_d_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0d]).hash(),
+ relay_parent: relay_parent_a,
+ },
+ &storage,
+ false,
+ ),
+ vec![2], // non-empty if `false`.
+ );
+ }
+
+ #[test]
+ fn pending_availability_in_scope() {
+ let mut storage = CandidateStorage::new();
+
+ let para_id = ParaId::from(5u32);
+ let relay_parent_a = Hash::repeat_byte(1);
+ let relay_parent_b = Hash::repeat_byte(2);
+ let relay_parent_c = Hash::repeat_byte(3);
+
+ let (pvd_a, candidate_a) = make_committed_candidate(
+ para_id,
+ relay_parent_a,
+ 0,
+ vec![0x0a].into(),
+ vec![0x0b].into(),
+ 0,
+ );
+ let candidate_a_hash = candidate_a.hash();
+
+ let (pvd_b, candidate_b) = make_committed_candidate(
+ para_id,
+ relay_parent_b,
+ 1,
+ vec![0x0b].into(),
+ vec![0x0c].into(),
+ 1,
+ );
+
+ // Note that relay parent `a` is not allowed.
+ let base_constraints = make_constraints(1, vec![], vec![0x0a].into());
+
+ let relay_parent_a_info = RelayChainBlockInfo {
+ number: pvd_a.relay_parent_number,
+ hash: relay_parent_a,
+ storage_root: pvd_a.relay_parent_storage_root,
+ };
+ let pending_availability = vec![PendingAvailability {
+ candidate_hash: candidate_a_hash,
+ relay_parent: relay_parent_a_info,
+ }];
+
+ let relay_parent_b_info = RelayChainBlockInfo {
+ number: pvd_b.relay_parent_number,
+ hash: relay_parent_b,
+ storage_root: pvd_b.relay_parent_storage_root,
+ };
+ let relay_parent_c_info = RelayChainBlockInfo {
+ number: pvd_b.relay_parent_number + 1,
+ hash: relay_parent_c,
+ storage_root: Hash::zero(),
+ };
+
+ let max_depth = 4;
+ storage.add_candidate(candidate_a, pvd_a).unwrap();
+ storage.add_candidate(candidate_b, pvd_b).unwrap();
+ storage.mark_backed(&candidate_a_hash);
+
+ let scope = Scope::with_ancestors(
+ para_id,
+ relay_parent_c_info,
+ base_constraints,
+ pending_availability,
+ max_depth,
+ vec![relay_parent_b_info],
+ )
+ .unwrap();
+ let tree = FragmentTree::populate(scope, &storage);
+
+ let candidates: Vec<_> = tree.candidates().collect();
+ assert_eq!(candidates.len(), 2);
+ assert_eq!(tree.nodes.len(), 2);
+
+ let candidate_d_hash = CandidateHash(Hash::repeat_byte(0xAA));
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_d_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0b]).hash(),
+ relay_parent: relay_parent_c,
+ },
+ &storage,
+ false,
+ ),
+ vec![1],
+ );
+
+ assert_eq!(
+ tree.hypothetical_depths(
+ candidate_d_hash,
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash: HeadData::from(vec![0x0c]).hash(),
+ relay_parent: relay_parent_b,
+ },
+ &storage,
+ false,
+ ),
+ vec![2],
+ );
+ }
+}
diff --git a/node/core/prospective-parachains/src/lib.rs b/node/core/prospective-parachains/src/lib.rs
new file mode 100644
index 000000000000..a7f37d873d6a
--- /dev/null
+++ b/node/core/prospective-parachains/src/lib.rs
@@ -0,0 +1,939 @@
+// Copyright 2022-2023 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot. If not, see .
+
+//! Implementation of the Prospective Parachains subsystem - this tracks and handles
+//! prospective parachain fragments and informs other backing-stage subsystems
+//! of work to be done.
+//!
+//! This is the main coordinator of work within the node for the collation and
+//! backing phases of parachain consensus.
+//!
+//! This is primarily an implementation of "Fragment Trees", as described in
+//! [`polkadot_node_subsystem_util::inclusion_emulator::staging`].
+//!
+//! This subsystem also handles concerns such as the relay-chain being forkful and session changes.
+
+use std::{
+ borrow::Cow,
+ collections::{HashMap, HashSet},
+};
+
+use futures::{channel::oneshot, prelude::*};
+
+use polkadot_node_subsystem::{
+ messages::{
+ ChainApiMessage, FragmentTreeMembership, HypotheticalCandidate,
+ HypotheticalFrontierRequest, IntroduceCandidateRequest, ProspectiveParachainsMessage,
+ ProspectiveValidationDataRequest, RuntimeApiMessage, RuntimeApiRequest,
+ },
+ overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, SpawnedSubsystem, SubsystemError,
+};
+use polkadot_node_subsystem_util::{
+ inclusion_emulator::staging::{Constraints, RelayChainBlockInfo},
+ request_session_index_for_child,
+ runtime::{prospective_parachains_mode, ProspectiveParachainsMode},
+};
+use polkadot_primitives::vstaging::{
+ BlockNumber, CandidateHash, CandidatePendingAvailability, CommittedCandidateReceipt, CoreState,
+ Hash, HeadData, Header, Id as ParaId, PersistedValidationData,
+};
+
+use crate::{
+ error::{FatalError, FatalResult, JfyiError, JfyiErrorResult, Result},
+ fragment_tree::{
+ CandidateStorage, CandidateStorageInsertionError, FragmentTree, Scope as TreeScope,
+ },
+};
+
+mod error;
+mod fragment_tree;
+#[cfg(test)]
+mod tests;
+
+mod metrics;
+use self::metrics::Metrics;
+
+const LOG_TARGET: &str = "parachain::prospective-parachains";
+
+struct RelayBlockViewData {
+ // Scheduling info for paras and upcoming paras.
+ fragment_trees: HashMap,
+ pending_availability: HashSet,
+}
+
+struct View {
+ // Active or recent relay-chain blocks by block hash.
+ active_leaves: HashMap,
+ candidate_storage: HashMap,
+}
+
+impl View {
+ fn new() -> Self {
+ View { active_leaves: HashMap::new(), candidate_storage: HashMap::new() }
+ }
+}
+
+/// The prospective parachains subsystem.
+#[derive(Default)]
+pub struct ProspectiveParachainsSubsystem {
+ metrics: Metrics,
+}
+
+impl ProspectiveParachainsSubsystem {
+ /// Create a new instance of the `ProspectiveParachainsSubsystem`.
+ pub fn new(metrics: Metrics) -> Self {
+ Self { metrics }
+ }
+}
+
+#[overseer::subsystem(ProspectiveParachains, error = SubsystemError, prefix = self::overseer)]
+impl ProspectiveParachainsSubsystem
+where
+ Context: Send + Sync,
+{
+ fn start(self, ctx: Context) -> SpawnedSubsystem {
+ SpawnedSubsystem {
+ future: run(ctx, self.metrics)
+ .map_err(|e| SubsystemError::with_origin("prospective-parachains", e))
+ .boxed(),
+ name: "prospective-parachains-subsystem",
+ }
+ }
+}
+
+#[overseer::contextbounds(ProspectiveParachains, prefix = self::overseer)]
+async fn run(mut ctx: Context, metrics: Metrics) -> FatalResult<()> {
+ let mut view = View::new();
+ loop {
+ crate::error::log_error(
+ run_iteration(&mut ctx, &mut view, &metrics).await,
+ "Encountered issue during run iteration",
+ )?;
+ }
+}
+
+#[overseer::contextbounds(ProspectiveParachains, prefix = self::overseer)]
+async fn run_iteration(
+ ctx: &mut Context,
+ view: &mut View,
+ metrics: &Metrics,
+) -> Result<()> {
+ loop {
+ match ctx.recv().await.map_err(FatalError::SubsystemReceive)? {
+ FromOrchestra::Signal(OverseerSignal::Conclude) => return Ok(()),
+ FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
+ handle_active_leaves_update(&mut *ctx, view, update, metrics).await?;
+ },
+ FromOrchestra::Signal(OverseerSignal::BlockFinalized(..)) => {},
+ FromOrchestra::Communication { msg } => match msg {
+ ProspectiveParachainsMessage::IntroduceCandidate(request, tx) =>
+ handle_candidate_introduced(&mut *ctx, view, request, tx).await?,
+ ProspectiveParachainsMessage::CandidateSeconded(para, candidate_hash) =>
+ handle_candidate_seconded(view, para, candidate_hash),
+ ProspectiveParachainsMessage::CandidateBacked(para, candidate_hash) =>
+ handle_candidate_backed(&mut *ctx, view, para, candidate_hash).await?,
+ ProspectiveParachainsMessage::GetBackableCandidate(
+ relay_parent,
+ para,
+ required_path,
+ tx,
+ ) => answer_get_backable_candidate(&view, relay_parent, para, required_path, tx),
+ ProspectiveParachainsMessage::GetHypotheticalFrontier(request, tx) =>
+ answer_hypothetical_frontier_request(&view, request, tx),
+ ProspectiveParachainsMessage::GetTreeMembership(para, candidate, tx) =>
+ answer_tree_membership_request(&view, para, candidate, tx),
+ ProspectiveParachainsMessage::GetMinimumRelayParents(relay_parent, tx) =>
+ answer_minimum_relay_parents_request(&view, relay_parent, tx),
+ ProspectiveParachainsMessage::GetProspectiveValidationData(request, tx) =>
+ answer_prospective_validation_data_request(&view, request, tx),
+ },
+ }
+ }
+}
+
+#[overseer::contextbounds(ProspectiveParachains, prefix = self::overseer)]
+async fn handle_active_leaves_update(
+ ctx: &mut Context,
+ view: &mut View,
+ update: ActiveLeavesUpdate,
+ metrics: &Metrics,
+) -> JfyiErrorResult<()> {
+ // 1. clean up inactive leaves
+ // 2. determine all scheduled para at new block
+ // 3. construct new fragment tree for each para for each new leaf
+ // 4. prune candidate storage.
+
+ for deactivated in &update.deactivated {
+ view.active_leaves.remove(deactivated);
+ }
+
+ let mut temp_header_cache = HashMap::new();
+ for activated in update.activated.into_iter() {
+ let hash = activated.hash;
+
+ let mode = prospective_parachains_mode(ctx.sender(), hash)
+ .await
+ .map_err(JfyiError::Runtime)?;
+
+ let ProspectiveParachainsMode::Enabled { max_candidate_depth, allowed_ancestry_len } = mode
+ else {
+ gum::trace!(
+ target: LOG_TARGET,
+ block_hash = ?hash,
+ "Skipping leaf activation since async backing is disabled"
+ );
+
+ // Not a part of any allowed ancestry.
+ return Ok(())
+ };
+
+ let mut pending_availability = HashSet::new();
+ let scheduled_paras =
+ fetch_upcoming_paras(&mut *ctx, hash, &mut pending_availability).await?;
+
+ let block_info: RelayChainBlockInfo =
+ match fetch_block_info(&mut *ctx, &mut temp_header_cache, hash).await? {
+ None => {
+ gum::warn!(
+ target: LOG_TARGET,
+ block_hash = ?hash,
+ "Failed to get block info for newly activated leaf block."
+ );
+
+ // `update.activated` is an option, but we can use this
+ // to exit the 'loop' and skip this block without skipping
+ // pruning logic.
+ continue
+ },
+ Some(info) => info,
+ };
+
+ let ancestry =
+ fetch_ancestry(&mut *ctx, &mut temp_header_cache, hash, allowed_ancestry_len).await?;
+
+ // Find constraints.
+ let mut fragment_trees = HashMap::new();
+ for para in scheduled_paras {
+ let candidate_storage =
+ view.candidate_storage.entry(para).or_insert_with(CandidateStorage::new);
+
+ let backing_state = fetch_backing_state(&mut *ctx, hash, para).await?;
+
+ let (constraints, pending_availability) = match backing_state {
+ Some(c) => c,
+ None => {
+ // This indicates a runtime conflict of some kind.
+
+ gum::debug!(
+ target: LOG_TARGET,
+ para_id = ?para,
+ relay_parent = ?hash,
+ "Failed to get inclusion backing state."
+ );
+
+ continue
+ },
+ };
+
+ let pending_availability = preprocess_candidates_pending_availability(
+ ctx,
+ &mut temp_header_cache,
+ constraints.required_parent.clone(),
+ pending_availability,
+ )
+ .await?;
+ let mut compact_pending = Vec::with_capacity(pending_availability.len());
+
+ for c in pending_availability {
+ let res = candidate_storage.add_candidate(c.candidate, c.persisted_validation_data);
+ let candidate_hash = c.compact.candidate_hash;
+ compact_pending.push(c.compact);
+
+ match res {
+ Ok(_) | Err(CandidateStorageInsertionError::CandidateAlreadyKnown(_)) => {
+ // Anything on-chain is guaranteed to be backed.
+ candidate_storage.mark_backed(&candidate_hash);
+ },
+ Err(err) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ ?candidate_hash,
+ para_id = ?para,
+ ?err,
+ "Scraped invalid candidate pending availability",
+ );
+ },
+ }
+ }
+
+ let scope = TreeScope::with_ancestors(
+ para,
+ block_info.clone(),
+ constraints,
+ compact_pending,
+ max_candidate_depth,
+ ancestry.iter().cloned(),
+ )
+ .expect("ancestors are provided in reverse order and correctly; qed");
+
+ let tree = FragmentTree::populate(scope, &*candidate_storage);
+
+ fragment_trees.insert(para, tree);
+ }
+
+ view.active_leaves
+ .insert(hash, RelayBlockViewData { fragment_trees, pending_availability });
+ }
+
+ if !update.deactivated.is_empty() {
+ // This has potential to be a hotspot.
+ prune_view_candidate_storage(view, metrics);
+ }
+
+ Ok(())
+}
+
+fn prune_view_candidate_storage(view: &mut View, metrics: &Metrics) {
+ metrics.time_prune_view_candidate_storage();
+
+ let active_leaves = &view.active_leaves;
+ let mut live_candidates = HashSet::new();
+ let mut live_paras = HashSet::new();
+ for sub_view in active_leaves.values() {
+ for (para_id, fragment_tree) in &sub_view.fragment_trees {
+ live_candidates.extend(fragment_tree.candidates());
+ live_paras.insert(*para_id);
+ }
+
+ live_candidates.extend(sub_view.pending_availability.iter().cloned());
+ }
+
+ view.candidate_storage.retain(|para_id, storage| {
+ if !live_paras.contains(¶_id) {
+ return false
+ }
+
+ storage.retain(|h| live_candidates.contains(&h));
+
+ // Even if `storage` is now empty, we retain.
+ // This maintains a convenient invariant that para-id storage exists
+ // as long as there's an active head which schedules the para.
+ true
+ })
+}
+
+struct ImportablePendingAvailability {
+ candidate: CommittedCandidateReceipt,
+ persisted_validation_data: PersistedValidationData,
+ compact: crate::fragment_tree::PendingAvailability,
+}
+
+#[overseer::contextbounds(ProspectiveParachains, prefix = self::overseer)]
+async fn preprocess_candidates_pending_availability(
+ ctx: &mut Context,
+ cache: &mut HashMap,
+ required_parent: HeadData,
+ pending_availability: Vec,
+) -> JfyiErrorResult> {
+ let mut required_parent = required_parent;
+
+ let mut importable = Vec::new();
+ let expected_count = pending_availability.len();
+
+ for (i, pending) in pending_availability.into_iter().enumerate() {
+ let relay_parent =
+ match fetch_block_info(ctx, cache, pending.descriptor.relay_parent).await? {
+ None => {
+ gum::debug!(
+ target: LOG_TARGET,
+ ?pending.candidate_hash,
+ ?pending.descriptor.para_id,
+ index = ?i,
+ ?expected_count,
+ "Had to stop processing pending candidates early due to missing info.",
+ );
+
+ break
+ },
+ Some(b) => b,
+ };
+
+ let next_required_parent = pending.commitments.head_data.clone();
+ importable.push(ImportablePendingAvailability {
+ candidate: CommittedCandidateReceipt {
+ descriptor: pending.descriptor,
+ commitments: pending.commitments,
+ },
+ persisted_validation_data: PersistedValidationData {
+ parent_head: required_parent,
+ max_pov_size: pending.max_pov_size,
+ relay_parent_number: relay_parent.number,
+ relay_parent_storage_root: relay_parent.storage_root,
+ },
+ compact: crate::fragment_tree::PendingAvailability {
+ candidate_hash: pending.candidate_hash,
+ relay_parent,
+ },
+ });
+
+ required_parent = next_required_parent;
+ }
+
+ Ok(importable)
+}
+
+#[overseer::contextbounds(ProspectiveParachains, prefix = self::overseer)]
+async fn handle_candidate_introduced(
+ _ctx: &mut Context,
+ view: &mut View,
+ request: IntroduceCandidateRequest,
+ tx: oneshot::Sender,
+) -> JfyiErrorResult<()> {
+ let IntroduceCandidateRequest {
+ candidate_para: para,
+ candidate_receipt: candidate,
+ persisted_validation_data: pvd,
+ } = request;
+
+ // Add the candidate to storage.
+ // Then attempt to add it to all trees.
+ let storage = match view.candidate_storage.get_mut(¶) {
+ None => {
+ gum::warn!(
+ target: LOG_TARGET,
+ para_id = ?para,
+ candidate_hash = ?candidate.hash(),
+ "Received seconded candidate for inactive para",
+ );
+
+ let _ = tx.send(Vec::new());
+ return Ok(())
+ },
+ Some(storage) => storage,
+ };
+
+ let candidate_hash = match storage.add_candidate(candidate, pvd) {
+ Ok(c) => c,
+ Err(CandidateStorageInsertionError::CandidateAlreadyKnown(c)) => {
+ // Candidate known - return existing fragment tree membership.
+ let _ = tx.send(fragment_tree_membership(&view.active_leaves, para, c));
+ return Ok(())
+ },
+ Err(CandidateStorageInsertionError::PersistedValidationDataMismatch) => {
+ // We can't log the candidate hash without either doing more ~expensive
+ // hashing but this branch indicates something is seriously wrong elsewhere
+ // so it's doubtful that it would affect debugging.
+
+ gum::warn!(
+ target: LOG_TARGET,
+ para = ?para,
+ "Received seconded candidate had mismatching validation data",
+ );
+
+ let _ = tx.send(Vec::new());
+ return Ok(())
+ },
+ };
+
+ let mut membership = Vec::new();
+ for (relay_parent, leaf_data) in &mut view.active_leaves {
+ if let Some(tree) = leaf_data.fragment_trees.get_mut(¶) {
+ tree.add_and_populate(candidate_hash, &*storage);
+ if let Some(depths) = tree.candidate(&candidate_hash) {
+ membership.push((*relay_parent, depths));
+ }
+ }
+ }
+
+ if membership.is_empty() {
+ storage.remove_candidate(&candidate_hash);
+ }
+
+ let _ = tx.send(membership);
+
+ Ok(())
+}
+
+fn handle_candidate_seconded(view: &mut View, para: ParaId, candidate_hash: CandidateHash) {
+ let storage = match view.candidate_storage.get_mut(¶) {
+ None => {
+ gum::warn!(
+ target: LOG_TARGET,
+ para_id = ?para,
+ ?candidate_hash,
+ "Received instruction to second unknown candidate",
+ );
+
+ return
+ },
+ Some(storage) => storage,
+ };
+
+ if !storage.contains(&candidate_hash) {
+ gum::warn!(
+ target: LOG_TARGET,
+ para_id = ?para,
+ ?candidate_hash,
+ "Received instruction to second unknown candidate",
+ );
+
+ return
+ }
+
+ storage.mark_seconded(&candidate_hash);
+}
+
+#[overseer::contextbounds(ProspectiveParachains, prefix = self::overseer)]
+async fn handle_candidate_backed(
+ _ctx: &mut Context,
+ view: &mut View,
+ para: ParaId,
+ candidate_hash: CandidateHash,
+) -> JfyiErrorResult<()> {
+ let storage = match view.candidate_storage.get_mut(¶) {
+ None => {
+ gum::warn!(
+ target: LOG_TARGET,
+ para_id = ?para,
+ ?candidate_hash,
+ "Received instruction to back unknown candidate",
+ );
+
+ return Ok(())
+ },
+ Some(storage) => storage,
+ };
+
+ if !storage.contains(&candidate_hash) {
+ gum::warn!(
+ target: LOG_TARGET,
+ para_id = ?para,
+ ?candidate_hash,
+ "Received instruction to back unknown candidate",
+ );
+
+ return Ok(())
+ }
+
+ if storage.is_backed(&candidate_hash) {
+ gum::debug!(
+ target: LOG_TARGET,
+ para_id = ?para,
+ ?candidate_hash,
+ "Received redundant instruction to mark candidate as backed",
+ );
+
+ return Ok(())
+ }
+
+ storage.mark_backed(&candidate_hash);
+ Ok(())
+}
+
+fn answer_get_backable_candidate(
+ view: &View,
+ relay_parent: Hash,
+ para: ParaId,
+ required_path: Vec,
+ tx: oneshot::Sender>,
+) {
+ let data = match view.active_leaves.get(&relay_parent) {
+ None => {
+ gum::debug!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ para_id = ?para,
+ "Requested backable candidate for inactive relay-parent."
+ );
+
+ let _ = tx.send(None);
+ return
+ },
+ Some(d) => d,
+ };
+
+ let tree = match data.fragment_trees.get(¶) {
+ None => {
+ gum::debug!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ para_id = ?para,
+ "Requested backable candidate for inactive para."
+ );
+
+ let _ = tx.send(None);
+ return
+ },
+ Some(tree) => tree,
+ };
+
+ let storage = match view.candidate_storage.get(¶) {
+ None => {
+ gum::warn!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ para_id = ?para,
+ "No candidate storage for active para",
+ );
+
+ let _ = tx.send(None);
+ return
+ },
+ Some(s) => s,
+ };
+
+ let Some(child_hash) =
+ tree.select_child(&required_path, |candidate| storage.is_backed(candidate))
+ else {
+ let _ = tx.send(None);
+ return
+ };
+ let Some(candidate_relay_parent) = storage.relay_parent_by_candidate_hash(&child_hash) else {
+ gum::error!(
+ target: LOG_TARGET,
+ ?child_hash,
+ para_id = ?para,
+ "Candidate is present in fragment tree but not in candidate's storage!",
+ );
+ let _ = tx.send(None);
+ return
+ };
+
+ let _ = tx.send(Some((child_hash, candidate_relay_parent)));
+}
+
+fn answer_hypothetical_frontier_request(
+ view: &View,
+ request: HypotheticalFrontierRequest,
+ tx: oneshot::Sender>,
+) {
+ let mut response = Vec::with_capacity(request.candidates.len());
+ for candidate in request.candidates {
+ response.push((candidate, Vec::new()));
+ }
+
+ let required_active_leaf = request.fragment_tree_relay_parent;
+ for (active_leaf, leaf_view) in view
+ .active_leaves
+ .iter()
+ .filter(|(h, _)| required_active_leaf.as_ref().map_or(true, |x| h == &x))
+ {
+ for &mut (ref c, ref mut membership) in &mut response {
+ let fragment_tree = match leaf_view.fragment_trees.get(&c.candidate_para()) {
+ None => continue,
+ Some(f) => f,
+ };
+ let candidate_storage = match view.candidate_storage.get(&c.candidate_para()) {
+ None => continue,
+ Some(storage) => storage,
+ };
+
+ let candidate_hash = c.candidate_hash();
+ let hypothetical = match c {
+ HypotheticalCandidate::Complete { receipt, persisted_validation_data, .. } =>
+ fragment_tree::HypotheticalCandidate::Complete {
+ receipt: Cow::Borrowed(receipt),
+ persisted_validation_data: Cow::Borrowed(persisted_validation_data),
+ },
+ HypotheticalCandidate::Incomplete {
+ parent_head_data_hash,
+ candidate_relay_parent,
+ ..
+ } => fragment_tree::HypotheticalCandidate::Incomplete {
+ relay_parent: *candidate_relay_parent,
+ parent_head_data_hash: *parent_head_data_hash,
+ },
+ };
+
+ let depths = fragment_tree.hypothetical_depths(
+ candidate_hash,
+ hypothetical,
+ candidate_storage,
+ request.backed_in_path_only,
+ );
+
+ if !depths.is_empty() {
+ membership.push((*active_leaf, depths));
+ }
+ }
+ }
+
+ let _ = tx.send(response);
+}
+
+fn fragment_tree_membership(
+ active_leaves: &HashMap,
+ para: ParaId,
+ candidate: CandidateHash,
+) -> FragmentTreeMembership {
+ let mut membership = Vec::new();
+ for (relay_parent, view_data) in active_leaves {
+ if let Some(tree) = view_data.fragment_trees.get(¶) {
+ if let Some(depths) = tree.candidate(&candidate) {
+ membership.push((*relay_parent, depths));
+ }
+ }
+ }
+ membership
+}
+
+fn answer_tree_membership_request(
+ view: &View,
+ para: ParaId,
+ candidate: CandidateHash,
+ tx: oneshot::Sender,
+) {
+ let _ = tx.send(fragment_tree_membership(&view.active_leaves, para, candidate));
+}
+
+fn answer_minimum_relay_parents_request(
+ view: &View,
+ relay_parent: Hash,
+ tx: oneshot::Sender>,
+) {
+ let mut v = Vec::new();
+ if let Some(leaf_data) = view.active_leaves.get(&relay_parent) {
+ for (para_id, fragment_tree) in &leaf_data.fragment_trees {
+ v.push((*para_id, fragment_tree.scope().earliest_relay_parent().number));
+ }
+ }
+
+ let _ = tx.send(v);
+}
+
+fn answer_prospective_validation_data_request(
+ view: &View,
+ request: ProspectiveValidationDataRequest,
+ tx: oneshot::Sender>,
+) {
+ // 1. Try to get the head-data from the candidate store if known.
+ // 2. Otherwise, it might exist as the base in some relay-parent and we can find it by iterating
+ // fragment trees.
+ // 3. Otherwise, it is unknown.
+ // 4. Also try to find the relay parent block info by scanning fragment trees.
+ // 5. If head data and relay parent block info are found - success. Otherwise, failure.
+
+ let storage = match view.candidate_storage.get(&request.para_id) {
+ None => {
+ let _ = tx.send(None);
+ return
+ },
+ Some(s) => s,
+ };
+
+ let mut head_data =
+ storage.head_data_by_hash(&request.parent_head_data_hash).map(|x| x.clone());
+ let mut relay_parent_info = None;
+ let mut max_pov_size = None;
+
+ for fragment_tree in view
+ .active_leaves
+ .values()
+ .filter_map(|x| x.fragment_trees.get(&request.para_id))
+ {
+ if head_data.is_some() && relay_parent_info.is_some() && max_pov_size.is_some() {
+ break
+ }
+ if relay_parent_info.is_none() {
+ relay_parent_info =
+ fragment_tree.scope().ancestor_by_hash(&request.candidate_relay_parent);
+ }
+ if head_data.is_none() {
+ let required_parent = &fragment_tree.scope().base_constraints().required_parent;
+ if required_parent.hash() == request.parent_head_data_hash {
+ head_data = Some(required_parent.clone());
+ }
+ }
+ if max_pov_size.is_none() {
+ let contains_ancestor = fragment_tree
+ .scope()
+ .ancestor_by_hash(&request.candidate_relay_parent)
+ .is_some();
+ if contains_ancestor {
+ // We are leaning hard on two assumptions here.
+ // 1. That the fragment tree never contains allowed relay-parents whose session for
+ // children is different from that of the base block's.
+ // 2. That the max_pov_size is only configurable per session.
+ max_pov_size = Some(fragment_tree.scope().base_constraints().max_pov_size);
+ }
+ }
+ }
+
+ let _ = tx.send(match (head_data, relay_parent_info, max_pov_size) {
+ (Some(h), Some(i), Some(m)) => Some(PersistedValidationData {
+ parent_head: h,
+ relay_parent_number: i.number,
+ relay_parent_storage_root: i.storage_root,
+ max_pov_size: m as _,
+ }),
+ _ => None,
+ });
+}
+
+#[overseer::contextbounds(ProspectiveParachains, prefix = self::overseer)]
+async fn fetch_backing_state(
+ ctx: &mut Context,
+ relay_parent: Hash,
+ para_id: ParaId,
+) -> JfyiErrorResult)>> {
+ let (tx, rx) = oneshot::channel();
+ ctx.send_message(RuntimeApiMessage::Request(
+ relay_parent,
+ RuntimeApiRequest::StagingParaBackingState(para_id, tx),
+ ))
+ .await;
+
+ Ok(rx
+ .await
+ .map_err(JfyiError::RuntimeApiRequestCanceled)??
+ .map(|s| (From::from(s.constraints), s.pending_availability)))
+}
+
+#[overseer::contextbounds(ProspectiveParachains, prefix = self::overseer)]
+async fn fetch_upcoming_paras(
+ ctx: &mut Context,
+ relay_parent: Hash,
+ pending_availability: &mut HashSet