diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 37839791456b..a92dc0bb006c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,3 +2,5 @@
/.github/ @paritytech/ci @chevdor
/scripts/ci/ @paritytech/ci @chevdor
/.gitlab-ci.yml @paritytech/ci
+# lingua.dic is not managed by CI team
+/scripts/ci/gitlab/lingua.dic
diff --git a/.github/workflows/auto-label-prs.yml b/.github/workflows/auto-label-prs.yml
index f0b8e9b343e2..50539b80b98b 100644
--- a/.github/workflows/auto-label-prs.yml
+++ b/.github/workflows/auto-label-prs.yml
@@ -8,13 +8,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Label drafts
- uses: andymckay/labeler@master
+ uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4
if: github.event.pull_request.draft == true
with:
add-labels: 'A3-inprogress'
remove-labels: 'A0-pleasereview'
- name: Label PRs
- uses: andymckay/labeler@master
+ uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4
if: github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'A2-insubstantial')
with:
add-labels: 'A0-pleasereview'
diff --git a/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_candidate.yml
index 51a82bc4f593..acffa6842d49 100644
--- a/.github/workflows/release-10_candidate.yml
+++ b/.github/workflows/release-10_candidate.yml
@@ -34,7 +34,7 @@ jobs:
echo "::set-output name=first_rc::true"
fi
- name: Apply new tag
- uses: tvdias/github-tagger@v0.0.2
+ uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
with:
# We can't use the normal GITHUB_TOKEN for the following reason:
# https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
@@ -42,7 +42,7 @@ jobs:
repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
tag: ${{ steps.compute_tag.outputs.new_tag }}
- id: create-issue
- uses: JasonEtco/create-an-issue@v2
+ uses: JasonEtco/create-an-issue@9e6213aec58987fa7d2f4deb8b256b99e63107a2 # v2.6.0
# Only create the issue if it's the first release candidate
if: steps.compute_tag.outputs.first_rc == 'true'
env:
diff --git a/.github/workflows/release-50_publish-docker-release.yml b/.github/workflows/release-50_publish-docker-release.yml
index 86bc38252741..5a9d683bc3b3 100644
--- a/.github/workflows/release-50_publish-docker-release.yml
+++ b/.github/workflows/release-50_publish-docker-release.yml
@@ -12,7 +12,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v3
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # v1.7
+ uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # v2.1.0
- name: Cache Docker layers
uses: actions/cache@v3
with:
diff --git a/.github/workflows/release-51_publish-docker-manual.yml b/.github/workflows/release-51_publish-docker-manual.yml
index 6386d8676769..e0bcf99a8d60 100644
--- a/.github/workflows/release-51_publish-docker-manual.yml
+++ b/.github/workflows/release-51_publish-docker-manual.yml
@@ -19,7 +19,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v3
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # v1.7
+ uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # v2.1.0
- name: Cache Docker layers
uses: actions/cache@v3
with:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94f700f7b985..0dd640186bb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,10 +15,13 @@
# moment of time.
stages:
- - stage1
- - stage2
- - stage3
- - stage4
+ - weights
+ - check
+ - test
+ - build
+ - publish
+ - zombienet
+ - short-benchmarks
workflow:
rules:
@@ -32,13 +35,13 @@ variables:
CI_IMAGE: "paritytech/ci-linux:production"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.51"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.78"
PIPELINE_SCRIPTS_TAG: "v0.4"
default:
cache: {}
-.collect-artifacts: &collect-artifacts
+.collect-artifacts:
artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
when: on_success
@@ -46,7 +49,7 @@ default:
paths:
- ./artifacts/
-.collect-artifacts-short: &collect-artifacts-short
+.collect-artifacts-short:
artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
when: on_success
@@ -56,18 +59,19 @@ default:
# collecting vars for pipeline stopper
# they will be used if the job fails
-.pipeline-stopper-vars: &pipeline-stopper-vars
+.pipeline-stopper-vars:
+ before_script:
- echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
- echo "PR_NUM=${CI_COMMIT_REF_NAME}" >> pipeline-stopper.env
-.pipeline-stopper-artifacts: &pipeline-stopper-artifacts
+.pipeline-stopper-artifacts:
artifacts:
reports:
dotenv: pipeline-stopper.env
-.kubernetes-env: &kubernetes-env
+.kubernetes-env:
retry:
max: 2
when:
@@ -78,7 +82,7 @@ default:
tags:
- kubernetes-parity-build
-.docker-env: &docker-env
+.docker-env:
image: "${CI_IMAGE}"
retry:
max: 2
@@ -90,20 +94,20 @@ default:
tags:
- linux-docker
-.compiler-info: &compiler-info
+.compiler-info:
before_script:
- rustup show
- cargo --version
- sccache -s
-.test-refs: &test-refs
+.test-refs:
rules:
- if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_COMMIT_REF_NAME == "master"
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-.common-refs: &common-refs
+.common-refs:
# these jobs run always*
rules:
- if: $CI_PIPELINE_SOURCE == "web"
@@ -113,13 +117,13 @@ default:
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
- if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
-.test-pr-refs: &test-pr-refs
+.test-pr-refs:
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-.zombienet-refs: &zombienet-refs
+.zombienet-refs:
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
@@ -128,14 +132,14 @@ default:
- if: $CI_COMMIT_REF_NAME == "master"
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-.deploy-testnet-refs: &deploy-testnet-refs
+.deploy-testnet-refs:
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_COMMIT_REF_NAME == "master"
-.publish-refs: &publish-refs
+.publish-refs:
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
@@ -145,14 +149,11 @@ default:
- if: $CI_COMMIT_REF_NAME == "master"
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-.build-push-image: &build-push-image
- <<: *kubernetes-env
+.build-push-image:
+ extends:
+ - .kubernetes-env
image: quay.io/buildah/stable
- variables: &image-variables
- GIT_STRATEGY: none
- DOCKER_USER: ${PARITYPR_USER}
- DOCKER_PASS: ${PARITYPR_PASS}
- before_script: &check-versions
+ before_script:
- test -s ./artifacts/VERSION || exit 1
- test -s ./artifacts/EXTRATAG || exit 1
- VERSION="$(cat ./artifacts/VERSION)"
@@ -179,864 +180,36 @@ default:
after_script:
- buildah logout --all
-#### stage: stage1
-
-check-runtime:
- stage: stage1
- image: paritytech/tools:latest
- <<: *kubernetes-env
- rules:
- - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
- variables:
- GITLAB_API: "https://gitlab.parity.io/api/v4"
- GITHUB_API_PROJECT: "parity%2Finfrastructure%2Fgithub-api"
- script:
- - ./scripts/ci/gitlab/check_runtime.sh
- allow_failure: true
+include:
+ # weights jobs
+ - scripts/ci/gitlab/pipeline/weights.yml
+ # check jobs
+ - scripts/ci/gitlab/pipeline/check.yml
+ # test jobs
+ - scripts/ci/gitlab/pipeline/test.yml
+ # build jobs
+ - scripts/ci/gitlab/pipeline/build.yml
+ # short-benchmarks jobs
+ - scripts/ci/gitlab/pipeline/short-benchmarks.yml
+ # publish jobs
+ - scripts/ci/gitlab/pipeline/publish.yml
+ # zombienet jobs
+ - scripts/ci/gitlab/pipeline/zombienet.yml
-cargo-fmt:
- stage: stage1
- <<: *docker-env
- <<: *test-refs
- script:
- - cargo +nightly --version
- - cargo +nightly fmt --all -- --check
- allow_failure: true
-build-linux-stable:
- stage: stage1
- <<: *docker-env
- <<: *compiler-info
- <<: *collect-artifacts
- <<: *common-refs
- variables:
- RUST_TOOLCHAIN: stable
- # Enable debug assertions since we are running optimized builds for testing
- # but still want to have debug assertions.
- RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
- # Ensure we run the UI tests.
- RUN_UI_TESTS: 1
- script:
- - time cargo build --profile testnet --features pyroscope --verbose --bin polkadot
- - sccache -s
- # pack artifacts
- - mkdir -p ./artifacts
- - VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
- - mv ./target/testnet/polkadot ./artifacts/.
- - pushd artifacts
- - sha256sum polkadot | tee polkadot.sha256
- - shasum -c polkadot.sha256
- - popd
- - EXTRATAG="${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
- - echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
- - echo -n ${VERSION} > ./artifacts/VERSION
- - echo -n ${EXTRATAG} > ./artifacts/EXTRATAG
- - cp -r scripts/* ./artifacts
-test-linux-stable:
- stage: stage1
- <<: *docker-env
- <<: *common-refs
- <<: *pipeline-stopper-artifacts
- before_script:
- - rustup show
- - cargo --version
- - *pipeline-stopper-vars
- variables:
- RUST_TOOLCHAIN: stable
- # Enable debug assertions since we are running optimized builds for testing
- # but still want to have debug assertions.
- RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
- script:
- - time cargo test --workspace --profile testnet --verbose --locked --features=runtime-benchmarks,runtime-metrics
-
-
-
-spellcheck:
- stage: stage1
- <<: *docker-env
- <<: *test-refs
- script:
- - cargo spellcheck --version
- # compare with the commit parent to the PR, given it's from a default branch
- - git fetch origin +${CI_DEFAULT_BRANCH}:${CI_DEFAULT_BRANCH}
- - echo "___Spellcheck is going to check your diff___"
- - cargo spellcheck list-files -vvv $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges))
- - time cargo spellcheck check -vvv --cfg=scripts/ci/gitlab/spellcheck.toml --checkers hunspell --code 1
- $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges))
- allow_failure: true
-
-build-test-collators:
- stage: stage1
- <<: *collect-artifacts
- <<: *docker-env
- <<: *compiler-info
- <<: *test-refs
- script:
- - time cargo build --profile testnet --verbose -p test-parachain-adder-collator
- - time cargo build --profile testnet --verbose -p test-parachain-undying-collator
- - sccache -s
- # pack artifacts
- - mkdir -p ./artifacts
- - mv ./target/testnet/adder-collator ./artifacts/.
- - mv ./target/testnet/undying-collator ./artifacts/.
- - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
- - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
- - echo "adder-collator version = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
- - echo "undying-collator version = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
- - cp -r ./scripts/* ./artifacts
-
-build-malus:
- stage: stage1
- <<: *collect-artifacts
- <<: *docker-env
- <<: *compiler-info
- <<: *test-refs
- script:
- - time cargo build --profile testnet --verbose -p polkadot-test-malus
- - sccache -s
- # pack artifacts
- - mkdir -p ./artifacts
- - mv ./target/testnet/malus ./artifacts/.
- - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
- - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
- - echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
- - cp -r ./scripts/* ./artifacts
-
-build-staking-miner:
- stage: stage1
- <<: *collect-artifacts
- <<: *docker-env
- <<: *compiler-info
- <<: *common-refs
- script:
- - time cargo build --locked --release --package staking-miner
- # pack artifacts
- - mkdir -p ./artifacts
- - mv ./target/release/staking-miner ./artifacts/.
- - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
- - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
- - echo "staking-miner = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
- - cp -r ./scripts/* ./artifacts
-
-#### stage: stage2
-
-.check-dependent-project: &check-dependent-project
- stage: stage2
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: cargo-fmt
- artifacts: false
- <<: *docker-env
- <<: *test-pr-refs
- script:
- - git clone
- --depth=1
- "--branch=$PIPELINE_SCRIPTS_TAG"
- https://github.com/paritytech/pipeline-scripts
- - ./pipeline-scripts/check_dependent_project.sh
- --org paritytech
- --dependent-repo "$DEPENDENT_REPO"
- --github-api-token "$GITHUB_PR_TOKEN"
- --extra-dependencies "$EXTRA_DEPENDENCIES"
- --companion-overrides "$COMPANION_OVERRIDES"
-
-check-dependent-cumulus:
- <<: *check-dependent-project
- variables:
- DEPENDENT_REPO: cumulus
- EXTRA_DEPENDENCIES: substrate
- COMPANION_OVERRIDES: |
- polkadot: release-v*
- cumulus: polkadot-v*
-
-test-node-metrics:
- stage: stage2
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: cargo-fmt
- artifacts: false
- <<: *docker-env
- <<: *compiler-info
- <<: *test-refs
- variables:
- RUST_TOOLCHAIN: stable
- # Enable debug assertions since we are running optimized builds for testing
- # but still want to have debug assertions.
- RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
- script:
- - time cargo test --profile testnet --verbose --locked --features=runtime-metrics -p polkadot-node-metrics
-
-test-deterministic-wasm:
- stage: stage2
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: cargo-fmt
- artifacts: false
- <<: *test-refs
- <<: *docker-env
- <<: *compiler-info
- script:
- - ./scripts/ci/gitlab/test_deterministic_wasm.sh
-
-check-transaction-versions:
- stage: stage2
- <<: *test-refs
- <<: *docker-env
- image: node:15
- needs:
- - job: build-linux-stable
- artifacts: true
- before_script:
- - apt-get -y update; apt-get -y install jq lsof
- - npm install --ignore-scripts -g @polkadot/metadata-cmp
- # Set git config
- - git config remote.origin.url "https://github.com/paritytech/polkadot.git"
- - git fetch origin release
- script:
- - ./scripts/ci/gitlab/check_extrinsics_ordering.sh
-
-
-
-# This image is used in testnets
-# Release image is handled by the Github Action here:
-# .github/workflows/publish-docker-release.yml
-publish-polkadot-debug-image:
- stage: stage2
- <<: *build-push-image
- rules:
- # Don't run when triggered from another pipeline
- - if: $CI_PIPELINE_SOURCE == "pipeline"
- when: never
- - if: $CI_PIPELINE_SOURCE == "web"
- - if: $CI_PIPELINE_SOURCE == "schedule"
- - if: $CI_COMMIT_REF_NAME == "master"
- - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
- - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
- variables:
- <<: *image-variables
- # scripts/ci/dockerfiles/polkadot_injected_debug.Dockerfile
- DOCKERFILE: ci/dockerfiles/polkadot_injected_debug.Dockerfile
- IMAGE_NAME: docker.io/paritypr/polkadot-debug
- needs:
- - job: build-linux-stable
- artifacts: true
- after_script:
- # pass artifacts to the zombienet-tests job
- # https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#with-variable-inheritance
- - echo "PARACHAINS_IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/parachains.env
- - echo "PARACHAINS_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/parachains.env
- artifacts:
- reports:
- # this artifact is used in zombienet-tests job
- dotenv: ./artifacts/parachains.env
- expire_in: 1 days
-
-publish-test-collators-image:
- # service image for Simnet
- stage: stage2
- <<: *build-push-image
- <<: *zombienet-refs
- variables:
- <<: *image-variables
- # scripts/ci/dockerfiles/collator_injected.Dockerfile
- DOCKERFILE: ci/dockerfiles/collator_injected.Dockerfile
- IMAGE_NAME: docker.io/paritypr/colander
- needs:
- - job: build-test-collators
- artifacts: true
- after_script:
- - buildah logout --all
- # pass artifacts to the zombienet-tests job
- - echo "COLLATOR_IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/collator.env
- - echo "COLLATOR_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/collator.env
- artifacts:
- reports:
- # this artifact is used in zombienet-tests job
- dotenv: ./artifacts/collator.env
-
-publish-malus-image:
- # service image for Simnet
- stage: stage2
- <<: *build-push-image
- <<: *zombienet-refs
- variables:
- <<: *image-variables
- # scripts/ci/dockerfiles/malus_injected.Dockerfile
- DOCKERFILE: ci/dockerfiles/malus_injected.Dockerfile
- IMAGE_NAME: docker.io/paritypr/malus
- needs:
- - job: build-malus
- artifacts: true
- after_script:
- - buildah logout "$IMAGE_NAME"
- # pass artifacts to the zombienet-tests job
- - echo "MALUS_IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/malus.env
- - echo "MALUS_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/malus.env
- artifacts:
- reports:
- # this artifact is used in zombienet-tests job
- dotenv: ./artifacts/malus.env
-
-publish-staking-miner-image:
- stage: stage2
- <<: *build-push-image
- <<: *publish-refs
- variables:
- <<: *image-variables
- # scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
- DOCKERFILE: ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
- IMAGE_NAME: docker.io/paritytech/staking-miner
- GIT_STRATEGY: none
- DOCKER_USER: ${Docker_Hub_User_Parity}
- DOCKER_PASS: ${Docker_Hub_Pass_Parity}
- needs:
- - job: build-staking-miner
- artifacts: true
-
-
-publish-s3-release: &publish-s3
- stage: stage3
- needs:
- - job: build-linux-stable
- artifacts: true
- <<: *kubernetes-env
- image: paritytech/awscli:latest
- variables:
- GIT_STRATEGY: none
- PREFIX: "builds/polkadot/${ARCH}-${DOCKER_OS}"
- rules:
- - if: $CI_PIPELINE_SOURCE == "pipeline"
- when: never
- # publishing binaries nightly
- - if: $CI_PIPELINE_SOURCE == "schedule"
- before_script:
- - *check-versions
- script:
- - echo "uploading objects to https://releases.parity.io/${PREFIX}/${VERSION}"
- - aws s3 sync --acl public-read ./artifacts/ s3://${AWS_BUCKET}/${PREFIX}/${VERSION}/
- - echo "update objects at https://releases.parity.io/${PREFIX}/${EXTRATAG}"
- - find ./artifacts -type f | while read file; do
- name="${file#./artifacts/}";
- aws s3api copy-object
- --copy-source ${AWS_BUCKET}/${PREFIX}/${VERSION}/${name}
- --bucket ${AWS_BUCKET} --key ${PREFIX}/${EXTRATAG}/${name};
- done
- - |
- cat <<-EOM
- |
- | polkadot binary paths:
- |
- | - https://releases.parity.io/${PREFIX}/${EXTRATAG}/polkadot
- | - https://releases.parity.io/${PREFIX}/${VERSION}/polkadot
- |
- EOM
- after_script:
- - aws s3 ls s3://${AWS_BUCKET}/${PREFIX}/${EXTRATAG}/
- --recursive --human-readable --summarize
-
-update_polkadot_weights: &update-weights
- stage: stage2
- timeout: 1d
- when: manual
- variables:
- RUNTIME: polkadot
- artifacts:
- paths:
- - ${RUNTIME}_weights_${CI_COMMIT_SHORT_SHA}.patch
- script:
- - ./scripts/ci/run_benches_for_runtime.sh $RUNTIME
- - git diff -P > ${RUNTIME}_weights_${CI_COMMIT_SHORT_SHA}.patch
- # uses the "shell" executors
- tags:
- - weights
-
-update_kusama_weights:
- <<: *update-weights
- variables:
- RUNTIME: kusama
-
-update_westend_weights:
- <<: *update-weights
- variables:
- RUNTIME: westend
-
-update_rococo_weights:
- <<: *update-weights
- variables:
- RUNTIME: rococo
-
-#### stage: stage3
-
-build-rustdoc:
- stage: stage3
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: test-deterministic-wasm
- artifacts: false
- <<: *docker-env
- <<: *test-refs
- variables:
- SKIP_WASM_BUILD: 1
- artifacts:
- name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
- when: on_success
- expire_in: 1 days
- paths:
- - ./crate-docs/
- script:
- # FIXME: it fails with `RUSTDOCFLAGS="-Dwarnings"` and `--all-features`
- # FIXME: return to stable when https://github.com/rust-lang/rust/issues/96937 gets into stable
- - time cargo +nightly doc --workspace --verbose --no-deps
- - rm -f ./target/doc/.lock
- - mv ./target/doc ./crate-docs
- # FIXME: remove me after CI image gets nonroot
- - chown -R nonroot:nonroot ./crate-docs
- - echo "" > ./crate-docs/index.html
-
-build-implementers-guide:
- stage: stage3
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: test-deterministic-wasm
- artifacts: false
- <<: *test-refs
- <<: *docker-env
- <<: *collect-artifacts-short
- script:
- - cargo install mdbook mdbook-mermaid mdbook-linkcheck
- - mdbook build ./roadmap/implementers-guide
- - mkdir -p artifacts
- - mv roadmap/implementers-guide/book artifacts/
- # FIXME: remove me after CI image gets nonroot
- - chown -R nonroot:nonroot artifacts/
-
-check-try-runtime:
- stage: stage3
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: test-node-metrics
- artifacts: false
- <<: *test-refs
- <<: *docker-env
- <<: *compiler-info
- script:
- # Check that everything compiles with `try-runtime` feature flag.
- - cargo check --features try-runtime --all
-
-# More info can be found here: https://github.com/paritytech/polkadot/pull/5865
-# Works only in PRs
-check-runtime-migration:
- stage: stage3
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: test-node-metrics
- artifacts: false
- <<: *test-pr-refs
- <<: *docker-env
- <<: *compiler-info
- script:
- - |
- export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \
- -H "Authorization: token $GITHUB_PR_TOKEN" \
- https://api.github.com/repos/paritytech/polkadot/issues/$CI_COMMIT_REF_NAME/labels | grep "E1" | wc -l)
- - |
- if [[ $has_runtimemigration_label != 0 ]]; then
- echo "Found label runtimemigration. Running tests"
- export RUST_LOG=remote-ext=debug,runtime=debug
- time cargo test --release -p westend-runtime -p polkadot-runtime -p kusama-runtime --features try-runtime
- else
- echo "runtimemigration label not found. Skipping"
- fi
-
-
-check-no-default-features:
- stage: stage3
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: test-deterministic-wasm
- artifacts: false
- <<: *test-refs
- <<: *docker-env
- <<: *compiler-info
- script:
- # Check that polkadot-cli will compile no default features.
- - pushd ./node/service && cargo check --no-default-features && popd
- - pushd ./cli && cargo check --no-default-features --features "service" && popd
- - sccache -s
-
-build-short-benchmark:
- stage: stage3
- <<: *test-refs
- <<: *docker-env
- <<: *collect-artifacts
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: test-node-metrics
- artifacts: false
- script:
- - cargo +nightly build --profile release --locked --features=runtime-benchmarks
- - mkdir artifacts
- - cp ./target/release/polkadot ./artifacts/
+#### stage: .post
deploy-parity-testnet:
- stage: stage3
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: test-deterministic-wasm
- artifacts: false
- <<: *deploy-testnet-refs
+ stage: .post
+ extends:
+ - .deploy-testnet-refs
variables:
POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
allow_failure: false
trigger: "parity/infrastructure/parity-testnet"
-zombienet-tests-parachains-smoke-test:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- - job: publish-malus-image
- - job: publish-test-collators-image
- variables:
- GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
- before_script:
- - echo "Zombie-net Tests Config"
- - echo "${ZOMBIENET_IMAGE}"
- - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie,zombie::network-node
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- - export COL_IMAGE="docker.io/paritypr/colander:4519" # The collator image is fixed
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0001-parachains-smoke-test.feature"
- allow_failure: false
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-zombienet-tests-parachains-pvf:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- - job: publish-test-collators-image
- variables:
- GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
- before_script:
- - echo "Zombie-net Tests Config"
- - echo "${ZOMBIENET_IMAGE}"
- - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- - echo "COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie,zombie::network-node
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0001-parachains-pvf.feature"
- allow_failure: false
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-zombienet-tests-parachains-disputes:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- - job: publish-test-collators-image
- - job: publish-malus-image
- variables:
- GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
- before_script:
- - echo "Zombie-net Tests Config"
- - echo "${ZOMBIENET_IMAGE_NAME}"
- - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie,zombie::network-node
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0002-parachains-disputes.feature"
- allow_failure: false
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-zombienet-tests-parachains-disputes-garbage-candidate:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- - job: publish-test-collators-image
- - job: publish-malus-image
- variables:
- GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
- before_script:
- - echo "Zombie-net Tests Config"
- - echo "${ZOMBIENET_IMAGE_NAME}"
- - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie,zombie::network-node
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0003-parachains-garbage-candidate.feature"
- allow_failure: false
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-zombienet-test-parachains-upgrade-smoke-test:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- - job: publish-malus-image
- - job: publish-test-collators-image
- variables:
- GH_DIR: 'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke'
- before_script:
- - echo "ZombieNet Tests Config"
- - echo "${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
- - echo "docker.io/parity/polkadot-collator:latest"
- - echo "${ZOMBIENET_IMAGE}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie,zombie::network-node
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- - export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0002-parachains-upgrade-smoke-test.feature"
- allow_failure: true
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-zombienet-tests-misc-paritydb:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- - job: publish-test-collators-image
- artifacts: true
- variables:
- GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
- before_script:
- - echo "Zombie-net Tests Config"
- - echo "${ZOMBIENET_IMAGE_NAME}"
- - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie,zombie::network-node
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0001-paritydb.feature"
- allow_failure: false
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-zombienet-tests-malus-dispute-valid:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- - job: publish-malus-image
- - job: publish-test-collators-image
- variables:
- GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/node/malus/integrationtests"
- before_script:
- - echo "Zombie-net Tests Config"
- - echo "${ZOMBIENET_IMAGE_NAME}"
- - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- - echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie*
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0001-dispute-valid-block.feature"
- allow_failure: false
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-zombienet-tests-deregister-register-validator:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- artifacts: true
- variables:
- GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke"
- before_script:
- - echo "Zombie-net Tests Config"
- - echo "${ZOMBIENET_IMAGE_NAME}"
- - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie*
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0003-deregister-register-validator-smoke.feature"
- allow_failure: false
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-zombienet-tests-beefy-and-mmr:
- stage: stage3
- image: "${ZOMBIENET_IMAGE}"
- <<: *kubernetes-env
- <<: *zombienet-refs
- needs:
- - job: publish-polkadot-debug-image
- variables:
- GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
- before_script:
- - echo "Zombie-net Tests Config"
- - echo "${ZOMBIENET_IMAGE_NAME}"
- - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- - echo "${GH_DIR}"
- - export DEBUG=zombie*
- - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
- --github-remote-dir="${GH_DIR}"
- --test="0003-beefy-and-mmr.feature"
- allow_failure: true
- retry: 2
- tags:
- - zombienet-polkadot-integration-test
-
-#### stage: stage4
-
-publish-rustdoc:
- stage: stage4
- <<: *kubernetes-env
- image: paritytech/tools:latest
- variables:
- GIT_DEPTH: 100
- rules:
- - if: $CI_PIPELINE_SOURCE == "pipeline"
- when: never
- - if: $CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_REF_NAME == "master"
- - if: $CI_COMMIT_REF_NAME == "master"
- # `needs:` can be removed after CI image gets nonroot. In this case `needs:` stops other
- # artifacts from being dowloaded by this job.
- needs:
- - job: build-rustdoc
- artifacts: true
- - job: build-implementers-guide
- artifacts: true
- script:
- # Save README and docs
- - cp -r ./crate-docs/ /tmp/doc/
- - cp -r ./artifacts/book/ /tmp/
- # setup ssh
- - eval $(ssh-agent)
- - ssh-add - <<< ${GITHUB_SSH_PRIV_KEY}
- - mkdir ~/.ssh && touch ~/.ssh/known_hosts
- - ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
- # Set git config
- - git config user.email "devops-team@parity.io"
- - git config user.name "${GITHUB_USER}"
- - git config remote.origin.url "git@github.com:/paritytech/${CI_PROJECT_NAME}.git"
- - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
- - git fetch origin gh-pages
- - git checkout gh-pages
- # Remove everything and restore generated docs and README
- - cp index.html /tmp
- - cp README.md /tmp
- - rm -rf ./*
- # dir for rustdoc
- - mkdir -p doc
- # dir for implementors guide
- - mkdir -p book
- - mv /tmp/doc/* doc/
- - mv /tmp/book/html/* book/
- - mv /tmp/index.html .
- - mv /tmp/README.md .
- # Upload files
- - git add --all --force
- # `git commit` has an exit code of > 0 if there is nothing to commit.
- # This causes GitLab to exit immediately and marks this job failed.
- # We don't want to mark the entire job failed if there's nothing to
- # publish though, hence the `|| true`.
- - git commit -m "Updated docs for ${CI_COMMIT_REF_NAME}" ||
- echo "___Nothing to commit___"
- - git push origin gh-pages --force
- - echo "___Rustdoc was successfully published to https://paritytech.github.io/polkadot/___"
- after_script:
- - rm -rf .git/ ./*
-
-# Run all pallet benchmarks only once to check if there are any errors
-short-benchmark-polkadot: &short-bench
- stage: stage4
- <<: *test-pr-refs
- <<: *docker-env
- # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
- needs:
- - job: build-short-benchmark
- artifacts: true
- variables:
- RUNTIME: polkadot
- script:
- - ./artifacts/polkadot benchmark pallet --execution wasm --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
-
-short-benchmark-kusama:
- <<: *short-bench
- variables:
- RUNTIME: kusama
-
-short-benchmark-westend:
- <<: *short-bench
- variables:
- RUNTIME: westend
-
-#### stage: .post
-
# This job cancels the whole pipeline if any of provided jobs fail.
# In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
# to fail the pipeline as soon as possible to shorten the feedback loop.
@@ -1054,10 +227,8 @@ short-benchmark-westend:
PR_NUM: "${PR_NUM}"
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
- # remove branch, when pipeline-stopper for polakdot is updated to the same branch
- branch: "as-improve"
-cancel-pipeline-test-linux-stable:
+.cancel-pipeline-test-linux-stable:
extends: .cancel-pipeline-template
needs:
- job: test-linux-stable
diff --git a/Cargo.lock b/Cargo.lock
index bc268f794ffe..52a38873940b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,7 +33,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.4",
]
[[package]]
@@ -68,7 +68,7 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.7",
+ "getrandom 0.2.3",
"once_cell",
"version_check",
]
@@ -88,15 +88,6 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbf688625d06217d5b1bb0ea9d9c44a1635fd0ee3534466388d18203174f4d11"
-[[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 = "ansi_term"
version = "0.12.1"
@@ -108,24 +99,30 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.63"
+version = "1.0.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26fa4d7e3f2eebadf743988fc8aec9fa9a9e82611acafd77c1462ed6262440a"
+checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
[[package]]
name = "approx"
-version = "0.5.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e"
dependencies = [
"num-traits",
]
[[package]]
name = "arbitrary"
-version = "1.1.4"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "510c76ecefdceada737ea728f4f9a84bd2e1ef29f1ba555e560940fe279954de"
+
+[[package]]
+name = "array-bytes"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8931eb436ab9bf1980c6cb2b9d1ba5390cd6793b2c6e2d2ea8147da3570c2a2e"
+checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949"
[[package]]
name = "arrayref"
@@ -192,9 +189,9 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "1.7.1"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
+checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
dependencies = [
"concurrent-queue",
"event-listener",
@@ -217,26 +214,26 @@ dependencies = [
[[package]]
name = "async-global-executor"
-version = "2.3.0"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca"
+checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6"
dependencies = [
"async-channel",
"async-executor",
"async-io",
- "async-lock",
+ "async-mutex",
"blocking",
"futures-lite",
+ "num_cpus",
"once_cell",
]
[[package]]
name = "async-io"
-version = "1.9.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
+checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
dependencies = [
- "autocfg",
"concurrent-queue",
"futures-lite",
"libc",
@@ -252,21 +249,29 @@ dependencies = [
[[package]]
name = "async-lock"
-version = "2.5.0"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
+dependencies = [
+ "event-listener",
+]
+
+[[package]]
+name = "async-mutex"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
+checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e"
dependencies = [
"event-listener",
]
[[package]]
name = "async-process"
-version = "1.5.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
+checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6"
dependencies = [
"async-io",
- "autocfg",
"blocking",
"cfg-if 1.0.0",
"event-listener",
@@ -299,7 +304,7 @@ dependencies = [
"log",
"memchr",
"once_cell",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
"pin-utils",
"slab",
"wasm-bindgen-futures",
@@ -307,9 +312,9 @@ dependencies = [
[[package]]
name = "async-std-resolver"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8"
+checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723"
dependencies = [
"async-std",
"async-trait",
@@ -322,9 +327,9 @@ dependencies = [
[[package]]
name = "async-task"
-version = "4.3.0"
+version = "4.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
+checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
[[package]]
name = "async-trait"
@@ -347,7 +352,7 @@ dependencies = [
"futures-sink",
"futures-util",
"memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
]
[[package]]
@@ -369,30 +374,30 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.1.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "backtrace"
-version = "0.3.66"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
dependencies = [
"addr2line",
"cc",
"cfg-if 1.0.0",
"libc",
"miniz_oxide",
- "object 0.29.0",
+ "object 0.27.1",
"rustc-demangle",
]
[[package]]
name = "base-x"
-version = "0.2.11"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
[[package]]
name = "base16ct"
@@ -412,11 +417,17 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+[[package]]
+name = "base64ct"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474"
+
[[package]]
name = "beef"
-version = "0.5.2"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
+checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736"
dependencies = [
"serde",
]
@@ -424,14 +435,14 @@ dependencies = [
[[package]]
name = "beefy-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"async-trait",
"beefy-primitives",
"fnv",
"futures",
"futures-timer",
- "hex",
"log",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -441,6 +452,7 @@ dependencies = [
"sc-finality-grandpa",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-network-gossip",
"sc-utils",
"sp-api",
@@ -448,7 +460,7 @@ dependencies = [
"sp-arithmetic",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keystore",
"sp-mmr-primitives",
"sp-runtime",
@@ -460,7 +472,7 @@ dependencies = [
[[package]]
name = "beefy-gadget-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"beefy-gadget",
"beefy-primitives",
@@ -472,7 +484,7 @@ dependencies = [
"sc-rpc",
"sc-utils",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
"thiserror",
]
@@ -480,32 +492,30 @@ dependencies = [
[[package]]
name = "beefy-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"beefy-primitives",
"sp-api",
+ "sp-runtime",
]
[[package]]
name = "beefy-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"scale-info",
+ "serde",
"sp-api",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-io",
+ "sp-mmr-primitives",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
-[[package]]
-name = "bimap"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b"
-
[[package]]
name = "bincode"
version = "1.3.3"
@@ -517,9 +527,9 @@ dependencies = [
[[package]]
name = "bindgen"
-version = "0.59.2"
+version = "0.60.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
dependencies = [
"bitflags",
"cexpr",
@@ -613,7 +623,7 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
dependencies = [
- "block-padding 0.1.5",
+ "block-padding",
"byte-tools",
"byteorder",
"generic-array 0.12.4",
@@ -625,17 +635,16 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
- "block-padding 0.2.1",
- "generic-array 0.14.6",
+ "generic-array 0.14.4",
]
[[package]]
name = "block-buffer"
-version = "0.10.2"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.4",
]
[[package]]
@@ -647,17 +656,11 @@ dependencies = [
"byte-tools",
]
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
[[package]]
name = "blocking"
-version = "1.2.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
+checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427"
dependencies = [
"async-channel",
"async-task",
@@ -704,15 +707,15 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.11.0"
+version = "3.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
[[package]]
name = "byte-slice-cast"
-version = "1.2.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e"
+checksum = "1d30c751592b77c499e7bce34d99d67c2c11bdc0574e9a488ddade14150a4698"
[[package]]
name = "byte-tools"
@@ -745,15 +748,15 @@ dependencies = [
[[package]]
name = "cache-padded"
-version = "1.2.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
[[package]]
name = "camino"
-version = "1.1.1"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
+checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b"
dependencies = [
"serde",
]
@@ -775,16 +778,16 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
dependencies = [
"camino",
"cargo-platform",
- "semver 1.0.13",
+ "semver 1.0.4",
"serde",
"serde_json",
]
[[package]]
name = "cc"
-version = "1.0.73"
+version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
dependencies = [
"jobserver",
]
@@ -798,6 +801,15 @@ dependencies = [
"nom",
]
+[[package]]
+name = "cfg-expr"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+dependencies = [
+ "smallvec",
+]
+
[[package]]
name = "cfg-if"
version = "0.1.10"
@@ -818,9 +830,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
[[package]]
name = "chacha20"
-version = "0.8.2"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
+checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91"
dependencies = [
"cfg-if 1.0.0",
"cipher",
@@ -830,9 +842,9 @@ dependencies = [
[[package]]
name = "chacha20poly1305"
-version = "0.9.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
+checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a"
dependencies = [
"aead",
"chacha20",
@@ -843,16 +855,14 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.22"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
- "iana-time-zone",
- "js-sys",
+ "libc",
"num-integer",
"num-traits",
"time",
- "wasm-bindgen",
"winapi",
]
@@ -875,7 +885,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.4",
]
[[package]]
@@ -889,37 +899,35 @@ dependencies = [
[[package]]
name = "clang-sys"
-version = "1.3.3"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
+checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90"
dependencies = [
"glob",
"libc",
- "libloading 0.7.3",
+ "libloading",
]
[[package]]
name = "clap"
-version = "3.2.20"
+version = "4.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
+checksum = "6bf8832993da70a4c6d13c581f4463c2bdda27b9bf1c5498dc4365543abe6d6f"
dependencies = [
"atty",
"bitflags",
"clap_derive",
"clap_lex",
- "indexmap",
"once_cell",
"strsim",
"termcolor",
- "textwrap",
]
[[package]]
name = "clap_derive"
-version = "3.2.18"
+version = "4.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "c42f169caba89a7d512b5418b09864543eeb4d497416c917d7137863bd2076ad"
dependencies = [
"heck",
"proc-macro-error",
@@ -930,22 +938,13 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.2.4"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
dependencies = [
"os_str_bytes",
]
-[[package]]
-name = "cmake"
-version = "0.1.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "coarsetime"
version = "0.1.22"
@@ -960,9 +959,9 @@ dependencies = [
[[package]]
name = "color-eyre"
-version = "0.6.2"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+checksum = "8ebf286c900a6d5867aeff75cfee3192857bb7f24b547d4f0df2ed6baa812c90"
dependencies = [
"backtrace",
"eyre",
@@ -973,9 +972,9 @@ dependencies = [
[[package]]
name = "comfy-table"
-version = "6.1.0"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85914173c2f558d61613bfbbf1911f14e630895087a7ed2fafc0f5319e1536e7"
+checksum = "121d8a5b0346092c18a4b2fd6f620d7a06f0eb7ac0a45860939a0884bc579c56"
dependencies = [
"strum",
"strum_macros",
@@ -984,9 +983,9 @@ dependencies = [
[[package]]
name = "concurrent-queue"
-version = "1.2.4"
+version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
dependencies = [
"cache-padded",
]
@@ -1011,9 +1010,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "core-foundation"
-version = "0.9.3"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1036,37 +1035,39 @@ dependencies = [
[[package]]
name = "cpp_demangle"
-version = "0.3.5"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
+checksum = "931ab2a3e6330a07900b8e7ca4e106cdcbb93f2b9a52df55e54ee53d8305b55d"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "cpufeatures"
-version = "0.2.4"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc948ebb96241bb40ab73effeb80d9f93afaad49359d159a5e61be51619fe813"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
dependencies = [
"libc",
]
[[package]]
name = "cranelift-bforest"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8"
+checksum = "b27bbd3e6c422cf6282b047bcdd51ecd9ca9f3497a3be0132ffa08e509b824b0"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea"
+checksum = "872f5d4557a411b087bd731df6347c142ae1004e6467a144a7e33662e5715a01"
dependencies = [
+ "arrayvec 0.7.2",
+ "bumpalo",
"cranelift-bforest",
"cranelift-codegen-meta",
"cranelift-codegen-shared",
@@ -1081,33 +1082,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6"
+checksum = "21b49fdebb29c62c1fc4da1eeebd609e9d530ecde24a9876def546275f73a244"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2"
+checksum = "5fc0c091e2db055d4d7f6b7cec2d2ead286bcfaea3357c6a52c2a2613a8cb5ac"
[[package]]
name = "cranelift-entity"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d"
+checksum = "354a9597be87996c9b278655e68b8447f65dd907256855ad773864edee8d985c"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c"
+checksum = "0cd8dd3fb8b82c772f4172e87ae1677b971676fffa7c4e3398e3047e650a266b"
dependencies = [
"cranelift-codegen",
"log",
@@ -1117,15 +1118,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b"
+checksum = "b82527802b1f7d8da288adc28f1dc97ea52943f5871c041213f7b5035ac698a7"
[[package]]
name = "cranelift-native"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6"
+checksum = "c30ba8b910f1be023af0c39109cb28a8809734942a6b3eecbf2de8993052ea5e"
dependencies = [
"cranelift-codegen",
"libc",
@@ -1134,9 +1135,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.85.3"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54"
+checksum = "776a8916d201894aca9637a20814f1e11abc62acd5cfbe0b4eb2e63922756971"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -1150,18 +1151,18 @@ dependencies = [
[[package]]
name = "crc32fast"
-version = "1.3.2"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils",
@@ -1169,9 +1170,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-epoch",
@@ -1180,23 +1181,22 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.10"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
dependencies = [
- "autocfg",
"cfg-if 1.0.0",
"crossbeam-utils",
+ "lazy_static",
"memoffset",
- "once_cell",
"scopeguard",
]
[[package]]
name = "crossbeam-queue"
-version = "0.3.6"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7"
+checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils",
@@ -1204,9 +1204,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.11"
+version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
+checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978"
dependencies = [
"cfg-if 1.0.0",
"once_cell",
@@ -1224,7 +1224,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.4",
"rand_core 0.6.3",
"subtle",
"zeroize",
@@ -1232,11 +1232,11 @@ dependencies = [
[[package]]
name = "crypto-common"
-version = "0.1.6"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.4",
"typenum",
]
@@ -1246,7 +1246,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.4",
"subtle",
]
@@ -1256,15 +1256,15 @@ 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.4",
"subtle",
]
[[package]]
name = "ctor"
-version = "0.1.23"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
+checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa"
dependencies = [
"quote",
"syn",
@@ -1279,17 +1279,6 @@ dependencies = [
"cipher",
]
-[[package]]
-name = "cuckoofilter"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18"
-dependencies = [
- "byteorder",
- "fnv",
- "rand 0.7.3",
-]
-
[[package]]
name = "curve25519-dalek"
version = "2.1.3"
@@ -1357,9 +1346,9 @@ dependencies = [
[[package]]
name = "debugid"
-version = "0.7.3"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ee87af31d84ef885378aebca32be3d682b0e0dc119d5b4860a2c5bb5046730"
+checksum = "f91cf5a8c2f2097e2a32627123508635d47ce10563d999ec1a95addf08b502ba"
dependencies = [
"uuid",
]
@@ -1399,9 +1388,9 @@ dependencies = [
[[package]]
name = "diff"
-version = "0.1.13"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
[[package]]
name = "difflib"
@@ -1424,7 +1413,7 @@ 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.4",
]
[[package]]
@@ -1433,7 +1422,7 @@ version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
dependencies = [
- "block-buffer 0.10.2",
+ "block-buffer 0.10.0",
"crypto-common",
"subtle",
]
@@ -1459,9 +1448,9 @@ dependencies = [
[[package]]
name = "dirs-sys"
-version = "0.3.7"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
dependencies = [
"libc",
"redox_users",
@@ -1481,9 +1470,9 @@ dependencies = [
[[package]]
name = "dissimilar"
-version = "1.0.4"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5"
+checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd"
[[package]]
name = "dlmalloc"
@@ -1501,7 +1490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea"
dependencies = [
"byteorder",
- "quick-error",
+ "quick-error 1.2.3",
]
[[package]]
@@ -1510,6 +1499,12 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+[[package]]
+name = "downcast"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+
[[package]]
name = "downcast-rs"
version = "1.2.0"
@@ -1518,9 +1513,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
name = "dtoa"
-version = "1.0.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6053ff46b5639ceb91756a85a4c8914668393a03170efd79c8884a529d80656"
+checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6"
[[package]]
name = "dyn-clonable"
@@ -1545,9 +1540,9 @@ dependencies = [
[[package]]
name = "dyn-clone"
-version = "1.0.9"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
+checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
[[package]]
name = "ecdsa"
@@ -1563,9 +1558,9 @@ dependencies = [
[[package]]
name = "ed25519"
-version = "1.5.2"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
+checksum = "74e1069e39f1454367eb2de793ed062fac4c35c2934b76a81d90dd9abcd28816"
dependencies = [
"signature",
]
@@ -1580,7 +1575,7 @@ dependencies = [
"ed25519",
"rand 0.7.3",
"serde",
- "sha2 0.9.9",
+ "sha2 0.9.8",
"zeroize",
]
@@ -1593,16 +1588,16 @@ dependencies = [
"curve25519-dalek 3.2.0",
"hex",
"rand_core 0.6.3",
- "sha2 0.9.9",
+ "sha2 0.9.8",
"thiserror",
"zeroize",
]
[[package]]
name = "either"
-version = "1.8.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "elliptic-curve"
@@ -1614,7 +1609,7 @@ dependencies = [
"crypto-bigint",
"der",
"ff",
- "generic-array 0.14.6",
+ "generic-array 0.14.4",
"group",
"rand_core 0.6.3",
"sec1",
@@ -1624,18 +1619,18 @@ dependencies = [
[[package]]
name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "enum-as-inner"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
+checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
dependencies = [
"heck",
"proc-macro2",
@@ -1674,6 +1669,19 @@ dependencies = [
"syn",
]
+[[package]]
+name = "env_logger"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+dependencies = [
+ "atty",
+ "humantime 1.3.0",
+ "log",
+ "regex",
+ "termcolor",
+]
+
[[package]]
name = "env_logger"
version = "0.9.0"
@@ -1681,7 +1689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
dependencies = [
"atty",
- "humantime",
+ "humantime 2.1.0",
"log",
"regex",
"termcolor",
@@ -1695,9 +1703,9 @@ checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797"
[[package]]
name = "erased-serde"
-version = "0.3.23"
+version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11"
+checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd"
dependencies = [
"serde",
]
@@ -1725,9 +1733,9 @@ dependencies = [
[[package]]
name = "event-listener"
-version = "2.5.3"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
[[package]]
name = "exit-future"
@@ -1771,9 +1779,9 @@ dependencies = [
[[package]]
name = "eyre"
-version = "0.6.8"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b"
dependencies = [
"indenter",
"once_cell",
@@ -1793,9 +1801,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
[[package]]
name = "fastrand"
-version = "1.8.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
dependencies = [
"instant",
]
@@ -1852,9 +1860,9 @@ dependencies = [
[[package]]
name = "ff"
-version = "0.11.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924"
+checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e"
dependencies = [
"rand_core 0.6.3",
"subtle",
@@ -1862,11 +1870,11 @@ dependencies = [
[[package]]
name = "file-per-thread-logger"
-version = "0.1.5"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f"
+checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126"
dependencies = [
- "env_logger",
+ "env_logger 0.7.1",
"log",
]
@@ -1879,7 +1887,7 @@ dependencies = [
"cfg-if 1.0.0",
"libc",
"redox_syscall",
- "windows-sys",
+ "windows-sys 0.36.1",
]
[[package]]
@@ -1912,9 +1920,9 @@ dependencies = [
[[package]]
name = "fixed-hash"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
dependencies = [
"byteorder",
"rand 0.8.5",
@@ -1924,21 +1932,32 @@ dependencies = [
[[package]]
name = "fixedbitset"
-version = "0.4.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
[[package]]
name = "flate2"
-version = "1.0.24"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
dependencies = [
+ "cfg-if 1.0.0",
"crc32fast",
+ "libc",
"libz-sys",
"miniz_oxide",
]
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "fnv"
version = "1.0.7"
@@ -1963,7 +1982,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
]
@@ -1978,10 +1997,16 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "fragile"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab"
+
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
@@ -1993,19 +2018,21 @@ dependencies = [
"serde",
"sp-api",
"sp-application-crypto",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
]
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"Inflector",
+ "array-bytes",
"chrono",
"clap",
"comfy-table",
@@ -2015,7 +2042,6 @@ dependencies = [
"gethostname",
"handlebars",
"hash-db",
- "hex",
"itertools",
"kvdb",
"lazy_static",
@@ -2037,15 +2063,15 @@ dependencies = [
"serde_nanos",
"sp-api",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-database",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-externalities",
"sp-inherents",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-storage",
+ "sp-trie",
"tempfile",
"thiserror",
"thousands",
@@ -2054,7 +2080,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2065,7 +2091,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2075,23 +2101,24 @@ dependencies = [
"sp-arithmetic",
"sp-npos-elections",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
+ "frame-try-runtime",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
]
[[package]]
@@ -2109,7 +2136,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"bitflags",
"frame-metadata",
@@ -2125,25 +2152,28 @@ dependencies = [
"smallvec",
"sp-api",
"sp-arithmetic",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-core-hashing-proc-macro",
"sp-inherents",
"sp-io",
"sp-runtime",
"sp-staking",
"sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
+ "sp-weights",
"tt-call",
]
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"Inflector",
+ "cfg-expr",
"frame-support-procedural-tools",
+ "itertools",
"proc-macro2",
"quote",
"syn",
@@ -2152,7 +2182,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -2164,7 +2194,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"proc-macro2",
"quote",
@@ -2174,7 +2204,7 @@ dependencies = [
[[package]]
name = "frame-support-test"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-support-test-pallet",
@@ -2185,11 +2215,11 @@ dependencies = [
"scale-info",
"serde",
"sp-arithmetic",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-version",
"trybuild",
]
@@ -2197,7 +2227,7 @@ dependencies = [
[[package]]
name = "frame-support-test-pallet"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
@@ -2208,39 +2238,40 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"log",
"parity-scale-codec",
"scale-info",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-version",
+ "sp-weights",
]
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2249,31 +2280,20 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
+ "parity-scale-codec",
"sp-api",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "fs-err"
-version = "2.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50"
-
-[[package]]
-name = "fs-swap"
-version = "0.2.6"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5"
-dependencies = [
- "lazy_static",
- "libc",
- "libloading 0.5.2",
- "winapi",
-]
+checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0"
[[package]]
name = "fs2"
@@ -2299,9 +2319,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures"
-version = "0.3.24"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
+checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
dependencies = [
"futures-channel",
"futures-core",
@@ -2314,9 +2334,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.24"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1"
dependencies = [
"futures-core",
"futures-sink",
@@ -2324,15 +2344,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.24"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115"
[[package]]
name = "futures-executor"
-version = "0.3.24"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
+checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
dependencies = [
"futures-core",
"futures-task",
@@ -2342,9 +2362,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.24"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5"
[[package]]
name = "futures-lite"
@@ -2357,15 +2377,15 @@ dependencies = [
"futures-io",
"memchr",
"parking",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
"waker-fn",
]
[[package]]
name = "futures-macro"
-version = "0.3.24"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d"
dependencies = [
"proc-macro2",
"quote",
@@ -2374,9 +2394,9 @@ dependencies = [
[[package]]
name = "futures-rustls"
-version = "0.22.2"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd"
+checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe"
dependencies = [
"futures-io",
"rustls",
@@ -2385,15 +2405,15 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.24"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765"
[[package]]
name = "futures-task"
-version = "0.3.24"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306"
[[package]]
name = "futures-timer"
@@ -2403,9 +2423,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.24"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577"
dependencies = [
"futures-channel",
"futures-core",
@@ -2414,7 +2434,7 @@ dependencies = [
"futures-sink",
"futures-task",
"memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
"pin-utils",
"slab",
]
@@ -2431,7 +2451,7 @@ dependencies = [
[[package]]
name = "generate-bags"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"chrono",
"frame-election-provider-support",
@@ -2454,9 +2474,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
dependencies = [
"typenum",
"version_check",
@@ -2487,13 +2507,13 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.7"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.10.0+wasi-snapshot-preview1",
]
[[package]]
@@ -2508,9 +2528,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.26.2"
+version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
dependencies = [
"fallible-iterator",
"indexmap",
@@ -2519,9 +2539,9 @@ dependencies = [
[[package]]
name = "git2"
-version = "0.14.4"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c"
+checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c"
dependencies = [
"bitflags",
"libc",
@@ -2538,9 +2558,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "globset"
-version = "0.4.9"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
+checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"
dependencies = [
"aho-corasick",
"bstr",
@@ -2551,14 +2571,15 @@ dependencies = [
[[package]]
name = "gloo-timers"
-version = "0.2.4"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
+checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f"
dependencies = [
"futures-channel",
"futures-core",
"js-sys",
"wasm-bindgen",
+ "web-sys",
]
[[package]]
@@ -2574,9 +2595,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.14"
+version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
+checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e"
dependencies = [
"bytes",
"fnv",
@@ -2587,22 +2608,22 @@ dependencies = [
"indexmap",
"slab",
"tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
"tracing",
]
[[package]]
name = "handlebars"
-version = "4.3.3"
+version = "4.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360d9740069b2f6cbb63ce2dbaa71a20d3185350cbb990d7bebeb9318415eb17"
+checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b"
dependencies = [
"log",
"pest",
"pest_derive",
+ "quick-error 2.0.1",
"serde",
"serde_json",
- "thiserror",
]
[[package]]
@@ -2620,15 +2641,6 @@ dependencies = [
"crunchy",
]
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
-
[[package]]
name = "hashbrown"
version = "0.12.3"
@@ -2665,12 +2677,6 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
-[[package]]
-name = "hex_fmt"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
-
[[package]]
name = "hmac"
version = "0.8.1"
@@ -2698,7 +2704,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.4",
"hmac 0.8.1",
]
@@ -2710,7 +2716,7 @@ checksum = "848e9c511092e0daa0a35a63e8e6e475a3e8f870741448b9f6028d69b142f18e"
dependencies = [
"arbitrary",
"lazy_static",
- "memmap2 0.5.7",
+ "memmap2 0.5.0",
"rustc_version",
]
@@ -2733,25 +2739,25 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes",
"fnv",
- "itoa 1.0.3",
+ "itoa 1.0.1",
]
[[package]]
name = "http-body"
-version = "0.4.5"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
dependencies = [
"bytes",
"http",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
]
[[package]]
name = "httparse"
-version = "1.8.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
[[package]]
name = "httpdate"
@@ -2759,6 +2765,15 @@ 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"
@@ -2780,8 +2795,8 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
- "itoa 1.0.3",
- "pin-project-lite 0.2.9",
+ "itoa 1.0.1",
+ "pin-project-lite 0.2.7",
"socket2",
"tokio",
"tower-service",
@@ -2817,20 +2832,6 @@ dependencies = [
"tokio-native-tls",
]
-[[package]]
-name = "iana-time-zone"
-version = "0.1.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "winapi",
-]
-
[[package]]
name = "idna"
version = "0.2.3"
@@ -2854,9 +2855,9 @@ dependencies = [
[[package]]
name = "if-watch"
-version = "1.1.1"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791"
+checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd"
dependencies = [
"async-io",
"core-foundation",
@@ -2881,9 +2882,9 @@ dependencies = [
[[package]]
name = "impl-serde"
-version = "0.3.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
dependencies = [
"serde",
]
@@ -2912,7 +2913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
dependencies = [
"autocfg",
- "hashbrown 0.12.3",
+ "hashbrown",
"serde",
]
@@ -2927,9 +2928,9 @@ dependencies = [
[[package]]
name = "integer-encoding"
-version = "3.0.4"
+version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
+checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8"
[[package]]
name = "integer-sqrt"
@@ -2942,15 +2943,9 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6"
-
-[[package]]
-name = "io-lifetimes"
-version = "0.7.3"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06"
+checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb"
[[package]]
name = "ip_network"
@@ -2972,9 +2967,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.5.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
[[package]]
name = "itertools"
@@ -2993,9 +2988,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
-version = "1.0.3"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
[[package]]
name = "jobserver"
@@ -3008,9 +3003,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.59"
+version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
+checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
dependencies = [
"wasm-bindgen",
]
@@ -3046,7 +3041,7 @@ dependencies = [
"thiserror",
"tokio",
"tokio-rustls",
- "tokio-util",
+ "tokio-util 0.7.1",
"tracing",
"webpki-roots",
]
@@ -3154,7 +3149,7 @@ dependencies = [
"soketto",
"tokio",
"tokio-stream",
- "tokio-util",
+ "tokio-util 0.7.1",
"tracing",
"tracing-futures",
]
@@ -3173,13 +3168,13 @@ dependencies = [
[[package]]
name = "keccak"
-version = "0.1.2"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
+checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
[[package]]
name = "kusama-runtime"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -3202,10 +3197,12 @@ dependencies = [
"pallet-bounties",
"pallet-child-bounties",
"pallet-collective",
+ "pallet-conviction-voting",
"pallet-democracy",
"pallet-election-provider-multi-phase",
"pallet-election-provider-support-benchmarking",
"pallet-elections-phragmen",
+ "pallet-fast-unstake",
"pallet-gilt",
"pallet-grandpa",
"pallet-identity",
@@ -3220,7 +3217,9 @@ dependencies = [
"pallet-offences-benchmarking",
"pallet-preimage",
"pallet-proxy",
+ "pallet-ranked-collective",
"pallet-recovery",
+ "pallet-referenda",
"pallet-scheduler",
"pallet-session",
"pallet-session-benchmarking",
@@ -3234,6 +3233,7 @@ dependencies = [
"pallet-treasury",
"pallet-utility",
"pallet-vesting",
+ "pallet-whitelist",
"pallet-xcm",
"pallet-xcm-benchmarks",
"parity-scale-codec",
@@ -3253,7 +3253,7 @@ dependencies = [
"sp-authority-discovery",
"sp-block-builder",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
"sp-keyring",
@@ -3263,10 +3263,10 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
"sp-transaction-pool",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
"sp-version",
"static_assertions",
"substrate-wasm-builder",
@@ -3279,13 +3279,15 @@ dependencies = [
[[package]]
name = "kusama-runtime-constants"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
@@ -3299,9 +3301,9 @@ dependencies = [
[[package]]
name = "kvdb"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86"
+checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b"
dependencies = [
"parity-util-mem",
"smallvec",
@@ -3309,9 +3311,9 @@ dependencies = [
[[package]]
name = "kvdb-memorydb"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357"
+checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873"
dependencies = [
"kvdb",
"parity-util-mem",
@@ -3320,15 +3322,13 @@ dependencies = [
[[package]]
name = "kvdb-rocksdb"
-version = "0.15.2"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1"
+checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597"
dependencies = [
- "fs-swap",
"kvdb",
"log",
"num_cpus",
- "owning_ref",
"parity-util-mem",
"parking_lot 0.12.1",
"regex",
@@ -3338,9 +3338,9 @@ dependencies = [
[[package]]
name = "kvdb-shared-tests"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9001edd3459aa1503ea84215cf4618a6e2e020f51682494cc6f5ab1150e68e"
+checksum = "de82a1adb7ade192c0090dd56d059a626191c0638c795eb68aff4b0bd2c1f9be"
dependencies = [
"kvdb",
]
@@ -3359,15 +3359,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.132"
+version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
[[package]]
name = "libgit2-sys"
-version = "0.13.4+1.4.2"
+version = "0.13.2+1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1"
+checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b"
dependencies = [
"cc",
"libc",
@@ -3377,19 +3377,9 @@ dependencies = [
[[package]]
name = "libloading"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-dependencies = [
- "cc",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.7.3"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
+checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
dependencies = [
"cfg-if 1.0.0",
"winapi",
@@ -3397,28 +3387,24 @@ dependencies = [
[[package]]
name = "libm"
-version = "0.2.5"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565"
+checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
[[package]]
name = "libp2p"
-version = "0.46.1"
+version = "0.49.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d"
+checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1"
dependencies = [
"bytes",
"futures",
"futures-timer",
- "getrandom 0.2.7",
+ "getrandom 0.2.3",
"instant",
"lazy_static",
- "libp2p-autonat",
"libp2p-core",
- "libp2p-deflate",
"libp2p-dns",
- "libp2p-floodsub",
- "libp2p-gossipsub",
"libp2p-identify",
"libp2p-kad",
"libp2p-mdns",
@@ -3426,49 +3412,24 @@ dependencies = [
"libp2p-mplex",
"libp2p-noise",
"libp2p-ping",
- "libp2p-plaintext",
- "libp2p-pnet",
- "libp2p-relay",
- "libp2p-rendezvous",
"libp2p-request-response",
"libp2p-swarm",
"libp2p-swarm-derive",
"libp2p-tcp",
- "libp2p-uds",
"libp2p-wasm-ext",
"libp2p-websocket",
"libp2p-yamux",
"multiaddr",
"parking_lot 0.12.1",
"pin-project",
- "rand 0.7.3",
"smallvec",
]
-[[package]]
-name = "libp2p-autonat"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9"
-dependencies = [
- "async-trait",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-request-response",
- "libp2p-swarm",
- "log",
- "prost",
- "prost-build",
- "rand 0.8.5",
-]
-
[[package]]
name = "libp2p-core"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6"
+checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d"
dependencies = [
"asn1_der",
"bs58",
@@ -3479,7 +3440,6 @@ dependencies = [
"futures-timer",
"instant",
"lazy_static",
- "libsecp256k1",
"log",
"multiaddr",
"multihash",
@@ -3489,9 +3449,8 @@ dependencies = [
"prost",
"prost-build",
"rand 0.8.5",
- "ring",
"rw-stream-sink",
- "sha2 0.10.3",
+ "sha2 0.10.2",
"smallvec",
"thiserror",
"unsigned-varint",
@@ -3499,22 +3458,11 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "libp2p-deflate"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71"
-dependencies = [
- "flate2",
- "futures",
- "libp2p-core",
-]
-
[[package]]
name = "libp2p-dns"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5"
+checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720"
dependencies = [
"async-std-resolver",
"futures",
@@ -3525,57 +3473,11 @@ dependencies = [
"trust-dns-resolver",
]
-[[package]]
-name = "libp2p-floodsub"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231"
-dependencies = [
- "cuckoofilter",
- "fnv",
- "futures",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "smallvec",
-]
-
-[[package]]
-name = "libp2p-gossipsub"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0"
-dependencies = [
- "asynchronous-codec",
- "base64",
- "byteorder",
- "bytes",
- "fnv",
- "futures",
- "hex_fmt",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "prometheus-client",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "regex",
- "sha2 0.10.3",
- "smallvec",
- "unsigned-varint",
- "wasm-timer",
-]
-
[[package]]
name = "libp2p-identify"
-version = "0.37.0"
+version = "0.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06"
+checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b"
dependencies = [
"asynchronous-codec",
"futures",
@@ -3583,7 +3485,7 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "lru 0.7.8",
+ "lru 0.8.0",
"prost",
"prost-build",
"prost-codec",
@@ -3594,9 +3496,9 @@ dependencies = [
[[package]]
name = "libp2p-kad"
-version = "0.38.0"
+version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851"
+checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22"
dependencies = [
"arrayvec 0.7.2",
"asynchronous-codec",
@@ -3611,8 +3513,8 @@ dependencies = [
"log",
"prost",
"prost-build",
- "rand 0.7.3",
- "sha2 0.10.3",
+ "rand 0.8.5",
+ "sha2 0.10.2",
"smallvec",
"thiserror",
"uint",
@@ -3622,16 +3524,15 @@ dependencies = [
[[package]]
name = "libp2p-mdns"
-version = "0.38.0"
+version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2"
+checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15"
dependencies = [
"async-io",
"data-encoding",
"dns-parser",
"futures",
"if-watch",
- "lazy_static",
"libp2p-core",
"libp2p-swarm",
"log",
@@ -3643,25 +3544,23 @@ dependencies = [
[[package]]
name = "libp2p-metrics"
-version = "0.7.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c"
+checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9"
dependencies = [
"libp2p-core",
- "libp2p-gossipsub",
"libp2p-identify",
"libp2p-kad",
"libp2p-ping",
- "libp2p-relay",
"libp2p-swarm",
"prometheus-client",
]
[[package]]
name = "libp2p-mplex"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2"
+checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89"
dependencies = [
"asynchronous-codec",
"bytes",
@@ -3670,16 +3569,16 @@ dependencies = [
"log",
"nohash-hasher",
"parking_lot 0.12.1",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"unsigned-varint",
]
[[package]]
name = "libp2p-noise"
-version = "0.37.0"
+version = "0.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f"
+checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f"
dependencies = [
"bytes",
"curve25519-dalek 3.2.0",
@@ -3690,7 +3589,7 @@ dependencies = [
"prost",
"prost-build",
"rand 0.8.5",
- "sha2 0.10.3",
+ "sha2 0.10.2",
"snow",
"static_assertions",
"x25519-dalek",
@@ -3699,105 +3598,25 @@ dependencies = [
[[package]]
name = "libp2p-ping"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925"
-dependencies = [
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "rand 0.7.3",
- "void",
-]
-
-[[package]]
-name = "libp2p-plaintext"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "futures",
- "libp2p-core",
- "log",
- "prost",
- "prost-build",
- "unsigned-varint",
- "void",
-]
-
-[[package]]
-name = "libp2p-pnet"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c"
-dependencies = [
- "futures",
- "log",
- "pin-project",
- "rand 0.7.3",
- "salsa20",
- "sha3 0.9.1",
-]
-
-[[package]]
-name = "libp2p-relay"
-version = "0.10.0"
+version = "0.40.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3"
+checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91"
dependencies = [
- "asynchronous-codec",
- "bytes",
- "either",
"futures",
"futures-timer",
"instant",
"libp2p-core",
"libp2p-swarm",
"log",
- "pin-project",
- "prost",
- "prost-build",
- "prost-codec",
"rand 0.8.5",
- "smallvec",
- "static_assertions",
- "thiserror",
- "void",
-]
-
-[[package]]
-name = "libp2p-rendezvous"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e"
-dependencies = [
- "asynchronous-codec",
- "bimap",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "prost",
- "prost-build",
- "rand 0.8.5",
- "sha2 0.10.3",
- "thiserror",
- "unsigned-varint",
"void",
]
[[package]]
name = "libp2p-request-response"
-version = "0.19.0"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843"
+checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1"
dependencies = [
"async-trait",
"bytes",
@@ -3806,16 +3625,16 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"unsigned-varint",
]
[[package]]
name = "libp2p-swarm"
-version = "0.37.0"
+version = "0.40.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114"
+checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf"
dependencies = [
"either",
"fnv",
@@ -3825,7 +3644,7 @@ dependencies = [
"libp2p-core",
"log",
"pin-project",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"thiserror",
"void",
@@ -3833,48 +3652,36 @@ dependencies = [
[[package]]
name = "libp2p-swarm-derive"
-version = "0.28.0"
+version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76"
+checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32"
dependencies = [
+ "heck",
"quote",
"syn",
]
[[package]]
name = "libp2p-tcp"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b"
+checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92"
dependencies = [
"async-io",
"futures",
"futures-timer",
"if-watch",
- "ipnet",
"libc",
"libp2p-core",
"log",
"socket2",
]
-[[package]]
-name = "libp2p-uds"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d"
-dependencies = [
- "async-std",
- "futures",
- "libp2p-core",
- "log",
-]
-
[[package]]
name = "libp2p-wasm-ext"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a"
+checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97"
dependencies = [
"futures",
"js-sys",
@@ -3886,9 +3693,9 @@ dependencies = [
[[package]]
name = "libp2p-websocket"
-version = "0.36.0"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818"
+checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4"
dependencies = [
"either",
"futures",
@@ -3905,12 +3712,13 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
-version = "0.38.0"
+version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c"
+checksum = "30f079097a21ad017fc8139460630286f02488c8c13b26affb46623aa20d8845"
dependencies = [
"futures",
"libp2p-core",
+ "log",
"parking_lot 0.12.1",
"thiserror",
"yamux",
@@ -3918,9 +3726,9 @@ dependencies = [
[[package]]
name = "librocksdb-sys"
-version = "0.6.1+6.28.2"
+version = "0.8.0+7.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291"
+checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d"
dependencies = [
"bindgen",
"bzip2-sys",
@@ -3933,9 +3741,9 @@ dependencies = [
[[package]]
name = "libsecp256k1"
-version = "0.7.1"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
+checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37"
dependencies = [
"arrayref",
"base64",
@@ -3946,7 +3754,7 @@ dependencies = [
"libsecp256k1-gen-genmult",
"rand 0.8.5",
"serde",
- "sha2 0.9.9",
+ "sha2 0.9.8",
"typenum",
]
@@ -3981,9 +3789,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.8"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
dependencies = [
"cc",
"libc",
@@ -3993,9 +3801,9 @@ dependencies = [
[[package]]
name = "linked-hash-map"
-version = "0.5.6"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
[[package]]
name = "linked_hash_set"
@@ -4016,12 +3824,6 @@ dependencies = [
"statrs",
]
-[[package]]
-name = "linux-raw-sys"
-version = "0.0.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7"
-
[[package]]
name = "linux-raw-sys"
version = "0.0.46"
@@ -4030,11 +3832,10 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
[[package]]
name = "lock_api"
-version = "0.4.8"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
dependencies = [
- "autocfg",
"scopeguard",
]
@@ -4051,20 +3852,20 @@ dependencies = [
[[package]]
name = "lru"
-version = "0.6.6"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91"
+checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown",
]
[[package]]
name = "lru"
-version = "0.7.8"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+checksum = "936d98d2ddd79c18641c6709e7bb09981449694e402d1a0f0f657ea8d61f4a51"
dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown",
]
[[package]]
@@ -4078,9 +3879,9 @@ dependencies = [
[[package]]
name = "lz4"
-version = "1.24.0"
+version = "1.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
dependencies = [
"libc",
"lz4-sys",
@@ -4088,9 +3889,9 @@ dependencies = [
[[package]]
name = "lz4-sys"
-version = "1.9.4"
+version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
dependencies = [
"cc",
"libc",
@@ -4152,17 +3953,17 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.5.0"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
[[package]]
name = "memfd"
-version = "0.4.1"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a"
+checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80"
dependencies = [
- "libc",
+ "rustix",
]
[[package]]
@@ -4176,47 +3977,47 @@ dependencies = [
[[package]]
name = "memmap2"
-version = "0.5.7"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498"
+checksum = "4647a11b578fead29cdbb34d4adef8dd3dc35b876c9c6d5240d83f205abfe96e"
dependencies = [
"libc",
]
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
dependencies = [
"autocfg",
]
[[package]]
name = "memory-db"
-version = "0.29.0"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a"
+checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269"
dependencies = [
"hash-db",
- "hashbrown 0.12.3",
+ "hashbrown",
"parity-util-mem",
]
[[package]]
name = "memory-lru"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beeb98b3d1ed2c0054bd81b5ba949a0243c3ccad751d45ea898fa8059fa2860a"
+checksum = "ce95ae042940bad7e312857b929ee3d11b8f799a80cb7b9c7ec5125516906395"
dependencies = [
- "lru 0.6.6",
+ "lru 0.8.0",
]
[[package]]
name = "memory_units"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
+checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
[[package]]
name = "merlin"
@@ -4255,30 +4056,63 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.5.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
+ "autocfg",
]
[[package]]
name = "mio"
-version = "0.8.4"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
dependencies = [
"libc",
"log",
+ "miow",
+ "ntapi",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "winapi",
]
[[package]]
-name = "more-asserts"
-version = "0.2.2"
+name = "miow"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "mockall"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
+checksum = "e2be9a9090bc1cac2930688fa9478092a64c6a92ddc6ae0692d46b37d9cab709"
+dependencies = [
+ "cfg-if 1.0.0",
+ "downcast",
+ "fragile",
+ "lazy_static",
+ "mockall_derive",
+ "predicates",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall_derive"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86d702a0530a0141cf4ed147cf5ec7be6f2c187d4e37fcbefc39cf34116bfe8f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
[[package]]
name = "multiaddr"
@@ -4311,9 +4145,9 @@ dependencies = [
[[package]]
name = "multihash"
-version = "0.16.3"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc"
+checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689"
dependencies = [
"blake2b_simd",
"blake2s_simd",
@@ -4321,8 +4155,8 @@ dependencies = [
"core2",
"digest 0.10.3",
"multihash-derive",
- "sha2 0.10.3",
- "sha3 0.10.2",
+ "sha2 0.10.2",
+ "sha3",
"unsigned-varint",
]
@@ -4348,9 +4182,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
[[package]]
name = "multistream-select"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b"
+checksum = "9bc41247ec209813e2fd414d6e16b9d94297dacf3cd613fa6ef09cd4d9755c10"
dependencies = [
"bytes",
"futures",
@@ -4370,7 +4204,7 @@ dependencies = [
"matrixmultiply",
"nalgebra-macros",
"num-complex",
- "num-rational 0.4.1",
+ "num-rational 0.4.0",
"num-traits",
"rand 0.8.5",
"rand_distr",
@@ -4406,9 +4240,9 @@ checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
[[package]]
name = "native-tls"
-version = "0.2.10"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
+checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"
dependencies = [
"lazy_static",
"libc",
@@ -4503,9 +4337,9 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.24.2"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
@@ -4527,12 +4361,28 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]]
name = "nom"
-version = "7.1.1"
+version = "7.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
dependencies = [
"memchr",
"minimal-lexical",
+ "version_check",
+]
+
+[[package]]
+name = "normalize-line-endings"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
+
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi",
]
[[package]]
@@ -4546,11 +4396,22 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
[[package]]
name = "num-complex"
-version = "0.4.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
+checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
dependencies = [
"num-traits",
]
@@ -4567,9 +4428,9 @@ dependencies = [
[[package]]
name = "num-integer"
-version = "0.1.45"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
dependencies = [
"autocfg",
"num-traits",
@@ -4582,27 +4443,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
dependencies = [
"autocfg",
- "num-bigint",
+ "num-bigint 0.2.6",
"num-integer",
"num-traits",
]
[[package]]
name = "num-rational"
-version = "0.4.1"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
dependencies = [
"autocfg",
+ "num-bigint 0.4.3",
"num-integer",
"num-traits",
]
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
"libm",
@@ -4610,9 +4472,9 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.13.1"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
dependencies = [
"hermit-abi",
"libc",
@@ -4620,13 +4482,10 @@ dependencies = [
[[package]]
name = "object"
-version = "0.28.4"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
+checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
dependencies = [
- "crc32fast",
- "hashbrown 0.11.2",
- "indexmap",
"memchr",
]
@@ -4636,14 +4495,17 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
dependencies = [
+ "crc32fast",
+ "hashbrown",
+ "indexmap",
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.14.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
[[package]]
name = "opaque-debug"
@@ -4659,41 +4521,29 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
-version = "0.10.41"
+version = "0.10.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
+checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
"foreign-types",
"libc",
"once_cell",
- "openssl-macros",
"openssl-sys",
]
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
[[package]]
name = "openssl-sys"
-version = "0.9.75"
+version = "0.9.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
dependencies = [
"autocfg",
"cc",
@@ -4704,7 +4554,9 @@ dependencies = [
[[package]]
name = "orchestra"
-version = "0.0.1"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aab54694ddaa8a9b703724c6ef04272b2d27bc32d2c855aae5cdd1857216b43"
dependencies = [
"async-trait",
"dyn-clonable",
@@ -4713,27 +4565,23 @@ dependencies = [
"orchestra-proc-macro",
"pin-project",
"prioritized-metered-channel",
- "rustversion",
"thiserror",
"tracing",
- "trybuild",
]
[[package]]
name = "orchestra-proc-macro"
-version = "0.0.1"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a702b2f6bf592b3eb06c00d80d05afaf7a8eff6b41bb361e397d799acc21b45a"
dependencies = [
- "assert_matches",
"expander 0.0.6",
"itertools",
- "orchestra",
"petgraph",
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
- "thiserror",
- "tracing",
]
[[package]]
@@ -4747,38 +4595,29 @@ dependencies = [
[[package]]
name = "os_str_bytes"
-version = "6.3.0"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
[[package]]
name = "output_vt100"
-version = "0.1.3"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
+checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
dependencies = [
"winapi",
]
-[[package]]
-name = "owning_ref"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
-dependencies = [
- "stable_deref_trait",
-]
-
[[package]]
name = "owo-colors"
-version = "3.5.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4786,13 +4625,13 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
@@ -4802,13 +4641,13 @@ dependencies = [
"sp-application-crypto",
"sp-authority-discovery",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
@@ -4817,13 +4656,13 @@ dependencies = [
"scale-info",
"sp-authorship",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4841,13 +4680,13 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -4857,17 +4696,17 @@ dependencies = [
"pallet-balances",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
]
[[package]]
name = "pallet-bags-list-remote-tests"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-election-provider-support",
"frame-support",
@@ -4876,17 +4715,17 @@ dependencies = [
"pallet-bags-list",
"pallet-staking",
"remote-externalities",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-storage",
+ "sp-tracing",
]
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4895,13 +4734,13 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"beefy-primitives",
"frame-support",
@@ -4911,19 +4750,19 @@ dependencies = [
"scale-info",
"serde",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"beefy-merkle-tree",
"beefy-primitives",
"frame-support",
"frame-system",
- "hex",
"log",
"pallet-beefy",
"pallet-mmr",
@@ -4931,16 +4770,16 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4949,16 +4788,16 @@ dependencies = [
"pallet-treasury",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4968,16 +4807,16 @@ dependencies = [
"pallet-treasury",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4985,47 +4824,67 @@ dependencies = [
"log",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-conviction-voting"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "assert_matches",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
"serde",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
"frame-support",
"frame-system",
"log",
+ "pallet-election-provider-support-benchmarking",
"parity-scale-codec",
"rand 0.7.3",
"scale-info",
"sp-arithmetic",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-npos-elections",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"static_assertions",
"strum",
]
@@ -5033,7 +4892,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5046,7 +4905,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5054,17 +4913,38 @@ dependencies = [
"log",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-npos-elections",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-fast-unstake"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "frame-benchmarking",
+ "frame-election-provider-support",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-balances",
+ "pallet-staking",
+ "pallet-timestamp",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-io",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
]
[[package]]
name = "pallet-gilt"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5073,13 +4953,13 @@ dependencies = [
"scale-info",
"sp-arithmetic",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5090,19 +4970,19 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-finality-grandpa",
"sp-io",
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5112,13 +4992,13 @@ dependencies = [
"scale-info",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5128,34 +5008,34 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-keyring",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5163,16 +5043,16 @@ dependencies = [
"log",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"ckb-merkle-mountain-range",
"frame-benchmarking",
@@ -5180,24 +5060,24 @@ dependencies = [
"frame-system",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-mmr-primitives",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-mmr-rpc"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
"serde",
"sp-api",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-mmr-primitives",
"sp-runtime",
]
@@ -5205,39 +5085,40 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
"log",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5249,24 +5130,25 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-runtime",
+ "sp-runtime-interface",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-nomination-pools-runtime-api"
version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"sp-api",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
@@ -5277,13 +5159,13 @@ dependencies = [
"serde",
"sp-runtime",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5300,59 +5182,96 @@ dependencies = [
"scale-info",
"sp-runtime",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-ranked-collective"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
+ "sp-arithmetic",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-referenda"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "assert_matches",
"frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
+ "serde",
+ "sp-arithmetic",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5362,13 +5281,13 @@ dependencies = [
"scale-info",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
@@ -5377,19 +5296,19 @@ dependencies = [
"pallet-timestamp",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-trie",
]
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5399,13 +5318,13 @@ dependencies = [
"rand 0.7.3",
"sp-runtime",
"sp-session",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
@@ -5413,13 +5332,13 @@ dependencies = [
"rand_chacha 0.2.2",
"scale-info",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5436,13 +5355,13 @@ dependencies = [
"sp-io",
"sp-runtime",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5453,7 +5372,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"log",
"sp-arithmetic",
@@ -5462,7 +5381,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
@@ -5470,13 +5389,13 @@ dependencies = [
"scale-info",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5487,14 +5406,14 @@ dependencies = [
"sp-inherents",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-timestamp",
]
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5504,39 +5423,39 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
"parity-scale-codec",
"sp-api",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-rpc",
"sp-runtime",
]
@@ -5544,7 +5463,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -5555,7 +5474,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5566,29 +5485,44 @@ dependencies = [
"scale-info",
"serde",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-uniques"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+ "sp-std",
]
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5597,12 +5531,27 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-whitelist"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
]
[[package]]
name = "pallet-xcm"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"frame-system",
@@ -5613,10 +5562,10 @@ dependencies = [
"polkadot-runtime-parachains",
"scale-info",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"xcm",
"xcm-builder",
"xcm-executor",
@@ -5624,7 +5573,7 @@ dependencies = [
[[package]]
name = "pallet-xcm-benchmarks"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5637,11 +5586,11 @@ dependencies = [
"polkadot-primitives",
"polkadot-runtime-common",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
"xcm",
"xcm-builder",
"xcm-executor",
@@ -5701,12 +5650,12 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
[[package]]
name = "parity-util-mem"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f"
+checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8"
dependencies = [
"cfg-if 1.0.0",
- "hashbrown 0.12.3",
+ "hashbrown",
"impl-trait-for-tuples",
"parity-util-mem-derive",
"parking_lot 0.12.1",
@@ -5739,9 +5688,9 @@ dependencies = [
[[package]]
name = "parity-wasm"
-version = "0.42.2"
+version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
+checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
[[package]]
name = "parking"
@@ -5767,7 +5716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.3",
+ "parking_lot_core 0.9.1",
]
[[package]]
@@ -5786,22 +5735,22 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
dependencies = [
"cfg-if 1.0.0",
"libc",
"redox_syscall",
"smallvec",
- "windows-sys",
+ "windows-sys 0.32.0",
]
[[package]]
name = "paste"
-version = "1.0.9"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
[[package]]
name = "pbkdf2"
@@ -5835,19 +5784,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "pest"
-version = "2.3.0"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
dependencies = [
- "thiserror",
"ucd-trie",
]
[[package]]
name = "pest_derive"
-version = "2.3.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905708f7f674518498c1f8d644481440f476d39ca6ecae83319bba7c6c12da91"
+checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
dependencies = [
"pest",
"pest_generator",
@@ -5855,9 +5803,9 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.3.0"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5803d8284a629cc999094ecd630f55e91b561a1d1ba75e233b00ae13b91a69ad"
+checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
dependencies = [
"pest",
"pest_meta",
@@ -5868,20 +5816,20 @@ dependencies = [
[[package]]
name = "pest_meta"
-version = "2.3.0"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1538eb784f07615c6d9a8ab061089c6c54a344c5b4301db51990ca1c241e8c04"
+checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
dependencies = [
- "once_cell",
+ "maplit",
"pest",
- "sha-1 0.10.0",
+ "sha-1 0.8.2",
]
[[package]]
name = "petgraph"
-version = "0.6.2"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
+checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
dependencies = [
"fixedbitset",
"indexmap",
@@ -5915,9 +5863,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
[[package]]
name = "pin-utils"
@@ -5925,11 +5873,22 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "pkcs8"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
+dependencies = [
+ "der",
+ "spki",
+ "zeroize",
+]
+
[[package]]
name = "pkg-config"
-version = "0.3.25"
+version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
[[package]]
name = "platforms"
@@ -5939,25 +5898,25 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
[[package]]
name = "polkadot"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_cmd",
"color-eyre",
- "nix 0.24.2",
+ "nix 0.24.1",
"parity-util-mem",
"polkadot-cli",
"polkadot-core-primitives",
- "remote-externalities",
+ "substrate-rpc-client",
"tempfile",
"tokio",
]
[[package]]
name = "polkadot-approval-distribution"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
- "env_logger",
+ "env_logger 0.9.0",
"futures",
"log",
"polkadot-node-network-protocol",
@@ -5966,22 +5925,23 @@ dependencies = [
"polkadot-node-subsystem-test-helpers",
"polkadot-node-subsystem-util",
"polkadot-primitives",
+ "polkadot-primitives-test-helpers",
"rand 0.8.5",
"rand_chacha 0.3.1",
"rand_core 0.5.1",
"schnorrkel",
"sp-authority-discovery",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"tracing-gum",
]
[[package]]
name = "polkadot-availability-bitfield-distribution"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"bitvec",
- "env_logger",
+ "env_logger 0.9.0",
"futures",
"log",
"maplit",
@@ -5993,7 +5953,8 @@ dependencies = [
"rand 0.8.5",
"rand_chacha 0.3.1",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-authority-discovery",
+ "sp-core",
"sp-keyring",
"sp-keystore",
"tracing-gum",
@@ -6001,14 +5962,14 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"derive_more",
"fatality",
"futures",
"futures-timer",
- "lru 0.7.8",
+ "lru 0.8.0",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6020,25 +5981,25 @@ dependencies = [
"polkadot-primitives-test-helpers",
"rand 0.8.5",
"sc-network",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"thiserror",
"tracing-gum",
]
[[package]]
name = "polkadot-availability-recovery"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
- "env_logger",
+ "env_logger 0.9.0",
"fatality",
"futures",
"futures-timer",
"log",
- "lru 0.7.8",
+ "lru 0.8.0",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6051,7 +6012,7 @@ dependencies = [
"rand 0.8.5",
"sc-network",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"thiserror",
"tracing-gum",
@@ -6059,7 +6020,7 @@ dependencies = [
[[package]]
name = "polkadot-cli"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"clap",
"frame-benchmarking-cli",
@@ -6075,9 +6036,9 @@ dependencies = [
"sc-service",
"sc-sysinfo",
"sc-tracing",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
"substrate-build-script-utils",
"thiserror",
"try-runtime-cli",
@@ -6085,7 +6046,7 @@ dependencies = [
[[package]]
name = "polkadot-client"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"beefy-primitives",
"frame-benchmarking",
@@ -6111,7 +6072,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-finality-grandpa",
"sp-inherents",
"sp-keyring",
@@ -6119,7 +6080,7 @@ dependencies = [
"sp-offchain",
"sp-runtime",
"sp-session",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-storage",
"sp-timestamp",
"sp-transaction-pool",
"westend-runtime",
@@ -6127,11 +6088,12 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"always-assert",
"assert_matches",
- "env_logger",
+ "bitvec",
+ "env_logger 0.9.0",
"fatality",
"futures",
"futures-timer",
@@ -6145,7 +6107,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"sc-network",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
@@ -6155,19 +6117,19 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "polkadot-dispute-distribution"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"async-trait",
@@ -6175,8 +6137,9 @@ dependencies = [
"fatality",
"futures",
"futures-timer",
+ "indexmap",
"lazy_static",
- "lru 0.7.8",
+ "lru 0.8.0",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6191,27 +6154,27 @@ dependencies = [
"sp-application-crypto",
"sp-keyring",
"sp-keystore",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"thiserror",
"tracing-gum",
]
[[package]]
name = "polkadot-erasure-coding"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"parity-scale-codec",
"polkadot-node-primitives",
"polkadot-primitives",
"reed-solomon-novelpoly",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
+ "sp-core",
+ "sp-trie",
"thiserror",
]
[[package]]
name = "polkadot-gossip-support"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"async-trait",
@@ -6229,16 +6192,16 @@ dependencies = [
"sp-application-crypto",
"sp-authority-discovery",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"tracing-gum",
]
[[package]]
name = "polkadot-network-bridge"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"always-assert",
"assert_matches",
@@ -6259,7 +6222,7 @@ dependencies = [
"sc-network",
"sc-network-common",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"thiserror",
"tracing-gum",
@@ -6267,7 +6230,7 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"futures",
"parity-scale-codec",
@@ -6278,7 +6241,7 @@ dependencies = [
"polkadot-node-subsystem-util",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-maybe-compressed-blob",
"thiserror",
"tracing-gum",
@@ -6286,7 +6249,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"async-trait",
@@ -6296,7 +6259,7 @@ dependencies = [
"futures-timer",
"kvdb",
"kvdb-memorydb",
- "lru 0.7.8",
+ "lru 0.8.0",
"merlin",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -6315,7 +6278,7 @@ dependencies = [
"sp-consensus",
"sp-consensus-babe",
"sp-consensus-slots",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
@@ -6325,11 +6288,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"bitvec",
- "env_logger",
+ "env_logger 0.9.0",
"futures",
"futures-timer",
"kvdb",
@@ -6345,7 +6308,7 @@ dependencies = [
"polkadot-overseer",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"thiserror",
"tracing-gum",
@@ -6353,7 +6316,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"bitvec",
@@ -6369,17 +6332,17 @@ dependencies = [
"polkadot-statement-table",
"sc-keystore",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"thiserror",
"tracing-gum",
]
[[package]]
name = "polkadot-node-core-bitfield-signing"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"futures",
"polkadot-node-subsystem",
@@ -6395,7 +6358,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"async-trait",
@@ -6409,7 +6372,7 @@ dependencies = [
"polkadot-parachain",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-maybe-compressed-blob",
"tracing-gum",
@@ -6417,7 +6380,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"futures",
"maplit",
@@ -6430,13 +6393,13 @@ dependencies = [
"sc-client-api",
"sc-consensus-babe",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"tracing-gum",
]
[[package]]
name = "polkadot-node-core-chain-selection"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"futures",
@@ -6450,14 +6413,14 @@ dependencies = [
"polkadot-node-subsystem-test-helpers",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"thiserror",
"tracing-gum",
]
[[package]]
name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"fatality",
@@ -6465,7 +6428,7 @@ dependencies = [
"futures-timer",
"kvdb",
"kvdb-memorydb",
- "lru 0.7.8",
+ "lru 0.8.0",
"parity-scale-codec",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -6475,7 +6438,7 @@ dependencies = [
"polkadot-primitives-test-helpers",
"sc-keystore",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
"thiserror",
@@ -6484,7 +6447,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"async-trait",
"futures",
@@ -6500,7 +6463,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"bitvec",
"fatality",
@@ -6521,7 +6484,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"always-assert",
"assert_matches",
@@ -6533,7 +6496,7 @@ dependencies = [
"parity-scale-codec",
"pin-project",
"polkadot-core-primitives",
- "polkadot-node-subsystem-util",
+ "polkadot-node-metrics",
"polkadot-parachain",
"rand 0.8.5",
"rayon",
@@ -6541,12 +6504,12 @@ dependencies = [
"sc-executor-common",
"sc-executor-wasmtime",
"slotmap",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-externalities",
"sp-io",
"sp-maybe-compressed-blob",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
+ "sp-wasm-interface",
"tempfile",
"test-parachain-adder",
"test-parachain-halt",
@@ -6555,7 +6518,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf-checker"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"futures",
"futures-timer",
@@ -6568,7 +6531,7 @@ dependencies = [
"polkadot-primitives-test-helpers",
"sc-keystore",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
@@ -6578,7 +6541,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"futures",
"memory-lru",
@@ -6593,14 +6556,14 @@ dependencies = [
"sp-api",
"sp-authority-discovery",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"tracing-gum",
]
[[package]]
name = "polkadot-node-jaeger"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"async-std",
"lazy_static",
@@ -6611,13 +6574,13 @@ dependencies = [
"polkadot-node-primitives",
"polkadot-primitives",
"sc-network",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"thiserror",
]
[[package]]
name = "polkadot-node-metrics"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_cmd",
"bs58",
@@ -6625,7 +6588,7 @@ dependencies = [
"futures-timer",
"hyper",
"log",
- "nix 0.24.2",
+ "nix 0.24.1",
"parity-scale-codec",
"polkadot-primitives",
"polkadot-test-service",
@@ -6645,7 +6608,7 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"async-trait",
"derive_more",
@@ -6660,6 +6623,7 @@ dependencies = [
"rand_chacha 0.3.1",
"sc-authority-discovery",
"sc-network",
+ "sc-network-common",
"strum",
"thiserror",
"tracing-gum",
@@ -6667,7 +6631,7 @@ dependencies = [
[[package]]
name = "polkadot-node-primitives"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"bounded-vec",
"futures",
@@ -6680,7 +6644,7 @@ dependencies = [
"sp-application-crypto",
"sp-consensus-babe",
"sp-consensus-vrf",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keystore",
"sp-maybe-compressed-blob",
"thiserror",
@@ -6689,7 +6653,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -6698,7 +6662,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-test-helpers"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"async-trait",
"futures",
@@ -6709,14 +6673,14 @@ dependencies = [
"polkadot-primitives",
"sc-keystore",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
]
[[package]]
name = "polkadot-node-subsystem-types"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"async-trait",
"derive_more",
@@ -6738,12 +6702,12 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-util"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"async-trait",
"derive_more",
- "env_logger",
+ "env_logger 0.9.0",
"fatality",
"futures",
"itertools",
@@ -6751,7 +6715,7 @@ dependencies = [
"kvdb-shared-tests",
"lazy_static",
"log",
- "lru 0.7.8",
+ "lru 0.8.0",
"parity-db",
"parity-scale-codec",
"parity-util-mem",
@@ -6769,7 +6733,7 @@ dependencies = [
"prioritized-metered-channel",
"rand 0.8.5",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keystore",
"tempfile",
"thiserror",
@@ -6778,14 +6742,14 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"async-trait",
"femme",
"futures",
"futures-timer",
- "lru 0.7.8",
+ "lru 0.8.0",
"orchestra",
"parity-util-mem",
"parking_lot 0.12.1",
@@ -6798,13 +6762,13 @@ dependencies = [
"prioritized-metered-channel",
"sc-client-api",
"sp-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"tracing-gum",
]
[[package]]
name = "polkadot-parachain"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"derive_more",
"frame-support",
@@ -6813,16 +6777,16 @@ dependencies = [
"polkadot-core-primitives",
"scale-info",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "polkadot-performance-test"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
- "env_logger",
+ "env_logger 0.9.0",
"kusama-runtime",
"log",
"polkadot-erasure-coding",
@@ -6834,7 +6798,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"bitvec",
"frame-system",
@@ -6850,31 +6814,32 @@ dependencies = [
"sp-arithmetic",
"sp-authority-discovery",
"sp-consensus-slots",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
"sp-keystore",
"sp-runtime",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-trie",
"sp-version",
]
[[package]]
name = "polkadot-primitives-test-helpers"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"polkadot-primitives",
"rand 0.8.5",
"sp-application-crypto",
+ "sp-core",
"sp-keyring",
"sp-runtime",
]
[[package]]
name = "polkadot-rpc"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"beefy-gadget",
"beefy-gadget-rpc",
@@ -6905,7 +6870,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -6931,6 +6896,7 @@ dependencies = [
"pallet-election-provider-multi-phase",
"pallet-election-provider-support-benchmarking",
"pallet-elections-phragmen",
+ "pallet-fast-unstake",
"pallet-grandpa",
"pallet-identity",
"pallet-im-online",
@@ -6939,6 +6905,7 @@ dependencies = [
"pallet-multisig",
"pallet-nomination-pools",
"pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
"pallet-offences",
"pallet-offences-benchmarking",
"pallet-preimage",
@@ -6973,7 +6940,7 @@ dependencies = [
"sp-authority-discovery",
"sp-block-builder",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
"sp-keyring",
@@ -6983,16 +6950,15 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
"sp-transaction-pool",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
"sp-version",
"static_assertions",
"substrate-wasm-builder",
"tiny-keccak",
"tokio",
- "trie-db 0.23.1",
"xcm",
"xcm-builder",
"xcm-executor",
@@ -7000,7 +6966,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7036,7 +7002,7 @@ dependencies = [
"serde_json",
"slot-range-helper",
"sp-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
"sp-keystore",
@@ -7044,37 +7010,38 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"static_assertions",
- "trie-db 0.23.1",
"xcm",
]
[[package]]
name = "polkadot-runtime-constants"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "polkadot-runtime-metrics"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"bs58",
"parity-scale-codec",
"polkadot-primitives",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
]
[[package]]
name = "polkadot-runtime-parachains"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"bitflags",
@@ -7107,7 +7074,7 @@ dependencies = [
"serde",
"sp-api",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
"sp-keyring",
@@ -7115,8 +7082,8 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
"static_assertions",
"thousands",
"xcm",
@@ -7125,13 +7092,14 @@ dependencies = [
[[package]]
name = "polkadot-service"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"async-trait",
"beefy-gadget",
"beefy-primitives",
- "env_logger",
+ "env_logger 0.9.0",
+ "frame-support",
"frame-system-rpc-runtime-api",
"futures",
"hex-literal",
@@ -7140,7 +7108,7 @@ dependencies = [
"kvdb",
"kvdb-rocksdb",
"log",
- "lru 0.7.8",
+ "lru 0.8.0",
"pallet-babe",
"pallet-im-online",
"pallet-staking",
@@ -7213,7 +7181,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-finality-grandpa",
"sp-inherents",
"sp-io",
@@ -7222,10 +7190,10 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-storage",
"sp-timestamp",
"sp-transaction-pool",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
"substrate-prometheus-endpoint",
"tempfile",
"thiserror",
@@ -7236,7 +7204,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"arrayvec 0.5.2",
"assert_matches",
@@ -7256,27 +7224,27 @@ dependencies = [
"sc-network",
"sp-application-crypto",
"sp-authority-discovery",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
"sp-staking",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"thiserror",
"tracing-gum",
]
[[package]]
name = "polkadot-statement-table"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
]
[[package]]
name = "polkadot-test-client"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"futures",
"parity-scale-codec",
@@ -7291,7 +7259,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-keyring",
"sp-runtime",
@@ -7302,7 +7270,7 @@ dependencies = [
[[package]]
name = "polkadot-test-malus"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"async-trait",
@@ -7323,14 +7291,15 @@ dependencies = [
"polkadot-node-subsystem-types",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "rand 0.8.5",
+ "sp-core",
"sp-keystore",
"tracing-gum",
]
[[package]]
name = "polkadot-test-runtime"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7372,7 +7341,7 @@ dependencies = [
"sp-authority-discovery",
"sp-block-builder",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
"sp-keyring",
@@ -7381,9 +7350,9 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-transaction-pool",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
"sp-version",
"substrate-wasm-builder",
"test-runtime-constants",
@@ -7395,7 +7364,7 @@ dependencies = [
[[package]]
name = "polkadot-test-service"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-benchmarking",
"frame-system",
@@ -7434,7 +7403,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-finality-grandpa",
"sp-inherents",
"sp-keyring",
@@ -7450,7 +7419,7 @@ dependencies = [
[[package]]
name = "polkadot-voter-bags"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"clap",
"generate-bags",
@@ -7462,11 +7431,10 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.3.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
+checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
dependencies = [
- "autocfg",
"cfg-if 1.0.0",
"libc",
"log",
@@ -7519,32 +7487,35 @@ dependencies = [
[[package]]
name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
[[package]]
name = "predicates"
-version = "2.1.1"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"
+checksum = "95e5a7689e456ab905c22c2b48225bb921aba7c8dfa58440d68ba13f6222a715"
dependencies = [
"difflib",
+ "float-cmp",
"itertools",
+ "normalize-line-endings",
"predicates-core",
+ "regex",
]
[[package]]
name = "predicates-core"
-version = "1.0.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"
+checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451"
[[package]]
name = "predicates-tree"
-version = "1.0.5"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
+checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7"
dependencies = [
"predicates-core",
"termtree",
@@ -7552,21 +7523,21 @@ dependencies = [
[[package]]
name = "pretty_assertions"
-version = "1.3.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
+checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563"
dependencies = [
+ "ansi_term",
"ctor",
"diff",
"output_vt100",
- "yansi",
]
[[package]]
name = "primitive-types"
-version = "0.11.1"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
+checksum = "5cfd65aea0c5fa0bfcc7c9e7ca828c921ef778f43d325325ec84bda371bfa75a"
dependencies = [
"fixed-hash",
"impl-codec",
@@ -7578,15 +7549,14 @@ dependencies = [
[[package]]
name = "prioritized-metered-channel"
version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4"
dependencies = [
- "assert_matches",
"coarsetime",
"crossbeam-queue",
"derive_more",
- "env_logger",
"futures",
"futures-timer",
- "log",
"nanorand",
"thiserror",
"tracing",
@@ -7594,11 +7564,10 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "1.2.1"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
dependencies = [
- "once_cell",
"thiserror",
"toml",
]
@@ -7638,35 +7607,35 @@ dependencies = [
[[package]]
name = "prometheus"
-version = "0.13.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cface98dfa6d645ea4c789839f176e4b072265d085bfcc48eaa8d137f58d3c39"
+checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504"
dependencies = [
"cfg-if 1.0.0",
"fnv",
"lazy_static",
"memchr",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
"thiserror",
]
[[package]]
name = "prometheus-client"
-version = "0.16.0"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825"
+checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c"
dependencies = [
"dtoa",
- "itoa 1.0.3",
- "owning_ref",
+ "itoa 1.0.1",
+ "parking_lot 0.12.1",
"prometheus-client-derive-text-encode",
]
[[package]]
name = "prometheus-client-derive-text-encode"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652"
+checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
dependencies = [
"proc-macro2",
"quote",
@@ -7675,21 +7644,20 @@ dependencies = [
[[package]]
name = "prometheus-parse"
-version = "0.2.3"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef7a8ed15bcffc55fe0328931ef20d393bb89ad704756a37bd20cffb4804f306"
+checksum = "c996f3caea1c51aa034c0d2dfd8447a12c555f4567b02677ef8a865ac4cce712"
dependencies = [
"chrono",
- "itertools",
"lazy_static",
"regex",
]
[[package]]
name = "prost"
-version = "0.10.4"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
+checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
dependencies = [
"bytes",
"prost-derive",
@@ -7697,13 +7665,11 @@ dependencies = [
[[package]]
name = "prost-build"
-version = "0.10.4"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
+checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb"
dependencies = [
"bytes",
- "cfg-if 1.0.0",
- "cmake",
"heck",
"itertools",
"lazy_static",
@@ -7719,9 +7685,9 @@ dependencies = [
[[package]]
name = "prost-codec"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007"
+checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987"
dependencies = [
"asynchronous-codec",
"bytes",
@@ -7732,9 +7698,9 @@ dependencies = [
[[package]]
name = "prost-derive"
-version = "0.10.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
+checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364"
dependencies = [
"anyhow",
"itertools",
@@ -7745,9 +7711,9 @@ dependencies = [
[[package]]
name = "prost-types"
-version = "0.10.1"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
+checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
dependencies = [
"bytes",
"prost",
@@ -7755,9 +7721,9 @@ dependencies = [
[[package]]
name = "psm"
-version = "0.1.20"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f446d0a6efba22928558c4fb4ce0b3fd6c89b0061343e390bf01a703742b8125"
+checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"
dependencies = [
"cc",
]
@@ -7781,6 +7747,12 @@ 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 = "quicksink"
version = "0.1.2"
@@ -7794,9 +7766,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.21"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
dependencies = [
"proc-macro2",
]
@@ -7867,14 +7839,14 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
dependencies = [
- "getrandom 0.2.7",
+ "getrandom 0.2.3",
]
[[package]]
name = "rand_distr"
-version = "0.4.3"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
+checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f"
dependencies = [
"num-traits",
"rand 0.8.5",
@@ -7915,9 +7887,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.5.3"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
dependencies = [
"autocfg",
"crossbeam-deque",
@@ -7927,34 +7899,34 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.9.3"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
+ "lazy_static",
"num_cpus",
]
[[package]]
name = "redox_syscall"
-version = "0.2.16"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
dependencies = [
"bitflags",
]
[[package]]
name = "redox_users"
-version = "0.4.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
dependencies = [
- "getrandom 0.2.7",
+ "getrandom 0.2.3",
"redox_syscall",
- "thiserror",
]
[[package]]
@@ -7966,24 +7938,24 @@ dependencies = [
"derive_more",
"fs-err",
"itertools",
- "static_init",
+ "static_init 0.5.2",
"thiserror",
]
[[package]]
name = "ref-cast"
-version = "1.0.9"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed13bcd201494ab44900a96490291651d200730904221832b9547d24a87d332b"
+checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.9"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5234cd6063258a5e32903b53b1b6ac043a0541c8adc1f610f67b0326c7a578fa"
+checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
dependencies = [
"proc-macro2",
"quote",
@@ -7992,9 +7964,9 @@ dependencies = [
[[package]]
name = "regalloc2"
-version = "0.2.3"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c"
+checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779"
dependencies = [
"fxhash",
"log",
@@ -8004,9 +7976,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.6.0"
+version = "1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
dependencies = [
"aho-corasick",
"memchr",
@@ -8024,25 +7996,13 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-
-[[package]]
-name = "region"
-version = "2.2.0"
+version = "0.6.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0"
-dependencies = [
- "bitflags",
- "libc",
- "mach",
- "winapi",
-]
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
[[package]]
name = "remote-ext-tests-bags-list"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"clap",
"frame-system",
@@ -8052,8 +8012,8 @@ dependencies = [
"pallet-bags-list-remote-tests",
"polkadot-runtime",
"polkadot-runtime-constants",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-tracing",
"tokio",
"westend-runtime",
"westend-runtime-constants",
@@ -8062,18 +8022,18 @@ dependencies = [
[[package]]
name = "remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
- "env_logger",
- "jsonrpsee",
+ "env_logger 0.9.0",
"log",
"parity-scale-codec",
"serde",
"serde_json",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-version",
+ "substrate-rpc-client",
]
[[package]]
@@ -8108,7 +8068,7 @@ dependencies = [
"mime",
"native-tls",
"percent-encoding",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
"serde",
"serde_json",
"serde_urlencoded",
@@ -8129,7 +8089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
dependencies = [
"hostname",
- "quick-error",
+ "quick-error 1.2.3",
]
[[package]]
@@ -8160,9 +8120,9 @@ dependencies = [
[[package]]
name = "rocksdb"
-version = "0.18.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290"
+checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc"
dependencies = [
"libc",
"librocksdb-sys",
@@ -8170,7 +8130,7 @@ dependencies = [
[[package]]
name = "rococo-runtime"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"beefy-merkle-tree",
"beefy-primitives",
@@ -8188,23 +8148,37 @@ dependencies = [
"pallet-balances",
"pallet-beefy",
"pallet-beefy-mmr",
+ "pallet-bounties",
+ "pallet-child-bounties",
"pallet-collective",
+ "pallet-democracy",
+ "pallet-elections-phragmen",
+ "pallet-gilt",
"pallet-grandpa",
+ "pallet-identity",
"pallet-im-online",
"pallet-indices",
"pallet-membership",
"pallet-mmr",
"pallet-multisig",
"pallet-offences",
+ "pallet-preimage",
"pallet-proxy",
+ "pallet-recovery",
+ "pallet-scheduler",
"pallet-session",
+ "pallet-society",
"pallet-staking",
"pallet-sudo",
"pallet-timestamp",
+ "pallet-tips",
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
+ "pallet-treasury",
"pallet-utility",
+ "pallet-vesting",
"pallet-xcm",
+ "pallet-xcm-benchmarks",
"parity-scale-codec",
"polkadot-parachain",
"polkadot-primitives",
@@ -8212,25 +8186,31 @@ dependencies = [
"polkadot-runtime-parachains",
"rococo-runtime-constants",
"scale-info",
+ "separator",
"serde",
"serde_derive",
+ "serde_json",
"smallvec",
"sp-api",
"sp-authority-discovery",
"sp-block-builder",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
+ "sp-keyring",
"sp-mmr-primitives",
"sp-offchain",
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-transaction-pool",
+ "sp-trie",
"sp-version",
+ "static_assertions",
"substrate-wasm-builder",
+ "tiny-keccak",
"xcm",
"xcm-builder",
"xcm-executor",
@@ -8238,20 +8218,22 @@ dependencies = [
[[package]]
name = "rococo-runtime-constants"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "rpassword"
-version = "5.0.1"
+version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
+checksum = "26b763cb66df1c928432cc35053f8bd4cec3335d8559fc16010017d16b3c1680"
dependencies = [
"libc",
"winapi",
@@ -8268,7 +8250,7 @@ dependencies = [
"log",
"netlink-packet-route",
"netlink-proto",
- "nix 0.24.2",
+ "nix 0.24.1",
"thiserror",
]
@@ -8296,21 +8278,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.13",
-]
-
-[[package]]
-name = "rustix"
-version = "0.33.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes 0.5.3",
- "libc",
- "linux-raw-sys 0.0.42",
- "winapi",
+ "semver 1.0.4",
]
[[package]]
@@ -8321,17 +8289,17 @@ checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada"
dependencies = [
"bitflags",
"errno",
- "io-lifetimes 0.7.3",
+ "io-lifetimes",
"libc",
- "linux-raw-sys 0.0.46",
- "windows-sys",
+ "linux-raw-sys",
+ "windows-sys 0.36.1",
]
[[package]]
name = "rustls"
-version = "0.20.6"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
+checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84"
dependencies = [
"log",
"ring",
@@ -8341,9 +8309,9 @@ dependencies = [
[[package]]
name = "rustls-native-certs"
-version = "0.6.2"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
+checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943"
dependencies = [
"openssl-probe",
"rustls-pemfile",
@@ -8353,18 +8321,18 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "1.0.1"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
dependencies = [
"base64",
]
[[package]]
name = "rustversion"
-version = "1.0.9"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
+checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
[[package]]
name = "rw-stream-sink"
@@ -8379,18 +8347,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
-
-[[package]]
-name = "salsa20"
-version = "0.9.0"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686"
-dependencies = [
- "cipher",
-]
+checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
[[package]]
name = "same-file"
@@ -8404,19 +8363,20 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"log",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-wasm-interface",
"thiserror",
]
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "async-trait",
"futures",
"futures-timer",
"ip_network",
@@ -8427,12 +8387,11 @@ dependencies = [
"prost-build",
"rand 0.7.3",
"sc-client-api",
- "sc-network",
"sc-network-common",
"sp-api",
"sp-authority-discovery",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keystore",
"sp-runtime",
"substrate-prometheus-endpoint",
@@ -8442,7 +8401,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"futures-timer",
@@ -8456,7 +8415,7 @@ dependencies = [
"sp-api",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-runtime",
"substrate-prometheus-endpoint",
@@ -8465,14 +8424,14 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"sc-client-api",
"sp-api",
"sp-block-builder",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-runtime",
"sp-state-machine",
@@ -8481,24 +8440,24 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"impl-trait-for-tuples",
- "memmap2 0.5.7",
+ "memmap2 0.5.0",
"parity-scale-codec",
"sc-chain-spec-derive",
- "sc-network",
+ "sc-network-common",
"sc-telemetry",
"serde",
"serde_json",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
]
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -8509,13 +8468,13 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"chrono",
"clap",
"fdlimit",
"futures",
- "hex",
"libp2p",
"log",
"names",
@@ -8527,6 +8486,7 @@ dependencies = [
"sc-client-db",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-service",
"sc-telemetry",
"sc-tracing",
@@ -8534,7 +8494,7 @@ dependencies = [
"serde",
"serde_json",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
"sp-panic-handler",
@@ -8548,7 +8508,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"fnv",
"futures",
@@ -8562,21 +8522,21 @@ dependencies = [
"sp-api",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-database",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-externalities",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-storage",
+ "sp-trie",
"substrate-prometheus-endpoint",
]
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"hash-db",
"kvdb",
@@ -8591,17 +8551,17 @@ dependencies = [
"sc-state-db",
"sp-arithmetic",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-database",
"sp-runtime",
"sp-state-machine",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
]
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"futures",
@@ -8615,7 +8575,7 @@ dependencies = [
"sp-api",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
"sp-state-machine",
"substrate-prometheus-endpoint",
@@ -8625,14 +8585,14 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"fork-tree",
"futures",
"log",
"merlin",
- "num-bigint",
+ "num-bigint 0.2.6",
"num-rational 0.2.4",
"num-traits",
"parity-scale-codec",
@@ -8654,7 +8614,7 @@ dependencies = [
"sp-consensus-babe",
"sp-consensus-slots",
"sp-consensus-vrf",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
"sp-keystore",
@@ -8667,7 +8627,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"jsonrpsee",
@@ -8680,7 +8640,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keystore",
"sp-runtime",
"thiserror",
@@ -8689,7 +8649,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -8702,7 +8662,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"futures",
@@ -8716,18 +8676,17 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-consensus-slots",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-runtime",
"sp-state-machine",
- "sp-timestamp",
"thiserror",
]
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"lazy_static",
"lru 0.7.8",
@@ -8737,16 +8696,16 @@ dependencies = [
"sc-executor-wasmi",
"sc-executor-wasmtime",
"sp-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-core-hashing-proc-macro",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-externalities",
"sp-io",
"sp-panic-handler",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-runtime-interface",
"sp-tasks",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
"sp-version",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-wasm-interface",
"tracing",
"wasmi",
]
@@ -8754,14 +8713,14 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"environmental",
"parity-scale-codec",
"sc-allocator",
"sp-maybe-compressed-blob",
"sp-sandbox",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-wasm-interface",
"thiserror",
"wasm-instrument",
"wasmi",
@@ -8770,51 +8729,51 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"log",
"parity-scale-codec",
"sc-allocator",
"sc-executor-common",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-runtime-interface",
"sp-sandbox",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-wasm-interface",
"wasmi",
]
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"cfg-if 1.0.0",
"libc",
"log",
"once_cell",
"parity-scale-codec",
- "parity-wasm 0.42.2",
- "rustix 0.35.9",
+ "parity-wasm 0.45.0",
+ "rustix",
"sc-allocator",
"sc-executor-common",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-runtime-interface",
"sp-sandbox",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-wasm-interface",
"wasmtime",
]
[[package]]
name = "sc-finality-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"ahash",
+ "array-bytes",
"async-trait",
"dyn-clone",
"finality-grandpa",
"fork-tree",
"futures",
"futures-timer",
- "hex",
"log",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -8835,7 +8794,7 @@ dependencies = [
"sp-arithmetic",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-finality-grandpa",
"sp-keystore",
"sp-runtime",
@@ -8846,7 +8805,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"finality-grandpa",
"futures",
@@ -8859,7 +8818,7 @@ dependencies = [
"serde",
"serde_json",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
"thiserror",
]
@@ -8867,7 +8826,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"ansi_term",
"futures",
@@ -8884,14 +8843,14 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"async-trait",
- "hex",
"parking_lot 0.12.1",
"serde_json",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keystore",
"thiserror",
]
@@ -8899,8 +8858,9 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"async-trait",
"asynchronous-codec",
"bitflags",
@@ -8911,7 +8871,6 @@ dependencies = [
"fork-tree",
"futures",
"futures-timer",
- "hex",
"ip_network",
"libp2p",
"linked-hash-map",
@@ -8922,7 +8881,6 @@ dependencies = [
"parking_lot 0.12.1",
"pin-project",
"prost",
- "prost-build",
"rand 0.7.3",
"sc-block-builder",
"sc-client-api",
@@ -8936,40 +8894,64 @@ dependencies = [
"sp-arithmetic",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
"substrate-prometheus-endpoint",
"thiserror",
"unsigned-varint",
- "void",
"zeroize",
]
+[[package]]
+name = "sc-network-bitswap"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "cid",
+ "futures",
+ "libp2p",
+ "log",
+ "prost",
+ "prost-build",
+ "sc-client-api",
+ "sc-network-common",
+ "sp-blockchain",
+ "sp-runtime",
+ "thiserror",
+ "unsigned-varint",
+ "void",
+]
+
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"bitflags",
"bytes",
"futures",
+ "futures-timer",
"libp2p",
+ "linked_hash_set",
"parity-scale-codec",
"prost-build",
"sc-consensus",
"sc-peerset",
+ "serde",
"smallvec",
+ "sp-blockchain",
"sp-consensus",
"sp-finality-grandpa",
"sp-runtime",
+ "substrate-prometheus-endpoint",
"thiserror",
]
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"ahash",
"futures",
@@ -8977,8 +8959,8 @@ dependencies = [
"libp2p",
"log",
"lru 0.7.8",
- "sc-network",
"sc-network-common",
+ "sc-peerset",
"sp-runtime",
"substrate-prometheus-endpoint",
"tracing",
@@ -8987,10 +8969,10 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"futures",
- "hex",
"libp2p",
"log",
"parity-scale-codec",
@@ -9000,7 +8982,7 @@ dependencies = [
"sc-network-common",
"sc-peerset",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
"thiserror",
]
@@ -9008,14 +8990,15 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"fork-tree",
"futures",
- "hex",
"libp2p",
"log",
"lru 0.7.8",
+ "mockall",
"parity-scale-codec",
"prost",
"prost-build",
@@ -9023,39 +9006,60 @@ dependencies = [
"sc-consensus",
"sc-network-common",
"sc-peerset",
+ "sc-utils",
"smallvec",
"sp-arithmetic",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-finality-grandpa",
"sp-runtime",
"thiserror",
]
+[[package]]
+name = "sc-network-transactions"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "array-bytes",
+ "futures",
+ "hex",
+ "libp2p",
+ "log",
+ "parity-scale-codec",
+ "pin-project",
+ "sc-network-common",
+ "sc-peerset",
+ "sp-consensus",
+ "sp-runtime",
+ "substrate-prometheus-endpoint",
+]
+
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"bytes",
"fnv",
"futures",
"futures-timer",
- "hex",
"hyper",
"hyper-rustls",
+ "libp2p",
"num_cpus",
"once_cell",
"parity-scale-codec",
"parking_lot 0.12.1",
"rand 0.7.3",
"sc-client-api",
- "sc-network",
"sc-network-common",
+ "sc-peerset",
"sc-utils",
"sp-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-offchain",
"sp-runtime",
"threadpool",
@@ -9065,7 +9069,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"libp2p",
@@ -9078,7 +9082,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9087,7 +9091,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"hash-db",
@@ -9105,7 +9109,7 @@ dependencies = [
"serde_json",
"sp-api",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keystore",
"sp-offchain",
"sp-rpc",
@@ -9117,7 +9121,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"jsonrpsee",
@@ -9129,10 +9133,10 @@ dependencies = [
"scale-info",
"serde",
"serde_json",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-rpc",
"sp-runtime",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"sp-version",
"thiserror",
]
@@ -9140,7 +9144,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"jsonrpsee",
@@ -9150,10 +9154,29 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "sc-rpc-spec-v2"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "futures",
+ "hex",
+ "jsonrpsee",
+ "parity-scale-codec",
+ "sc-chain-spec",
+ "sc-transaction-pool-api",
+ "serde",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-runtime",
+ "thiserror",
+]
+
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"directories",
@@ -9177,12 +9200,15 @@ dependencies = [
"sc-informant",
"sc-keystore",
"sc-network",
+ "sc-network-bitswap",
"sc-network-common",
"sc-network-light",
"sc-network-sync",
+ "sc-network-transactions",
"sc-offchain",
"sc-rpc",
"sc-rpc-server",
+ "sc-rpc-spec-v2",
"sc-sysinfo",
"sc-telemetry",
"sc-tracing",
@@ -9196,19 +9222,20 @@ dependencies = [
"sp-block-builder",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-externalities",
"sp-inherents",
"sp-keystore",
"sp-runtime",
"sp-session",
"sp-state-machine",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-storage",
+ "sp-tracing",
"sp-transaction-pool",
"sp-transaction-storage-proof",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
"sp-version",
+ "static_init 1.0.3",
"substrate-prometheus-endpoint",
"tempfile",
"thiserror",
@@ -9220,7 +9247,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"log",
"parity-scale-codec",
@@ -9228,13 +9255,13 @@ dependencies = [
"parity-util-mem-derive",
"parking_lot 0.12.1",
"sc-client-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
]
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -9253,7 +9280,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"libc",
@@ -9264,15 +9291,15 @@ dependencies = [
"sc-telemetry",
"serde",
"serde_json",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"chrono",
"futures",
@@ -9290,7 +9317,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"ansi_term",
"atty",
@@ -9308,10 +9335,10 @@ dependencies = [
"serde",
"sp-api",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-rpc",
"sp-runtime",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"thiserror",
"tracing",
"tracing-log",
@@ -9321,7 +9348,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9332,8 +9359,9 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "async-trait",
"futures",
"futures-timer",
"linked-hash-map",
@@ -9347,9 +9375,9 @@ dependencies = [
"serde",
"sp-api",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"sp-transaction-pool",
"substrate-prometheus-endpoint",
"thiserror",
@@ -9358,8 +9386,9 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "async-trait",
"futures",
"log",
"serde",
@@ -9371,7 +9400,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"futures-timer",
@@ -9409,12 +9438,12 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.20"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
dependencies = [
"lazy_static",
- "windows-sys",
+ "winapi",
]
[[package]]
@@ -9458,7 +9487,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
dependencies = [
"der",
- "generic-array 0.14.6",
+ "generic-array 0.14.4",
+ "pkcs8",
"subtle",
"zeroize",
]
@@ -9492,9 +9522,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.7.0"
+version = "2.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
dependencies = [
"bitflags",
"core-foundation",
@@ -9505,9 +9535,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.6.1"
+version = "2.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
dependencies = [
"core-foundation-sys",
"libc",
@@ -9524,9 +9554,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.13"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
+checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
dependencies = [
"serde",
]
@@ -9545,18 +9575,18 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
[[package]]
name = "serde"
-version = "1.0.144"
+version = "1.0.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.144"
+version = "1.0.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
dependencies = [
"proc-macro2",
"quote",
@@ -9578,7 +9608,7 @@ version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
dependencies = [
- "itoa 1.0.3",
+ "itoa 1.0.1",
"ryu",
"serde",
]
@@ -9599,11 +9629,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 1.0.3",
+ "itoa 1.0.1",
"ryu",
"serde",
]
+[[package]]
+name = "sha-1"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+dependencies = [
+ "block-buffer 0.7.3",
+ "digest 0.8.1",
+ "fake-simd",
+ "opaque-debug 0.2.3",
+]
+
[[package]]
name = "sha-1"
version = "0.9.8"
@@ -9642,9 +9684,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.9.9"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
dependencies = [
"block-buffer 0.9.0",
"cfg-if 1.0.0",
@@ -9655,9 +9697,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.3"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899bf02746a2c92bf1053d9327dadb252b01af1f81f90cdb902411f518bc7215"
+checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
@@ -9666,21 +9708,9 @@ dependencies = [
[[package]]
name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sha3"
-version = "0.10.2"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a31480366ec990f395a61b7c08122d99bd40544fdb5abcfc1b06bb29994312c"
+checksum = "31f935e31cf406e8c0e96c2815a5516181b7004ae8c5f296293221e9b1e356bd"
dependencies = [
"digest 0.10.3",
"keccak",
@@ -9756,12 +9786,9 @@ dependencies = [
[[package]]
name = "slab"
-version = "0.4.7"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
-dependencies = [
- "autocfg",
-]
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
[[package]]
name = "slice-group-by"
@@ -9771,13 +9798,13 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
[[package]]
name = "slot-range-helper"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"enumn",
"parity-scale-codec",
"paste",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
@@ -9791,9 +9818,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.9.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
[[package]]
name = "snap"
@@ -9814,15 +9841,15 @@ dependencies = [
"rand_core 0.6.3",
"ring",
"rustc_version",
- "sha2 0.10.3",
+ "sha2 0.10.2",
"subtle",
]
[[package]]
name = "socket2"
-version = "0.4.7"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
dependencies = [
"libc",
"winapi",
@@ -9847,16 +9874,17 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"hash-db",
"log",
"parity-scale-codec",
"sp-api-proc-macro",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
"sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-trie",
"sp-version",
"thiserror",
]
@@ -9864,7 +9892,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"blake2",
"proc-macro-crate",
@@ -9876,72 +9904,72 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-arithmetic"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"integer-sqrt",
"num-traits",
"parity-scale-codec",
"scale-info",
"serde",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-debug-derive",
+ "sp-std",
"static_assertions",
]
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"scale-info",
"sp-api",
"sp-application-crypto",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"parity-scale-codec",
"sp-inherents",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"sp-api",
"sp-inherents",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"log",
@@ -9959,18 +9987,18 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"futures",
"futures-timer",
"log",
"parity-scale-codec",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-runtime",
"sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-version",
"thiserror",
]
@@ -9978,7 +10006,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"merlin",
@@ -9990,102 +10018,56 @@ dependencies = [
"sp-consensus",
"sp-consensus-slots",
"sp-consensus-vrf",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-keystore",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-timestamp",
]
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
"sp-arithmetic",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-timestamp",
]
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"scale-info",
"schnorrkel",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-core"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"base58",
"bitflags",
- "blake2-rfc",
+ "blake2",
"byteorder",
"dyn-clonable",
"ed25519-zebra",
"futures",
"hash-db",
"hash256-std-hasher",
- "hex",
- "impl-serde",
- "lazy_static",
- "libsecp256k1",
- "log",
- "merlin",
- "num-traits",
- "parity-scale-codec",
- "parity-util-mem",
- "parking_lot 0.12.1",
- "primitive-types",
- "rand 0.7.3",
- "regex",
- "scale-info",
- "schnorrkel",
- "secp256k1",
- "secrecy",
- "serde",
- "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "ss58-registry",
- "substrate-bip39",
- "thiserror",
- "tiny-bip39",
- "wasmi",
- "zeroize",
-]
-
-[[package]]
-name = "sp-core"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
-dependencies = [
- "base58",
- "bitflags",
- "blake2-rfc",
- "byteorder",
- "dyn-clonable",
- "ed25519-dalek",
- "futures",
- "hash-db",
- "hash256-std-hasher",
- "hex",
"impl-serde",
"lazy_static",
"libsecp256k1",
@@ -10103,12 +10085,12 @@ dependencies = [
"secp256k1",
"secrecy",
"serde",
- "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core-hashing",
+ "sp-debug-derive",
+ "sp-externalities",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
"ss58-registry",
"substrate-bip39",
"thiserror",
@@ -10120,46 +10102,32 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
-dependencies = [
- "blake2",
- "byteorder",
- "digest 0.10.3",
- "sha2 0.10.3",
- "sha3 0.10.2",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "twox-hash",
-]
-
-[[package]]
-name = "sp-core-hashing"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"blake2",
"byteorder",
"digest 0.10.3",
- "sha2 0.10.3",
- "sha3 0.10.2",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sha2 0.10.2",
+ "sha3",
+ "sp-std",
"twox-hash",
]
[[package]]
name = "sp-core-hashing-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"proc-macro2",
"quote",
- "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core-hashing",
"syn",
]
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -10168,17 +10136,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-debug-derive"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"proc-macro2",
"quote",
@@ -10188,29 +10146,18 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
-]
-
-[[package]]
-name = "sp-externalities"
-version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"environmental",
"parity-scale-codec",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-storage",
]
[[package]]
name = "sp-finality-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"finality-grandpa",
"log",
@@ -10219,30 +10166,30 @@ dependencies = [
"serde",
"sp-api",
"sp-application-crypto",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keystore",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
"parity-scale-codec",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"thiserror",
]
[[package]]
name = "sp-io"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"bytes",
"futures",
@@ -10252,15 +10199,15 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.1",
"secp256k1",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-externalities",
"sp-keystore",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-runtime-interface",
"sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
+ "sp-trie",
+ "sp-wasm-interface",
"tracing",
"tracing-core",
]
@@ -10268,10 +10215,10 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"lazy_static",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
"strum",
]
@@ -10279,7 +10226,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"futures",
@@ -10288,15 +10235,15 @@ dependencies = [
"parking_lot 0.12.1",
"schnorrkel",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-externalities",
"thiserror",
]
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"thiserror",
"zstd",
@@ -10305,46 +10252,47 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"log",
"parity-scale-codec",
+ "scale-info",
"serde",
"sp-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-debug-derive",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
"sp-arithmetic",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"sp-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
]
[[package]]
name = "sp-panic-handler"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"backtrace",
"lazy_static",
@@ -10354,17 +10302,17 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"rustc-hash",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
]
[[package]]
name = "sp-runtime"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"either",
"hash256-std-hasher",
@@ -10378,63 +10326,34 @@ dependencies = [
"serde",
"sp-application-crypto",
"sp-arithmetic",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
-]
-
-[[package]]
-name = "sp-runtime-interface"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
-dependencies = [
- "bytes",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "primitive-types",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "static_assertions",
+ "sp-std",
+ "sp-weights",
]
[[package]]
name = "sp-runtime-interface"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"bytes",
"impl-trait-for-tuples",
"parity-scale-codec",
"primitive-types",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-externalities",
+ "sp-runtime-interface-proc-macro",
+ "sp-std",
+ "sp-storage",
+ "sp-tracing",
+ "sp-wasm-interface",
"static_assertions",
]
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
-dependencies = [
- "Inflector",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sp-runtime-interface-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -10446,46 +10365,46 @@ dependencies = [
[[package]]
name = "sp-sandbox"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"log",
"parity-scale-codec",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-wasm-interface",
"wasmi",
]
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"scale-info",
"sp-api",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"scale-info",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
]
[[package]]
name = "sp-state-machine"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"hash-db",
"log",
@@ -10493,70 +10412,52 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.1",
"rand 0.7.3",
- "smallvec",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-panic-handler",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "thiserror",
- "tracing",
- "trie-root",
-]
-
-[[package]]
-name = "sp-std"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
-
-[[package]]
-name = "sp-std"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
-
-[[package]]
-name = "sp-storage"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
-dependencies = [
- "impl-serde",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
+ "smallvec",
+ "sp-core",
+ "sp-externalities",
+ "sp-panic-handler",
+ "sp-std",
+ "sp-trie",
+ "thiserror",
+ "tracing",
+ "trie-root",
]
+[[package]]
+name = "sp-std"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+
[[package]]
name = "sp-storage"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"impl-serde",
"parity-scale-codec",
"ref-cast",
"serde",
- "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-debug-derive",
+ "sp-std",
]
[[package]]
name = "sp-tasks"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"log",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-externalities",
"sp-io",
- "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-runtime-interface",
+ "sp-std",
]
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"futures-timer",
@@ -10565,29 +10466,17 @@ dependencies = [
"sp-api",
"sp-inherents",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"thiserror",
]
[[package]]
name = "sp-tracing"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
-dependencies = [
- "parity-scale-codec",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "tracing",
- "tracing-core",
- "tracing-subscriber 0.2.25",
-]
-
-[[package]]
-name = "sp-tracing"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"tracing",
"tracing-core",
"tracing-subscriber 0.2.25",
@@ -10596,7 +10485,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"sp-api",
"sp-runtime",
@@ -10605,27 +10494,27 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"async-trait",
"log",
"parity-scale-codec",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-trie",
]
[[package]]
name = "sp-trie"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"ahash",
"hash-db",
- "hashbrown 0.12.3",
+ "hashbrown",
"lazy_static",
"lru 0.7.8",
"memory-db",
@@ -10633,43 +10522,27 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.1",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
+ "sp-core",
+ "sp-std",
"thiserror",
"tracing",
- "trie-db 0.24.0",
- "trie-root",
-]
-
-[[package]]
-name = "sp-trie"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
-dependencies = [
- "hash-db",
- "memory-db",
- "parity-scale-codec",
- "scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "thiserror",
- "trie-db 0.23.1",
+ "trie-db",
"trie-root",
]
[[package]]
name = "sp-version"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"impl-serde",
"parity-scale-codec",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
"scale-info",
"serde",
"sp-core-hashing-proc-macro",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"sp-version-proc-macro",
"thiserror",
]
@@ -10677,7 +10550,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -10688,26 +10561,30 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e986f05062a5c7a8608967febcd5c1d2bb02eb40"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=master)",
+ "sp-std",
"wasmi",
+ "wasmtime",
]
[[package]]
-name = "sp-wasm-interface"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+name = "sp-weights"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"impl-trait-for-tuples",
- "log",
"parity-scale-codec",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "wasmi",
- "wasmtime",
+ "scale-info",
+ "serde",
+ "smallvec",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-debug-derive",
+ "sp-std",
]
[[package]]
@@ -10716,11 +10593,21 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+[[package]]
+name = "spki"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
[[package]]
name = "ss58-registry"
-version = "1.28.0"
+version = "1.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c8a1e645fa0bd3e81a90e592a677f7ada3182ac338c4a71cd9ec0ba911f6abb"
+checksum = "b0837b5d62f42082c9d56cd946495ae273a3c68083b637b9153341d5e465146d"
dependencies = [
"Inflector",
"num-format",
@@ -10739,7 +10626,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "staking-miner"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_cmd",
"clap",
@@ -10766,7 +10653,7 @@ dependencies = [
"serde_json",
"signal-hook",
"signal-hook-tokio",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-npos-elections",
"sp-runtime",
@@ -10774,7 +10661,7 @@ dependencies = [
"sub-tokens",
"thiserror",
"tokio",
- "tracing-subscriber 0.3.15",
+ "tracing-subscriber 0.3.11",
"westend-runtime",
]
@@ -10793,7 +10680,22 @@ dependencies = [
"cfg_aliases",
"libc",
"parking_lot 0.11.2",
- "static_init_macro",
+ "static_init_macro 0.5.0",
+]
+
+[[package]]
+name = "static_init"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
+dependencies = [
+ "bitflags",
+ "cfg_aliases",
+ "libc",
+ "parking_lot 0.11.2",
+ "parking_lot_core 0.8.5",
+ "static_init_macro 1.0.2",
+ "winapi",
]
[[package]]
@@ -10809,6 +10711,19 @@ dependencies = [
"syn",
]
+[[package]]
+name = "static_init_macro"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
+dependencies = [
+ "cfg_aliases",
+ "memchr",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "statrs"
version = "0.15.0"
@@ -10839,9 +10754,9 @@ dependencies = [
[[package]]
name = "strum_macros"
-version = "0.24.3"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef"
dependencies = [
"heck",
"proc-macro2",
@@ -10867,14 +10782,14 @@ dependencies = [
"hmac 0.11.0",
"pbkdf2 0.8.0",
"schnorrkel",
- "sha2 0.9.9",
+ "sha2 0.9.8",
"zeroize",
]
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"platforms",
]
@@ -10882,7 +10797,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -10896,14 +10811,14 @@ dependencies = [
"sp-api",
"sp-block-builder",
"sp-blockchain",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-runtime",
]
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures-util",
"hyper",
@@ -10913,10 +10828,23 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "substrate-rpc-client"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+dependencies = [
+ "async-trait",
+ "jsonrpsee",
+ "log",
+ "sc-rpc-api",
+ "serde",
+ "sp-runtime",
+]
+
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"jsonrpsee",
"log",
@@ -10925,23 +10853,23 @@ dependencies = [
"sc-rpc-api",
"scale-info",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-state-machine",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "trie-db 0.23.1",
+ "sp-std",
+ "sp-trie",
+ "trie-db",
]
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
+ "array-bytes",
"async-trait",
"futures",
- "hex",
"parity-scale-codec",
"sc-client-api",
"sc-client-db",
@@ -10953,7 +10881,7 @@ dependencies = [
"serde_json",
"sp-blockchain",
"sp-consensus",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
@@ -10963,7 +10891,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -10973,7 +10901,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -10984,7 +10912,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"ansi_term",
"build-helper",
@@ -11015,21 +10943,21 @@ dependencies = [
[[package]]
name = "symbolic-common"
-version = "8.8.0"
+version = "8.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f551f902d5642e58039aee6a9021a61037926af96e071816361644983966f540"
+checksum = "e92a52f07eed9afba3d6f883652cde7cd75fcf327dd44e84f210958379158737"
dependencies = [
"debugid",
- "memmap2 0.5.7",
+ "memmap2 0.5.0",
"stable_deref_trait",
"uuid",
]
[[package]]
name = "symbolic-demangle"
-version = "8.8.0"
+version = "8.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4564ca7b4e6eb14105aa8bbbce26e080f6b5d9c4373e67167ab31f7b86443750"
+checksum = "c9abc81544d9964975269165bfe5ad198d8b9e2e809c46527323f95588a57693"
dependencies = [
"cpp_demangle",
"rustc-demangle",
@@ -11038,9 +10966,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.99"
+version = "1.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
dependencies = [
"proc-macro2",
"quote",
@@ -11088,9 +11016,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "target-lexicon"
-version = "0.12.4"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1"
+checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff"
[[package]]
name = "tempfile"
@@ -11108,35 +11036,35 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.1.3"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
dependencies = [
"winapi-util",
]
[[package]]
name = "termtree"
-version = "0.2.4"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
+checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
[[package]]
name = "test-parachain-adder"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"dlmalloc",
"parity-scale-codec",
"polkadot-parachain",
"sp-io",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"substrate-wasm-builder",
"tiny-keccak",
]
[[package]]
name = "test-parachain-adder-collator"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"clap",
"futures",
@@ -11153,7 +11081,7 @@ dependencies = [
"polkadot-test-service",
"sc-cli",
"sc-service",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"substrate-test-utils",
"test-parachain-adder",
@@ -11162,28 +11090,28 @@ dependencies = [
[[package]]
name = "test-parachain-halt"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"substrate-wasm-builder",
]
[[package]]
name = "test-parachain-undying"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"dlmalloc",
"log",
"parity-scale-codec",
"polkadot-parachain",
"sp-io",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"substrate-wasm-builder",
"tiny-keccak",
]
[[package]]
name = "test-parachain-undying-collator"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"clap",
"futures",
@@ -11200,7 +11128,7 @@ dependencies = [
"polkadot-test-service",
"sc-cli",
"sc-service",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-keyring",
"substrate-test-utils",
"test-parachain-undying",
@@ -11209,10 +11137,10 @@ dependencies = [
[[package]]
name = "test-parachains"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"parity-scale-codec",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"test-parachain-adder",
"test-parachain-halt",
"tiny-keccak",
@@ -11220,35 +11148,31 @@ dependencies = [
[[package]]
name = "test-runtime-constants"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
[[package]]
name = "thiserror"
-version = "1.0.33"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0a539a918745651435ac7db7a18761589a94cd7e94cd56999f828bf73c8a57"
+checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.33"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c251e90f708e16c49a16f4917dc2131e75222b72edfa9cb7f7c58ae56aae0c09"
+checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
dependencies = [
"proc-macro2",
"quote",
@@ -11294,9 +11218,9 @@ dependencies = [
[[package]]
name = "tikv-jemalloc-ctl"
-version = "0.4.2"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb833c46ecbf8b6daeccb347cefcabf9c1beb5c9b0f853e1cec45632d9963e69"
+checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1"
dependencies = [
"libc",
"paste",
@@ -11305,9 +11229,9 @@ dependencies = [
[[package]]
name = "tikv-jemalloc-sys"
-version = "0.4.3+5.2.1-patched.2"
+version = "0.5.2+5.3.0-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49"
+checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3"
dependencies = [
"cc",
"fs_extra",
@@ -11316,9 +11240,9 @@ dependencies = [
[[package]]
name = "tikv-jemallocator"
-version = "0.4.3"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5b7bcecfafe4998587d636f9ae9d55eb9d0499877b88757767c346875067098"
+checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979"
dependencies = [
"libc",
"tikv-jemalloc-sys",
@@ -11347,7 +11271,7 @@ dependencies = [
"pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",
- "sha2 0.9.9",
+ "sha2 0.9.8",
"thiserror",
"unicode-normalization",
"wasm-bindgen",
@@ -11365,9 +11289,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.6.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
dependencies = [
"tinyvec_macros",
]
@@ -11380,11 +11304,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.21.0"
+version = "1.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
dependencies = [
- "autocfg",
"bytes",
"libc",
"memchr",
@@ -11392,7 +11315,7 @@ dependencies = [
"num_cpus",
"once_cell",
"parking_lot 0.12.1",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
"signal-hook-registry",
"socket2",
"tokio-macros",
@@ -11401,9 +11324,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "1.8.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
dependencies = [
"proc-macro2",
"quote",
@@ -11422,9 +11345,9 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.23.4"
+version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b"
dependencies = [
"rustls",
"tokio",
@@ -11438,15 +11361,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
dependencies = [
"futures-core",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
"tokio",
]
[[package]]
name = "tokio-tungstenite"
-version = "0.17.2"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
+checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae"
dependencies = [
"futures-util",
"log",
@@ -11456,52 +11379,64 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.3"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "log",
+ "pin-project-lite 0.2.7",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
+checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
dependencies = [
"bytes",
"futures-core",
"futures-io",
"futures-sink",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
"tokio",
- "tracing",
]
[[package]]
name = "toml"
-version = "0.5.9"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
dependencies = [
"serde",
]
[[package]]
name = "tower-service"
-version = "0.3.2"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
-version = "0.1.36"
+version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
+checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
dependencies = [
"cfg-if 1.0.0",
- "log",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.7",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
-version = "0.1.22"
+version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
dependencies = [
"proc-macro2",
"quote",
@@ -11510,9 +11445,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.29"
+version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
+checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
dependencies = [
"once_cell",
"valuable",
@@ -11530,7 +11465,7 @@ dependencies = [
[[package]]
name = "tracing-gum"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"polkadot-node-jaeger",
"polkadot-primitives",
@@ -11540,7 +11475,7 @@ dependencies = [
[[package]]
name = "tracing-gum-proc-macro"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"assert_matches",
"expander 0.0.6",
@@ -11563,9 +11498,9 @@ dependencies = [
[[package]]
name = "tracing-serde"
-version = "0.1.3"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
+checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
dependencies = [
"serde",
"tracing-core",
@@ -11596,13 +11531,13 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.15"
+version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
+checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
dependencies = [
"ansi_term",
+ "lazy_static",
"matchers 0.1.0",
- "once_cell",
"regex",
"sharded-slab",
"smallvec",
@@ -11612,19 +11547,6 @@ dependencies = [
"tracing-log",
]
-[[package]]
-name = "trie-db"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83"
-dependencies = [
- "hash-db",
- "hashbrown 0.12.3",
- "log",
- "rustc-hex",
- "smallvec",
-]
-
[[package]]
name = "trie-db"
version = "0.24.0"
@@ -11632,7 +11554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908"
dependencies = [
"hash-db",
- "hashbrown 0.12.3",
+ "hashbrown",
"log",
"rustc-hex",
"smallvec",
@@ -11649,9 +11571,9 @@ dependencies = [
[[package]]
name = "trust-dns-proto"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
+checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
dependencies = [
"async-trait",
"cfg-if 1.0.0",
@@ -11663,30 +11585,30 @@ dependencies = [
"idna",
"ipnet",
"lazy_static",
- "log",
"rand 0.8.5",
"smallvec",
"thiserror",
"tinyvec",
+ "tracing",
"url",
]
[[package]]
name = "trust-dns-resolver"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
+checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
dependencies = [
"cfg-if 1.0.0",
"futures-util",
"ipconfig",
"lazy_static",
- "log",
"lru-cache",
"parking_lot 0.12.1",
"resolv-conf",
"smallvec",
"thiserror",
+ "tracing",
"trust-dns-proto",
]
@@ -11699,10 +11621,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28#34a0621761c4a333cb2074ff720f7acbfb92dbb8"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
dependencies = [
"clap",
- "jsonrpsee",
+ "frame-try-runtime",
"log",
"parity-scale-codec",
"remote-externalities",
@@ -11711,21 +11633,23 @@ dependencies = [
"sc-executor",
"sc-service",
"serde",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
+ "sp-externalities",
"sp-io",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
"sp-version",
+ "sp-weights",
+ "substrate-rpc-client",
"zstd",
]
[[package]]
name = "trybuild"
-version = "1.0.64"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f408301c7480f9e6294eb779cfc907f54bd901a9660ef24d7f233ed5376485"
+checksum = "7fc92f558afb6d1d7c6f175eb8d615b8ef49c227543e68e19c123d4ee43d8a7d"
dependencies = [
"dissimilar",
"glob",
@@ -11745,9 +11669,9 @@ checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055"
[[package]]
name = "tungstenite"
-version = "0.17.3"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
+checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
dependencies = [
"base64",
"byteorder",
@@ -11776,21 +11700,21 @@ dependencies = [
[[package]]
name = "typenum"
-version = "1.15.0"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
[[package]]
name = "ucd-trie"
-version = "0.1.4"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
[[package]]
name = "uint"
-version = "0.9.3"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
+checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f"
dependencies = [
"byteorder",
"crunchy",
@@ -11809,21 +11733,21 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
[[package]]
name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
[[package]]
name = "unicode-normalization"
-version = "0.1.21"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
dependencies = [
"tinyvec",
]
@@ -11836,9 +11760,9 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
[[package]]
name = "unicode-xid"
-version = "0.2.3"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
[[package]]
name = "universal-hash"
@@ -11846,7 +11770,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.4",
"subtle",
]
@@ -11920,9 +11844,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "void"
@@ -11986,9 +11910,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.82"
+version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
dependencies = [
"cfg-if 1.0.0",
"serde",
@@ -11998,13 +11922,13 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.82"
+version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
dependencies = [
"bumpalo",
+ "lazy_static",
"log",
- "once_cell",
"proc-macro2",
"quote",
"syn",
@@ -12013,9 +11937,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.32"
+version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
+checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@@ -12025,9 +11949,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.82"
+version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -12035,9 +11959,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.82"
+version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
dependencies = [
"proc-macro2",
"quote",
@@ -12048,9 +11972,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.82"
+version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
[[package]]
name = "wasm-gc-api"
@@ -12065,11 +11989,11 @@ dependencies = [
[[package]]
name = "wasm-instrument"
-version = "0.1.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f"
+checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd"
dependencies = [
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
]
[[package]]
@@ -12089,58 +12013,63 @@ dependencies = [
[[package]]
name = "wasmi"
-version = "0.9.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d"
+checksum = "fc13b3c219ca9aafeec59150d80d89851df02e0061bc357b4d66fc55a8d38787"
dependencies = [
- "downcast-rs",
- "libc",
- "libm",
- "memory_units",
- "num-rational 0.2.4",
- "num-traits",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
"wasmi-validation",
+ "wasmi_core",
]
[[package]]
name = "wasmi-validation"
-version = "0.4.1"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
+dependencies = [
+ "parity-wasm 0.45.0",
+]
+
+[[package]]
+name = "wasmi_core"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937"
+checksum = "e0a088e8c4c59c6f2b9eae169bf86328adccc477c00b56d3661e3e9fb397b184"
dependencies = [
- "parity-wasm 0.42.2",
+ "downcast-rs",
+ "libm",
+ "memory_units",
+ "num-rational 0.4.0",
+ "num-traits",
]
[[package]]
name = "wasmparser"
-version = "0.85.0"
+version = "0.89.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7"
+checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef"
dependencies = [
"indexmap",
]
[[package]]
name = "wasmtime"
-version = "0.38.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5"
+checksum = "8a10dc9784d8c3a33c970e3939180424955f08af2e7f20368ec02685a0e8f065"
dependencies = [
"anyhow",
- "backtrace",
"bincode",
"cfg-if 1.0.0",
"indexmap",
- "lazy_static",
"libc",
"log",
- "object 0.28.4",
+ "object 0.29.0",
"once_cell",
"paste",
"psm",
"rayon",
- "region",
"serde",
"target-lexicon",
"wasmparser",
@@ -12149,14 +12078,23 @@ dependencies = [
"wasmtime-environ",
"wasmtime-jit",
"wasmtime-runtime",
- "winapi",
+ "windows-sys 0.36.1",
+]
+
+[[package]]
+name = "wasmtime-asm-macros"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee4dbdc6daf68528cad1275ac91e3f51848ce9824385facc94c759f529decdf8"
+dependencies = [
+ "cfg-if 1.0.0",
]
[[package]]
name = "wasmtime-cache"
-version = "0.38.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2"
+checksum = "9f507f3fa1ee1b2f9a83644e2514242b1dfe580782c0eb042f1ef70255bc4ffe"
dependencies = [
"anyhow",
"base64",
@@ -12164,19 +12102,19 @@ dependencies = [
"directories-next",
"file-per-thread-logger",
"log",
- "rustix 0.33.7",
+ "rustix",
"serde",
- "sha2 0.9.9",
+ "sha2 0.9.8",
"toml",
- "winapi",
+ "windows-sys 0.36.1",
"zstd",
]
[[package]]
name = "wasmtime-cranelift"
-version = "0.38.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd"
+checksum = "8f03cf79d982fc68e94ba0bea6a300a3b94621c4eb9705eece0a4f06b235a3b5"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -12186,8 +12124,7 @@ dependencies = [
"cranelift-wasm",
"gimli",
"log",
- "more-asserts",
- "object 0.28.4",
+ "object 0.29.0",
"target-lexicon",
"thiserror",
"wasmparser",
@@ -12196,17 +12133,16 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
-version = "0.38.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6"
+checksum = "5c587c62e91c5499df62012b87b88890d0eb470b2ffecc5964e9da967b70c77c"
dependencies = [
"anyhow",
"cranelift-entity",
"gimli",
"indexmap",
"log",
- "more-asserts",
- "object 0.28.4",
+ "object 0.29.0",
"serde",
"target-lexicon",
"thiserror",
@@ -12216,9 +12152,9 @@ dependencies = [
[[package]]
name = "wasmtime-jit"
-version = "0.38.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49"
+checksum = "047839b5dabeae5424a078c19b8cc897e5943a7fadc69e3d888b9c9a897666b3"
dependencies = [
"addr2line",
"anyhow",
@@ -12227,38 +12163,36 @@ dependencies = [
"cpp_demangle",
"gimli",
"log",
- "object 0.28.4",
- "region",
+ "object 0.29.0",
"rustc-demangle",
- "rustix 0.33.7",
+ "rustix",
"serde",
"target-lexicon",
"thiserror",
"wasmtime-environ",
"wasmtime-jit-debug",
"wasmtime-runtime",
- "winapi",
+ "windows-sys 0.36.1",
]
[[package]]
name = "wasmtime-jit-debug"
-version = "0.38.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac"
+checksum = "b299569abf6f99b7b8e020afaf84a700e8636c6a42e242069267322cd5818235"
dependencies = [
- "lazy_static",
- "object 0.28.4",
- "rustix 0.33.7",
+ "object 0.29.0",
+ "once_cell",
+ "rustix",
]
[[package]]
name = "wasmtime-runtime"
-version = "0.38.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a"
+checksum = "ae79e0515160bd5abee5df50a16c4eb8db9f71b530fc988ae1d9ce34dcb8dd01"
dependencies = [
"anyhow",
- "backtrace",
"cc",
"cfg-if 1.0.0",
"indexmap",
@@ -12267,21 +12201,21 @@ dependencies = [
"mach",
"memfd",
"memoffset",
- "more-asserts",
+ "paste",
"rand 0.8.5",
- "region",
- "rustix 0.33.7",
+ "rustix",
"thiserror",
+ "wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-jit-debug",
- "winapi",
+ "windows-sys 0.36.1",
]
[[package]]
name = "wasmtime-types"
-version = "0.38.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2"
+checksum = "790cf43ee8e2d5dad1780af30f00d7a972b74725fb1e4f90c28d62733819b185"
dependencies = [
"cranelift-entity",
"serde",
@@ -12291,9 +12225,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.59"
+version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
+checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -12311,9 +12245,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.22.4"
+version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
+checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449"
dependencies = [
"webpki",
]
@@ -12329,7 +12263,7 @@ dependencies = [
[[package]]
name = "westend-runtime"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -12353,6 +12287,7 @@ dependencies = [
"pallet-election-provider-multi-phase",
"pallet-election-provider-support-benchmarking",
"pallet-elections-phragmen",
+ "pallet-fast-unstake",
"pallet-grandpa",
"pallet-identity",
"pallet-im-online",
@@ -12398,7 +12333,7 @@ dependencies = [
"sp-authority-discovery",
"sp-block-builder",
"sp-consensus-babe",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-inherents",
"sp-io",
"sp-keyring",
@@ -12408,10 +12343,10 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-staking",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
"sp-transaction-pool",
- "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-trie",
"sp-version",
"substrate-wasm-builder",
"tiny-keccak",
@@ -12424,24 +12359,26 @@ dependencies = [
[[package]]
name = "westend-runtime-constants"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "which"
-version = "4.3.0"
+version = "4.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
+checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9"
dependencies = [
"either",
+ "lazy_static",
"libc",
- "once_cell",
]
[[package]]
@@ -12494,6 +12431,19 @@ dependencies = [
"windows_x86_64_msvc 0.34.0",
]
+[[package]]
+name = "windows-sys"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
+dependencies = [
+ "windows_aarch64_msvc 0.32.0",
+ "windows_i686_gnu 0.32.0",
+ "windows_i686_msvc 0.32.0",
+ "windows_x86_64_gnu 0.32.0",
+ "windows_x86_64_msvc 0.32.0",
+]
+
[[package]]
name = "windows-sys"
version = "0.36.1"
@@ -12507,6 +12457,12 @@ dependencies = [
"windows_x86_64_msvc 0.36.1",
]
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.34.0"
@@ -12519,6 +12475,12 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
+
[[package]]
name = "windows_i686_gnu"
version = "0.34.0"
@@ -12531,6 +12493,12 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
+
[[package]]
name = "windows_i686_msvc"
version = "0.34.0"
@@ -12543,6 +12511,12 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.34.0"
@@ -12555,6 +12529,12 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.34.0"
@@ -12607,7 +12587,7 @@ dependencies = [
[[package]]
name = "xcm"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"derivative",
"impl-trait-for-tuples",
@@ -12615,13 +12595,14 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
+ "sp-io",
"sp-runtime",
"xcm-procedural",
]
[[package]]
name = "xcm-builder"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"frame-system",
@@ -12635,17 +12616,17 @@ dependencies = [
"polkadot-runtime-parachains",
"scale-info",
"sp-arithmetic",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"xcm",
"xcm-executor",
]
[[package]]
name = "xcm-executor"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -12653,16 +12634,16 @@ dependencies = [
"log",
"parity-scale-codec",
"sp-arithmetic",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"xcm",
]
[[package]]
name = "xcm-executor-integration-tests"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"frame-system",
@@ -12675,14 +12656,14 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"sp-state-machine",
- "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-tracing",
"xcm",
"xcm-executor",
]
[[package]]
name = "xcm-procedural"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"Inflector",
"proc-macro2",
@@ -12692,7 +12673,7 @@ dependencies = [
[[package]]
name = "xcm-simulator"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -12701,28 +12682,31 @@ dependencies = [
"polkadot-parachain",
"polkadot-runtime-parachains",
"sp-io",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"xcm",
"xcm-executor",
]
[[package]]
name = "xcm-simulator-example"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"frame-system",
+ "log",
"pallet-balances",
+ "pallet-uniques",
"pallet-xcm",
"parity-scale-codec",
"polkadot-core-primitives",
"polkadot-parachain",
"polkadot-runtime-parachains",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
+ "sp-tracing",
"xcm",
"xcm-builder",
"xcm-executor",
@@ -12731,7 +12715,7 @@ dependencies = [
[[package]]
name = "xcm-simulator-fuzzer"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"frame-support",
"frame-system",
@@ -12743,10 +12727,10 @@ dependencies = [
"polkadot-parachain",
"polkadot-runtime-parachains",
"scale-info",
- "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-core",
"sp-io",
"sp-runtime",
- "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)",
+ "sp-std",
"xcm",
"xcm-builder",
"xcm-executor",
@@ -12767,17 +12751,11 @@ dependencies = [
"static_assertions",
]
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
[[package]]
name = "zeroize"
-version = "1.5.7"
+version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
dependencies = [
"zeroize_derive",
]
@@ -12796,7 +12774,7 @@ dependencies = [
[[package]]
name = "zombienet-backchannel"
-version = "0.9.28"
+version = "0.9.31"
dependencies = [
"futures-util",
"lazy_static",
diff --git a/Cargo.toml b/Cargo.toml
index 11b558b862d2..450cc0f2d1da 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ path = "src/main.rs"
name = "polkadot"
description = "Implementation of a `https://polkadot.network` node in Rust based on the Substrate framework."
license = "GPL-3.0-only"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
rust-version = "1.57.0" # custom profiles
@@ -15,14 +15,14 @@ readme = "README.md"
[dependencies]
polkadot-cli = { path = "cli", features = [ "kusama-native", "westend-native", "rococo-native" ] }
color-eyre = { version = "0.6.1", default-features = false }
-parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] }
+parity-util-mem = { version = "0.12.0", default-features = false, features = ["jemalloc-global"] }
[dev-dependencies]
assert_cmd = "2.0.4"
nix = "0.24.1"
tempfile = "3.2.0"
tokio = "1.19.2"
-remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
polkadot-core-primitives = { path = "core-primitives" }
[workspace]
@@ -83,8 +83,6 @@ members = [
"node/network/gossip-support",
"node/network/dispute-distribution",
"node/overseer",
- "node/orchestra",
- "node/orchestra/proc-macro",
"node/malus",
"node/primitives",
"node/service",
@@ -96,7 +94,6 @@ members = [
"node/gum",
"node/gum/proc-macro",
"node/metrics",
- "node/metered-channel",
"node/test/client",
"node/test/performance-test",
"node/test/service",
@@ -128,9 +125,9 @@ maintenance = { status = "actively-developed" }
#
# This list is ordered alphabetically.
[profile.dev.package]
-blake2b_simd = { opt-level = 3 }
blake2 = { opt-level = 3 }
blake2-rfc = { opt-level = 3 }
+blake2b_simd = { opt-level = 3 }
chacha20poly1305 = { opt-level = 3 }
cranelift-codegen = { opt-level = 3 }
cranelift-wasm = { opt-level = 3 }
@@ -141,8 +138,8 @@ curve25519-dalek = { opt-level = 3 }
ed25519-dalek = { opt-level = 3 }
flate2 = { opt-level = 3 }
futures-channel = { opt-level = 3 }
-hashbrown = { opt-level = 3 }
hash-db = { opt-level = 3 }
+hashbrown = { opt-level = 3 }
hmac = { opt-level = 3 }
httparse = { opt-level = 3 }
integer-sqrt = { opt-level = 3 }
@@ -154,8 +151,8 @@ libz-sys = { opt-level = 3 }
mio = { opt-level = 3 }
nalgebra = { opt-level = 3 }
num-bigint = { opt-level = 3 }
-parking_lot_core = { opt-level = 3 }
parking_lot = { opt-level = 3 }
+parking_lot_core = { opt-level = 3 }
percent-encoding = { opt-level = 3 }
primitive-types = { opt-level = 3 }
reed-solomon-novelpoly = { opt-level = 3 }
@@ -165,6 +162,7 @@ sha2 = { opt-level = 3 }
sha3 = { opt-level = 3 }
smallvec = { opt-level = 3 }
snow = { opt-level = 3 }
+substrate-bip39 = {opt-level = 3}
twox-hash = { opt-level = 3 }
uint = { opt-level = 3 }
wasmi = { opt-level = 3 }
@@ -199,7 +197,6 @@ try-runtime = [ "polkadot-cli/try-runtime" ]
fast-runtime = [ "polkadot-cli/fast-runtime" ]
runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
pyroscope = ["polkadot-cli/pyroscope"]
-staging-client = ["polkadot-cli/staging-client"]
# Configuration for building a .deb package - for use with `cargo-deb`
[package.metadata.deb]
diff --git a/README.md b/README.md
index 7679ebec5984..55b66f6ea619 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ dnf install polkadot
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 with:
+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
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 93d86ffb9c34..8fc390e3932a 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-cli"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
description = "Polkadot Relay-chain Client Node"
edition = "2021"
@@ -14,7 +14,7 @@ wasm-opt = false
crate-type = ["cdylib", "rlib"]
[dependencies]
-clap = { version = "3.1", features = ["derive"], optional = true }
+clap = { version = "4.0.9", features = ["derive"], optional = true }
log = "0.4.17"
thiserror = "1.0.31"
futures = "0.3.21"
@@ -25,22 +25,22 @@ polkadot-client = { path = "../node/client", optional = true }
polkadot-node-core-pvf = { path = "../node/core/pvf", optional = true }
polkadot-performance-test = { path = "../node/test/performance-test", optional = true }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.28" }
-try-runtime-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.28" }
-sc-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.28" }
-sc-service = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.31" }
+try-runtime-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.31" }
+sc-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.31" }
+sc-service = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.31" }
polkadot-node-metrics = { path = "../node/metrics" }
-sc-tracing = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.28" }
-sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.31" }
+sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
# this crate is used only to enable `trie-memory-tracker` feature
# see https://github.com/paritytech/substrate/pull/6745
-sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
[build-dependencies]
-substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
[features]
default = ["wasmtime", "db", "cli", "hostperfcheck", "full-node", "trie-memory-tracker", "polkadot-native"]
@@ -56,7 +56,11 @@ cli = [
"polkadot-client",
"polkadot-node-core-pvf",
]
-runtime-benchmarks = ["service/runtime-benchmarks", "polkadot-node-metrics/runtime-benchmarks"]
+runtime-benchmarks = [
+ "service/runtime-benchmarks",
+ "polkadot-node-metrics/runtime-benchmarks",
+ "polkadot-performance-test?/runtime-benchmarks"
+]
trie-memory-tracker = ["sp-trie/memory-tracker"]
full-node = ["service/full-node"]
try-runtime = ["service/try-runtime"]
@@ -74,4 +78,3 @@ rococo-native = ["service/rococo-native"]
malus = ["full-node", "service/malus"]
runtime-metrics = ["service/runtime-metrics", "polkadot-node-metrics/runtime-metrics"]
-staging-client = ["service/staging-client"]
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index 804c4a9f81c6..a6b7f4a3d5c9 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -43,16 +43,16 @@ pub enum Subcommand {
Revert(sc_cli::RevertCmd),
#[allow(missing_docs)]
- #[clap(name = "prepare-worker", hide = true)]
+ #[command(name = "prepare-worker", hide = true)]
PvfPrepareWorker(ValidationWorkerCommand),
#[allow(missing_docs)]
- #[clap(name = "execute-worker", hide = true)]
+ #[command(name = "execute-worker", hide = true)]
PvfExecuteWorker(ValidationWorkerCommand),
/// Sub-commands concerned with benchmarking.
/// The pallet benchmarking moved to the `pallet` sub-command.
- #[clap(subcommand)]
+ #[command(subcommand)]
Benchmark(frame_benchmarking_cli::BenchmarkCmd),
/// Runs performance checks such as PVF compilation in order to measure machine
@@ -68,7 +68,7 @@ pub enum Subcommand {
TryRuntime,
/// Key management CLI utilities
- #[clap(subcommand)]
+ #[command(subcommand)]
Key(sc_cli::KeySubcommand),
/// Db meta columns information.
@@ -84,22 +84,22 @@ pub struct ValidationWorkerCommand {
#[allow(missing_docs)]
#[derive(Debug, Parser)]
-#[cfg_attr(feature = "malus", derive(Clone))]
+#[group(skip)]
pub struct RunCmd {
#[allow(missing_docs)]
#[clap(flatten)]
pub base: sc_cli::RunCmd,
/// Force using Kusama native runtime.
- #[clap(long = "force-kusama")]
+ #[arg(long = "force-kusama")]
pub force_kusama: bool,
/// Force using Westend native runtime.
- #[clap(long = "force-westend")]
+ #[arg(long = "force-westend")]
pub force_westend: bool,
/// Force using Rococo native runtime.
- #[clap(long = "force-rococo")]
+ #[arg(long = "force-rococo")]
pub force_rococo: bool,
/// Setup a GRANDPA scheduled voting pause.
@@ -108,25 +108,25 @@ pub struct RunCmd {
/// blocks). After the given block number is finalized the GRANDPA voter
/// will temporarily stop voting for new blocks until the given delay has
/// elapsed (i.e. until a block at height `pause_block + delay` is imported).
- #[clap(long = "grandpa-pause", number_of_values(2))]
+ #[arg(long = "grandpa-pause", num_args = 2)]
pub grandpa_pause: Vec,
/// Enable the BEEFY gadget (only on Rococo or Wococo for now).
- #[clap(long)]
+ #[arg(long)]
pub beefy: bool,
/// Add the destination address to the jaeger agent.
///
/// Must be valid socket address, of format `IP:Port`
/// commonly `127.0.0.1:6831`.
- #[clap(long)]
+ #[arg(long)]
pub jaeger_agent: Option,
/// Add the destination address to the `pyroscope` agent.
///
/// Must be valid socket address, of format `IP:Port`
/// commonly `127.0.0.1:4040`.
- #[clap(long)]
+ #[arg(long)]
pub pyroscope_server: Option,
/// Disable automatic hardware benchmarks.
@@ -136,20 +136,20 @@ pub struct RunCmd {
///
/// The results are then printed out in the logs, and also sent as part of
/// telemetry, if telemetry is enabled.
- #[clap(long)]
+ #[arg(long)]
pub no_hardware_benchmarks: bool,
/// Overseer message capacity override.
///
/// **Dangerous!** Do not touch unless explicitly adviced to.
- #[clap(long)]
+ #[arg(long)]
pub overseer_channel_capacity_override: Option,
}
#[allow(missing_docs)]
#[derive(Debug, Parser)]
pub struct Cli {
- #[clap(subcommand)]
+ #[command(subcommand)]
pub subcommand: Option,
#[clap(flatten)]
pub run: RunCmd,
diff --git a/cli/src/command.rs b/cli/src/command.rs
index a7ab8f67aad7..5ce7c05162c1 100644
--- a/cli/src/command.rs
+++ b/cli/src/command.rs
@@ -512,6 +512,15 @@ pub fn run() -> Result<()> {
let chain_spec = &runner.config().chain_spec;
match cmd {
+ #[cfg(not(feature = "runtime-benchmarks"))]
+ BenchmarkCmd::Storage(_) =>
+ return Err(sc_cli::Error::Input(
+ "Compile with --features=runtime-benchmarks \
+ to enable storage benchmarks."
+ .into(),
+ )
+ .into()),
+ #[cfg(feature = "runtime-benchmarks")]
BenchmarkCmd::Storage(cmd) => runner.sync_run(|mut config| {
let (client, backend, _, _) = service::new_chain_ops(&mut config, None)?;
let db = backend.expose_db();
@@ -552,14 +561,25 @@ pub fn run() -> Result<()> {
unwrap_client!(
client,
- cmd.run(client.clone(), inherent_data, &ext_factory)
- .map_err(Error::SubstrateCli)
+ cmd.run(
+ client.clone(),
+ inherent_data,
+ Vec::new(),
+ &ext_factory
+ )
+ .map_err(Error::SubstrateCli)
)
},
BenchmarkCmd::Overhead(cmd) => unwrap_client!(
client,
- cmd.run(config, client.clone(), inherent_data, &remark_builder)
- .map_err(Error::SubstrateCli)
+ cmd.run(
+ config,
+ client.clone(),
+ inherent_data,
+ Vec::new(),
+ &remark_builder
+ )
+ .map_err(Error::SubstrateCli)
),
_ => unreachable!("Ensured by the outside match; qed"),
}
diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
index 2f9cd15d03cc..e3eea6a3f424 100644
--- a/core-primitives/Cargo.toml
+++ b/core-primitives/Cargo.toml
@@ -1,16 +1,16 @@
[package]
name = "polkadot-core-primitives"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
parity-scale-codec = { version = "3.1.5", default-features = false, features = [ "derive" ] }
-parity-util-mem = { version = "0.11.0", default-features = false, optional = true }
+parity-util-mem = { version = "0.12.0", default-features = false, optional = true }
[features]
default = [ "std" ]
diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
index 4535e015465c..7df14eaf5799 100644
--- a/erasure-coding/Cargo.toml
+++ b/erasure-coding/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-erasure-coding"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -9,6 +9,6 @@ polkadot-primitives = { path = "../primitives" }
polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../node/primitives" }
novelpoly = { package = "reed-solomon-novelpoly", version = "1.0.0" }
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["std", "derive"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
thiserror = "1.0.31"
diff --git a/erasure-coding/fuzzer/Cargo.toml b/erasure-coding/fuzzer/Cargo.toml
index ee5a371fe1f3..6c8ad88e3955 100644
--- a/erasure-coding/fuzzer/Cargo.toml
+++ b/erasure-coding/fuzzer/Cargo.toml
@@ -1,12 +1,13 @@
[package]
name = "erasure_coding_fuzzer"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
polkadot-erasure-coding = { path = ".." }
honggfuzz = "0.5"
+polkadot-primitives = { path = "../../primitives" }
primitives = { package = "polkadot-node-primitives", path = "../../node/primitives/" }
[[bin]]
diff --git a/erasure-coding/fuzzer/src/round_trip.rs b/erasure-coding/fuzzer/src/round_trip.rs
index 3d5ea5927458..daa57a566fbb 100644
--- a/erasure-coding/fuzzer/src/round_trip.rs
+++ b/erasure-coding/fuzzer/src/round_trip.rs
@@ -2,6 +2,7 @@ use polkadot_erasure_coding::*;
use primitives::{AvailableData, BlockData, PoV};
use std::sync::Arc;
use honggfuzz::fuzz;
+use polkadot_primitives::v2::PersistedValidationData;
fn main() {
diff --git a/node/client/Cargo.toml b/node/client/Cargo.toml
index 35886d891ae6..bebbb1a66e2c 100644
--- a/node/client/Cargo.toml
+++ b/node/client/Cargo.toml
@@ -1,41 +1,41 @@
[package]
name = "polkadot-client"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-service = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-service = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
# Polkadot Runtimes
polkadot-runtime = { path = "../../runtime/polkadot", optional = true }
diff --git a/node/client/src/benchmarking.rs b/node/client/src/benchmarking.rs
index 02c0d316c0ad..7990bc88d218 100644
--- a/node/client/src/benchmarking.rs
+++ b/node/client/src/benchmarking.rs
@@ -49,9 +49,9 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder {
fn build(&self, nonce: u32) -> std::result::Result {
with_client! {
self.client.as_ref(), client, {
- use runtime::{Call, SystemCall};
+ use runtime::{RuntimeCall, SystemCall};
- let call = Call::System(SystemCall::remark { remark: vec![] });
+ let call = RuntimeCall::System(SystemCall::remark { remark: vec![] });
let signer = Sr25519Keyring::Bob.pair();
let period = polkadot_runtime_common::BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64;
@@ -92,9 +92,9 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
fn build(&self, nonce: u32) -> std::result::Result {
with_client! {
self.client.as_ref(), client, {
- use runtime::{Call, BalancesCall};
+ use runtime::{RuntimeCall, BalancesCall};
- let call = Call::Balances(BalancesCall::transfer_keep_alive {
+ let call = RuntimeCall::Balances(BalancesCall::transfer_keep_alive {
dest: self.dest.clone().into(),
value: self.value.into(),
});
@@ -113,14 +113,14 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
///
/// Should only be used for benchmarking since it makes strong assumptions
/// about the chain state that these calls will be valid for.
-trait BenchmarkCallSigner {
+trait BenchmarkCallSigner {
/// Signs a call together with the signed extensions of the specific runtime.
///
/// Only works if the current block is the genesis block since the
/// `CheckMortality` check is mocked by using the genesis block.
fn sign_call(
&self,
- call: Call,
+ call: RuntimeCall,
nonce: u32,
current_block: u64,
period: u64,
@@ -130,12 +130,12 @@ trait BenchmarkCallSigner {
}
#[cfg(feature = "polkadot")]
-impl BenchmarkCallSigner
+impl BenchmarkCallSigner
for FullClient
{
fn sign_call(
&self,
- call: polkadot_runtime::Call,
+ call: polkadot_runtime::RuntimeCall,
nonce: u32,
current_block: u64,
period: u64,
@@ -186,12 +186,12 @@ impl BenchmarkCallSigner
}
#[cfg(feature = "westend")]
-impl BenchmarkCallSigner
+impl BenchmarkCallSigner
for FullClient
{
fn sign_call(
&self,
- call: westend_runtime::Call,
+ call: westend_runtime::RuntimeCall,
nonce: u32,
current_block: u64,
period: u64,
@@ -240,12 +240,12 @@ impl BenchmarkCallSigner
}
#[cfg(feature = "kusama")]
-impl BenchmarkCallSigner
+impl BenchmarkCallSigner
for FullClient
{
fn sign_call(
&self,
- call: kusama_runtime::Call,
+ call: kusama_runtime::RuntimeCall,
nonce: u32,
current_block: u64,
period: u64,
@@ -294,12 +294,12 @@ impl BenchmarkCallSigner
}
#[cfg(feature = "rococo")]
-impl BenchmarkCallSigner
+impl BenchmarkCallSigner
for FullClient
{
fn sign_call(
&self,
- call: rococo_runtime::Call,
+ call: rococo_runtime::RuntimeCall,
nonce: u32,
current_block: u64,
period: u64,
diff --git a/node/client/src/lib.rs b/node/client/src/lib.rs
index 41b0048f0e46..a254973b99c2 100644
--- a/node/client/src/lib.rs
+++ b/node/client/src/lib.rs
@@ -128,7 +128,7 @@ pub trait RuntimeApiCollection:
+ ParachainHost
+ sp_block_builder::BlockBuilder
+ frame_system_rpc_runtime_api::AccountNonceApi
- + sp_mmr_primitives::MmrApi::Hash>
+ + sp_mmr_primitives::MmrApi::Hash, BlockNumber>
+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi
+ sp_api::Metadata
+ sp_offchain::OffchainWorkerApi
@@ -149,7 +149,7 @@ where
+ ParachainHost
+ sp_block_builder::BlockBuilder
+ frame_system_rpc_runtime_api::AccountNonceApi
- + sp_mmr_primitives::MmrApi::Hash>
+ + sp_mmr_primitives::MmrApi::Hash, BlockNumber>
+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi
+ sp_api::Metadata
+ sp_offchain::OffchainWorkerApi
@@ -421,63 +421,63 @@ impl sc_client_api::BlockBackend for Client {
impl sc_client_api::StorageProvider for Client {
fn storage(
&self,
- id: &BlockId,
+ hash: &::Hash,
key: &StorageKey,
) -> sp_blockchain::Result> {
with_client! {
self,
client,
{
- client.storage(id, key)
+ client.storage(hash, key)
}
}
}
fn storage_keys(
&self,
- id: &BlockId,
+ hash: &::Hash,
key_prefix: &StorageKey,
) -> sp_blockchain::Result> {
with_client! {
self,
client,
{
- client.storage_keys(id, key_prefix)
+ client.storage_keys(hash, key_prefix)
}
}
}
fn storage_hash(
&self,
- id: &BlockId,
+ hash: &::Hash,
key: &StorageKey,
) -> sp_blockchain::Result::Hash>> {
with_client! {
self,
client,
{
- client.storage_hash(id, key)
+ client.storage_hash(hash, key)
}
}
}
fn storage_pairs(
&self,
- id: &BlockId,
+ hash: &::Hash,
key_prefix: &StorageKey,
) -> sp_blockchain::Result> {
with_client! {
self,
client,
{
- client.storage_pairs(id, key_prefix)
+ client.storage_pairs(hash, key_prefix)
}
}
}
fn storage_keys_iter<'a>(
&self,
- id: &BlockId,
+ hash: &::Hash,
prefix: Option<&'a StorageKey>,
start_key: Option<&StorageKey>,
) -> sp_blockchain::Result<
@@ -487,14 +487,14 @@ impl sc_client_api::StorageProvider for Client {
self,
client,
{
- client.storage_keys_iter(id, prefix, start_key)
+ client.storage_keys_iter(hash, prefix, start_key)
}
}
}
fn child_storage(
&self,
- id: &BlockId,
+ hash: &::Hash,
child_info: &ChildInfo,
key: &StorageKey,
) -> sp_blockchain::Result> {
@@ -502,14 +502,14 @@ impl sc_client_api::StorageProvider for Client {
self,
client,
{
- client.child_storage(id, child_info, key)
+ client.child_storage(hash, child_info, key)
}
}
}
fn child_storage_keys(
&self,
- id: &BlockId,
+ hash: &::Hash,
child_info: &ChildInfo,
key_prefix: &StorageKey,
) -> sp_blockchain::Result> {
@@ -517,14 +517,14 @@ impl sc_client_api::StorageProvider for Client {
self,
client,
{
- client.child_storage_keys(id, child_info, key_prefix)
+ client.child_storage_keys(hash, child_info, key_prefix)
}
}
}
fn child_storage_keys_iter<'a>(
&self,
- id: &BlockId,
+ hash: &::Hash,
child_info: ChildInfo,
prefix: Option<&'a StorageKey>,
start_key: Option<&StorageKey>,
@@ -535,14 +535,14 @@ impl sc_client_api::StorageProvider for Client {
self,
client,
{
- client.child_storage_keys_iter(id, child_info, prefix, start_key)
+ client.child_storage_keys_iter(hash, child_info, prefix, start_key)
}
}
}
fn child_storage_hash(
&self,
- id: &BlockId,
+ hash: &::Hash,
child_info: &ChildInfo,
key: &StorageKey,
) -> sp_blockchain::Result::Hash>> {
@@ -550,7 +550,7 @@ impl sc_client_api::StorageProvider for Client {
self,
client,
{
- client.child_storage_hash(id, child_info, key)
+ client.child_storage_hash(hash, child_info, key)
}
}
}
diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
index 3a67b6d2399d..c32f8e04e4c8 100644
--- a/node/collation-generation/Cargo.toml
+++ b/node/collation-generation/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-collation-generation"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -12,8 +12,8 @@ polkadot-node-primitives = { path = "../primitives" }
polkadot-node-subsystem = { path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-primitives = { path = "../../primitives" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
thiserror = "1.0.31"
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
index 7f3923b6ff7d..8940c5b28efd 100644
--- a/node/core/approval-voting/Cargo.toml
+++ b/node/core/approval-voting/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-core-approval-voting"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -10,10 +10,10 @@ futures-timer = "3.0.2"
parity-scale-codec = { version = "3.1.5", 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.7"
+lru = "0.8"
merlin = "2.0"
schnorrkel = "0.9.1"
-kvdb = "0.11.0"
+kvdb = "0.12.0"
derive_more = "0.99.17"
thiserror = "1.0.31"
@@ -24,21 +24,21 @@ polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-jaeger = { path = "../../jaeger" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
-sp-consensus-slots = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["full_crypto"] , branch = "polkadot-v0.9.28" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-consensus-slots = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["full_crypto"] , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
[dev-dependencies]
-async-trait = "0.1.56"
+async-trait = "0.1.57"
parking_lot = "0.12.0"
rand_core = "0.5.1" # should match schnorrkel
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.4.0"
-kvdb-memorydb = "0.11.0"
+kvdb-memorydb = "0.12.0"
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
diff --git a/node/core/approval-voting/src/import.rs b/node/core/approval-voting/src/import.rs
index d43bf40546ae..5413c271e0d6 100644
--- a/node/core/approval-voting/src/import.rs
+++ b/node/core/approval-voting/src/import.rs
@@ -1296,6 +1296,38 @@ pub(crate) mod tests {
}
);
+ // Caching of sesssions needs sessoion of first unfinalied block.
+ assert_matches!(
+ handle.recv().await,
+ AllMessages::ChainApi(ChainApiMessage::FinalizedBlockNumber(
+ s_tx,
+ )) => {
+ let _ = s_tx.send(Ok(header.number));
+ }
+ );
+
+ assert_matches!(
+ handle.recv().await,
+ AllMessages::ChainApi(ChainApiMessage::FinalizedBlockHash(
+ block_number,
+ s_tx,
+ )) => {
+ assert_eq!(block_number, header.number);
+ let _ = s_tx.send(Ok(Some(header.hash())));
+ }
+ );
+
+ assert_matches!(
+ handle.recv().await,
+ AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ h,
+ RuntimeApiRequest::SessionIndexForChild(s_tx),
+ )) => {
+ assert_eq!(h, header.hash());
+ let _ = s_tx.send(Ok(session));
+ }
+ );
+
// determine_new_blocks exits early as the parent_hash is in the DB
assert_matches!(
diff --git a/node/core/approval-voting/src/lib.rs b/node/core/approval-voting/src/lib.rs
index 342fc0341b99..467d8be612e9 100644
--- a/node/core/approval-voting/src/lib.rs
+++ b/node/core/approval-voting/src/lib.rs
@@ -70,6 +70,7 @@ use std::{
collections::{
btree_map::Entry as BTMEntry, hash_map::Entry as HMEntry, BTreeMap, HashMap, HashSet,
},
+ num::NonZeroUsize,
sync::Arc,
time::Duration,
};
@@ -104,7 +105,11 @@ const APPROVAL_CHECKING_TIMEOUT: Duration = Duration::from_secs(120);
/// Value rather arbitrarily: Should not be hit in practice, it exists to more easily diagnose dead
/// lock issues for example.
const WAIT_FOR_SIGS_TIMEOUT: Duration = Duration::from_millis(500);
-const APPROVAL_CACHE_SIZE: usize = 1024;
+const APPROVAL_CACHE_SIZE: NonZeroUsize = match NonZeroUsize::new(1024) {
+ Some(cap) => cap,
+ None => panic!("Approval cache size must be non-zero."),
+};
+
const TICK_TOO_FAR_IN_FUTURE: Tick = 20; // 10 seconds.
const APPROVAL_DELAY: Tick = 2;
const LOG_TARGET: &str = "parachain::approval-voting";
@@ -1210,8 +1215,24 @@ async fn get_approval_signatures_for_candidate(
candidate_hash: CandidateHash,
tx: oneshot::Sender>,
) -> SubsystemResult<()> {
+ let send_votes = |votes| {
+ if let Err(_) = tx.send(votes) {
+ gum::debug!(
+ target: LOG_TARGET,
+ "Sending approval signatures back failed, as receiver got closed."
+ );
+ }
+ };
let entry = match db.load_candidate_entry(&candidate_hash)? {
- None => return Ok(()),
+ None => {
+ send_votes(HashMap::new());
+ gum::debug!(
+ target: LOG_TARGET,
+ ?candidate_hash,
+ "Sent back empty votes because the candidate was not found in db."
+ );
+ return Ok(())
+ },
Some(e) => e,
};
@@ -1261,13 +1282,7 @@ async fn get_approval_signatures_for_candidate(
target: LOG_TARGET,
"Request for approval signatures got cancelled by `approval-distribution`."
),
- Some(Ok(votes)) =>
- if let Err(_) = tx.send(votes) {
- gum::debug!(
- target: LOG_TARGET,
- "Sending approval signatures back failed, as receiver got closed"
- );
- },
+ Some(Ok(votes)) => send_votes(votes),
}
};
diff --git a/node/core/approval-voting/src/tests.rs b/node/core/approval-voting/src/tests.rs
index 66d1402ed6dc..bdb7a8c929b3 100644
--- a/node/core/approval-voting/src/tests.rs
+++ b/node/core/approval-voting/src/tests.rs
@@ -807,6 +807,37 @@ async fn import_block(
}
);
+ assert_matches!(
+ overseer_recv(overseer).await,
+ AllMessages::ChainApi(ChainApiMessage::FinalizedBlockNumber(
+ s_tx,
+ )) => {
+ let _ = s_tx.send(Ok(number));
+ }
+ );
+
+ assert_matches!(
+ overseer_recv(overseer).await,
+ AllMessages::ChainApi(ChainApiMessage::FinalizedBlockHash(
+ block_number,
+ s_tx,
+ )) => {
+ assert_eq!(block_number, number);
+ let _ = s_tx.send(Ok(Some(hashes[number as usize].0)));
+ }
+ );
+
+ assert_matches!(
+ overseer_recv(overseer).await,
+ AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ h,
+ RuntimeApiRequest::SessionIndexForChild(s_tx),
+ )) => {
+ assert_eq!(h, hashes[number as usize].0);
+ let _ = s_tx.send(Ok(number.into()));
+ }
+ );
+
if !fork {
assert_matches!(
overseer_recv(overseer).await,
diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml
index f6e154948fec..b4d19e430aad 100644
--- a/node/core/av-store/Cargo.toml
+++ b/node/core/av-store/Cargo.toml
@@ -1,13 +1,13 @@
[package]
name = "polkadot-node-core-av-store"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
futures = "0.3.21"
futures-timer = "3.0.2"
-kvdb = "0.11.0"
+kvdb = "0.12.0"
thiserror = "1.0.31"
gum = { package = "tracing-gum", path = "../../gum" }
bitvec = "1.0.0"
@@ -24,11 +24,11 @@ polkadot-node-primitives = { path = "../../primitives" }
log = "0.4.17"
env_logger = "0.9.0"
assert_matches = "1.4.0"
-kvdb-memorydb = "0.11.0"
+kvdb-memorydb = "0.12.0"
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
parking_lot = "0.12.0"
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
diff --git a/node/core/av-store/src/lib.rs b/node/core/av-store/src/lib.rs
index cd1685e32ea8..4fbbf3740ab0 100644
--- a/node/core/av-store/src/lib.rs
+++ b/node/core/av-store/src/lib.rs
@@ -792,8 +792,9 @@ fn note_block_included(
macro_rules! peek_num {
($iter:ident) => {
match $iter.peek() {
- Some((k, _)) => decode_unfinalized_key(&k[..]).ok().map(|(b, _, _)| b),
- None => None,
+ Some(Ok((k, _))) => Ok(decode_unfinalized_key(&k[..]).ok().map(|(b, _, _)| b)),
+ Some(Err(_)) => Err($iter.next().expect("peek returned Some(Err); qed").unwrap_err()),
+ None => Ok(None),
}
};
}
@@ -819,10 +820,10 @@ async fn process_block_finalized(
let mut iter = subsystem
.db
.iter_with_prefix(subsystem.config.col_meta, &start_prefix)
- .take_while(|(k, _)| &k[..] < &end_prefix[..])
+ .take_while(|r| r.as_ref().map_or(true, |(k, _v)| &k[..] < &end_prefix[..]))
.peekable();
- match peek_num!(iter) {
+ match peek_num!(iter)? {
None => break, // end of iterator.
Some(n) => n,
}
@@ -867,10 +868,10 @@ async fn process_block_finalized(
let iter = subsystem
.db
.iter_with_prefix(subsystem.config.col_meta, &start_prefix)
- .take_while(|(k, _)| &k[..] < &end_prefix[..])
+ .take_while(|r| r.as_ref().map_or(true, |(k, _v)| &k[..] < &end_prefix[..]))
.peekable();
- let batch = load_all_at_finalized_height(iter, batch_num, batch_finalized_hash);
+ let batch = load_all_at_finalized_height(iter, batch_num, batch_finalized_hash)?;
// Now that we've iterated over the entire batch at this finalized height,
// update the meta.
@@ -890,22 +891,22 @@ async fn process_block_finalized(
// loads all candidates at the finalized height and maps them to `true` if finalized
// and `false` if unfinalized.
fn load_all_at_finalized_height(
- mut iter: std::iter::Peekable, Box<[u8]>)>>,
+ mut iter: std::iter::Peekable>>,
block_number: BlockNumber,
finalized_hash: Hash,
-) -> impl IntoIterator- {
+) -> io::Result> {
// maps candidate hashes to true if finalized, false otherwise.
let mut candidates = HashMap::new();
// Load all candidates that were included at this height.
loop {
- match peek_num!(iter) {
+ match peek_num!(iter)? {
None => break, // end of iterator.
Some(n) if n != block_number => break, // end of batch.
_ => {},
}
- let (k, _v) = iter.next().expect("`peek` used to check non-empty; qed");
+ let (k, _v) = iter.next().expect("`peek` used to check non-empty; qed")?;
let (_, block_hash, candidate_hash) =
decode_unfinalized_key(&k[..]).expect("`peek_num` checks validity of key; qed");
@@ -916,7 +917,7 @@ fn load_all_at_finalized_height(
}
}
- candidates
+ Ok(candidates)
}
fn update_blocks_at_finalized_height(
@@ -1214,9 +1215,10 @@ fn prune_all(db: &Arc, config: &Config, clock: &dyn Clock) -> Resu
let mut tx = DBTransaction::new();
let iter = db
.iter_with_prefix(config.col_meta, &range_start[..])
- .take_while(|(k, _)| &k[..] < &range_end[..]);
+ .take_while(|r| r.as_ref().map_or(true, |(k, _v)| &k[..] < &range_end[..]));
- for (k, _v) in iter {
+ for r in iter {
+ let (k, _v) = r?;
tx.delete(config.col_meta, &k[..]);
let (_, candidate_hash) = match decode_pruning_key(&k[..]) {
diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
index 4a412f80346a..1fb8c9f46d99 100644
--- a/node/core/backing/Cargo.toml
+++ b/node/core/backing/Cargo.toml
@@ -1,12 +1,12 @@
[package]
name = "polkadot-node-core-backing"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
futures = "0.3.21"
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-subsystem = {path = "../../subsystem" }
@@ -19,11 +19,11 @@ thiserror = "1.0.31"
fatality = "0.0.6"
[dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
futures = { version = "0.3.21", features = ["thread-pool"] }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/core/backing/src/lib.rs b/node/core/backing/src/lib.rs
index dbc6e3f81903..a9ae518e3103 100644
--- a/node/core/backing/src/lib.rs
+++ b/node/core/backing/src/lib.rs
@@ -621,6 +621,7 @@ async fn request_pov(
sender: &mut impl overseer::CandidateBackingSenderTrait,
relay_parent: Hash,
from_validator: ValidatorIndex,
+ para_id: ParaId,
candidate_hash: CandidateHash,
pov_hash: Hash,
) -> Result, Error> {
@@ -629,6 +630,7 @@ async fn request_pov(
.send_message(AvailabilityDistributionMessage::FetchPoV {
relay_parent,
from_validator,
+ para_id,
candidate_hash,
pov_hash,
tx,
@@ -697,8 +699,15 @@ async fn validate_and_make_available(
PoVData::Ready(pov) => pov,
PoVData::FetchFromValidator { from_validator, candidate_hash, pov_hash } => {
let _span = span.as_ref().map(|s| s.child("request-pov"));
- match request_pov(&mut sender, relay_parent, from_validator, candidate_hash, pov_hash)
- .await
+ match request_pov(
+ &mut sender,
+ relay_parent,
+ from_validator,
+ candidate.descriptor.para_id,
+ candidate_hash,
+ pov_hash,
+ )
+ .await
{
Err(Error::FetchPoV) => {
tx_command
diff --git a/node/core/bitfield-signing/Cargo.toml b/node/core/bitfield-signing/Cargo.toml
index 0e94151da3d3..93e7e6683fc5 100644
--- a/node/core/bitfield-signing/Cargo.toml
+++ b/node/core/bitfield-signing/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-core-bitfield-signing"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -10,7 +10,7 @@ gum = { package = "tracing-gum", path = "../../gum" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
wasm-timer = "0.2.5"
thiserror = "1.0.31"
diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
index bae737ab72f3..ad1da736e01f 100644
--- a/node/core/candidate-validation/Cargo.toml
+++ b/node/core/candidate-validation/Cargo.toml
@@ -1,15 +1,15 @@
[package]
name = "polkadot-node-core-candidate-validation"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
-async-trait = "0.1.53"
+async-trait = "0.1.57"
futures = "0.3.21"
gum = { package = "tracing-gum", path = "../../gum" }
-sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
polkadot-primitives = { path = "../../../primitives" }
@@ -22,9 +22,9 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-core-pvf = { path = "../pvf" }
[dev-dependencies]
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
futures = { version = "0.3.21", features = ["thread-pool"] }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
diff --git a/node/core/candidate-validation/src/lib.rs b/node/core/candidate-validation/src/lib.rs
index 1f51c1ec7701..c3775ba1c453 100644
--- a/node/core/candidate-validation/src/lib.rs
+++ b/node/core/candidate-validation/src/lib.rs
@@ -501,10 +501,11 @@ async fn validate_candidate_exhaustive(
let _timer = metrics.time_validate_candidate_exhaustive();
let validation_code_hash = validation_code.hash();
+ let para_id = candidate_receipt.descriptor.para_id.clone();
gum::debug!(
target: LOG_TARGET,
?validation_code_hash,
- para_id = ?candidate_receipt.descriptor.para_id,
+ ?para_id,
"About to validate a candidate.",
);
@@ -514,6 +515,7 @@ async fn validate_candidate_exhaustive(
&*pov,
&validation_code_hash,
) {
+ gum::info!(target: LOG_TARGET, ?para_id, "Invalid candidate (basic checks)");
return Ok(ValidationResult::Invalid(e))
}
@@ -523,7 +525,7 @@ async fn validate_candidate_exhaustive(
) {
Ok(code) => code,
Err(e) => {
- gum::debug!(target: LOG_TARGET, err=?e, "Invalid validation code");
+ gum::info!(target: LOG_TARGET, ?para_id, err=?e, "Invalid candidate (validation code)");
// If the validation code is invalid, the candidate certainly is.
return Ok(ValidationResult::Invalid(InvalidCandidate::CodeDecompressionFailure))
@@ -534,7 +536,7 @@ async fn validate_candidate_exhaustive(
match sp_maybe_compressed_blob::decompress(&pov.block_data.0, POV_BOMB_LIMIT) {
Ok(block_data) => BlockData(block_data.to_vec()),
Err(e) => {
- gum::debug!(target: LOG_TARGET, err=?e, "Invalid PoV code");
+ gum::info!(target: LOG_TARGET, ?para_id, err=?e, "Invalid candidate (PoV code)");
// If the PoV is invalid, the candidate certainly is.
return Ok(ValidationResult::Invalid(InvalidCandidate::PoVDecompressionFailure))
@@ -552,12 +554,8 @@ async fn validate_candidate_exhaustive(
.validate_candidate(raw_validation_code.to_vec(), timeout, params)
.await;
- if let Err(ref e) = result {
- gum::debug!(
- target: LOG_TARGET,
- error = ?e,
- "Failed to validate candidate",
- );
+ if let Err(ref error) = result {
+ gum::info!(target: LOG_TARGET, ?para_id, ?error, "Failed to validate candidate",);
}
match result {
@@ -576,6 +574,7 @@ async fn validate_candidate_exhaustive(
Ok(res) =>
if res.head_data.hash() != candidate_receipt.descriptor.para_head {
+ gum::info!(target: LOG_TARGET, ?para_id, "Invalid candidate (para_head)");
Ok(ValidationResult::Invalid(InvalidCandidate::ParaHeadHashMismatch))
} else {
let outputs = CandidateCommitments {
@@ -587,6 +586,12 @@ async fn validate_candidate_exhaustive(
hrmp_watermark: res.hrmp_watermark,
};
if candidate_receipt.commitments_hash != outputs.hash() {
+ gum::info!(
+ target: LOG_TARGET,
+ ?para_id,
+ "Invalid candidate (commitments hash)"
+ );
+
// If validation produced a new set of commitments, we treat the candidate as invalid.
Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))
} else {
diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
index 522acab2ec15..ff815a46e646 100644
--- a/node/core/chain-api/Cargo.toml
+++ b/node/core/chain-api/Cargo.toml
@@ -1,18 +1,18 @@
[package]
name = "polkadot-node-core-chain-api"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
futures = "0.3.21"
gum = { package = "tracing-gum", path = "../../gum" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = {path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
[dev-dependencies]
futures = { version = "0.3.21", features = ["thread-pool"] }
@@ -20,4 +20,4 @@ maplit = "1.0.2"
parity-scale-codec = "3.1.5"
polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml
index 07cdbf45a3f8..a1e75625c32e 100644
--- a/node/core/chain-selection/Cargo.toml
+++ b/node/core/chain-selection/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "polkadot-node-core-chain-selection"
description = "Chain Selection Subsystem"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -13,13 +13,13 @@ polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
-kvdb = "0.11.0"
+kvdb = "0.12.0"
thiserror = "1.0.31"
parity-scale-codec = "3.1.5"
[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
parking_lot = "0.12.0"
assert_matches = "1"
-kvdb-memorydb = "0.11.0"
+kvdb-memorydb = "0.12.0"
diff --git a/node/core/chain-selection/src/db_backend/v1.rs b/node/core/chain-selection/src/db_backend/v1.rs
index db117ff945df..a037d27baaea 100644
--- a/node/core/chain-selection/src/db_backend/v1.rs
+++ b/node/core/chain-selection/src/db_backend/v1.rs
@@ -235,16 +235,21 @@ impl Backend for DbBackend {
self.inner.iter_with_prefix(self.config.col_data, &STAGNANT_AT_PREFIX[..]);
let val = stagnant_at_iter
- .filter_map(|(k, v)| {
- match (decode_stagnant_at_key(&mut &k[..]), >::decode(&mut &v[..]).ok()) {
- (Some(at), Some(stagnant_at)) => Some((at, stagnant_at)),
- _ => None,
- }
+ .filter_map(|r| match r {
+ Ok((k, v)) =>
+ match (decode_stagnant_at_key(&mut &k[..]), >::decode(&mut &v[..]).ok())
+ {
+ (Some(at), Some(stagnant_at)) => Some(Ok((at, stagnant_at))),
+ _ => None,
+ },
+ Err(e) => Some(Err(e)),
})
.enumerate()
- .take_while(|(idx, (at, _))| *at <= up_to.into() && *idx < max_elements)
+ .take_while(|(idx, r)| {
+ r.as_ref().map_or(true, |(at, _)| *at <= up_to.into() && *idx < max_elements)
+ })
.map(|(_, v)| v)
- .collect::>();
+ .collect::, _>>()?;
Ok(val)
}
@@ -254,10 +259,13 @@ impl Backend for DbBackend {
self.inner.iter_with_prefix(self.config.col_data, &BLOCK_HEIGHT_PREFIX[..]);
let val = blocks_at_height_iter
- .filter_map(|(k, _)| decode_block_height_key(&k[..]))
+ .filter_map(|r| match r {
+ Ok((k, _)) => decode_block_height_key(&k[..]).map(Ok),
+ Err(e) => Some(Err(e)),
+ })
.next();
- Ok(val)
+ val.transpose().map_err(Error::from)
}
fn load_blocks_by_number(&self, number: BlockNumber) -> Result, Error> {
diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml
index ba858dff751c..9c78180baa71 100644
--- a/node/core/dispute-coordinator/Cargo.toml
+++ b/node/core/dispute-coordinator/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -8,9 +8,9 @@ edition = "2021"
futures = "0.3.21"
gum = { package = "tracing-gum", path = "../../gum" }
parity-scale-codec = "3.1.5"
-kvdb = "0.11.0"
+kvdb = "0.12.0"
thiserror = "1.0.31"
-lru = "0.7.7"
+lru = "0.8.0"
fatality = "0.0.6"
polkadot-primitives = { path = "../../../primitives" }
@@ -18,19 +18,19 @@ polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
[dev-dependencies]
-kvdb-memorydb = "0.11.0"
+kvdb-memorydb = "0.12.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
assert_matches = "1.4.0"
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
futures-timer = "3.0.2"
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
[features]
# If not enabled, the dispute coordinator will do nothing.
diff --git a/node/core/dispute-coordinator/src/db/v1.rs b/node/core/dispute-coordinator/src/db/v1.rs
index 4d33949db644..2c643d341de2 100644
--- a/node/core/dispute-coordinator/src/db/v1.rs
+++ b/node/core/dispute-coordinator/src/db/v1.rs
@@ -16,6 +16,7 @@
//! `V1` database for the dispute coordinator.
+use polkadot_node_primitives::DisputeStatus;
use polkadot_node_subsystem::{SubsystemError, SubsystemResult};
use polkadot_node_subsystem_util::database::{DBTransaction, Database};
use polkadot_primitives::v2::{
@@ -31,7 +32,6 @@ use crate::{
backend::{Backend, BackendWriteOp, OverlayedBackend},
error::{FatalError, FatalResult},
metrics::Metrics,
- status::DisputeStatus,
DISPUTE_WINDOW, LOG_TARGET,
};
diff --git a/node/core/dispute-coordinator/src/initialized.rs b/node/core/dispute-coordinator/src/initialized.rs
index e37459dc5142..5f29245f33f8 100644
--- a/node/core/dispute-coordinator/src/initialized.rs
+++ b/node/core/dispute-coordinator/src/initialized.rs
@@ -26,8 +26,8 @@ use futures::{
use sc_keystore::LocalKeystore;
use polkadot_node_primitives::{
- CandidateVotes, DisputeMessage, DisputeMessageCheckError, SignedDisputeStatement,
- DISPUTE_WINDOW,
+ CandidateVotes, DisputeMessage, DisputeMessageCheckError, DisputeStatus,
+ SignedDisputeStatement, Timestamp, DISPUTE_WINDOW,
};
use polkadot_node_subsystem::{
messages::{
@@ -49,7 +49,7 @@ use crate::{
error::{log_error, Error, FatalError, FatalResult, JfyiError, JfyiResult, Result},
import::{CandidateEnvironment, CandidateVoteState},
metrics::Metrics,
- status::{get_active_with_status, Clock, DisputeStatus, Timestamp},
+ status::{get_active_with_status, Clock},
DisputeCoordinatorSubsystem, LOG_TARGET,
};
@@ -599,7 +599,9 @@ impl Initialized {
};
gum::trace!(target: LOG_TARGET, "Loaded recent disputes from db");
- let _ = tx.send(recent_disputes.keys().cloned().collect());
+ let _ = tx.send(
+ recent_disputes.into_iter().map(|(k, v)| (k.0, k.1, v)).collect::>(),
+ );
},
DisputeCoordinatorMessage::ActiveDisputes(tx) => {
// Return error if session information is missing.
@@ -890,11 +892,7 @@ impl Initialized {
.queue_participation(
ctx,
priority,
- ParticipationRequest::new(
- new_state.candidate_receipt().clone(),
- session,
- env.validators().len(),
- ),
+ ParticipationRequest::new(new_state.candidate_receipt().clone(), session),
)
.await;
log_error(r)?;
diff --git a/node/core/dispute-coordinator/src/lib.rs b/node/core/dispute-coordinator/src/lib.rs
index 03193a9d68ea..6289eb2f11a2 100644
--- a/node/core/dispute-coordinator/src/lib.rs
+++ b/node/core/dispute-coordinator/src/lib.rs
@@ -304,7 +304,6 @@ impl DisputeCoordinatorSubsystem {
Some(info) => info.validators.clone(),
};
- let n_validators = validators.len();
let voted_indices = votes.voted_indices();
// Determine if there are any missing local statements for this dispute. Validators are
@@ -335,11 +334,7 @@ impl DisputeCoordinatorSubsystem {
if missing_local_statement {
participation_requests.push((
ParticipationPriority::with_priority_if(is_included),
- ParticipationRequest::new(
- votes.candidate_receipt.clone(),
- session,
- n_validators,
- ),
+ ParticipationRequest::new(votes.candidate_receipt.clone(), session),
));
}
}
diff --git a/node/core/dispute-coordinator/src/participation/mod.rs b/node/core/dispute-coordinator/src/participation/mod.rs
index 3c066641d9f4..874f37e63213 100644
--- a/node/core/dispute-coordinator/src/participation/mod.rs
+++ b/node/core/dispute-coordinator/src/participation/mod.rs
@@ -27,7 +27,7 @@ use futures_timer::Delay;
use polkadot_node_primitives::{ValidationResult, APPROVAL_EXECUTION_TIMEOUT};
use polkadot_node_subsystem::{
- messages::{AvailabilityRecoveryMessage, AvailabilityStoreMessage, CandidateValidationMessage},
+ messages::{AvailabilityRecoveryMessage, CandidateValidationMessage},
overseer, ActiveLeavesUpdate, RecoveryError,
};
use polkadot_node_subsystem_util::runtime::get_validation_code_by_hash;
@@ -213,7 +213,6 @@ impl Participation {
}
/// Dequeue until `MAX_PARALLEL_PARTICIPATIONS` is reached.
-
async fn dequeue_until_capacity(
&mut self,
ctx: &mut Context,
@@ -320,38 +319,6 @@ async fn participate(
},
};
- // we dispatch a request to store the available data for the candidate. We
- // want to maximize data availability for other potential checkers involved
- // in the dispute
- let (store_available_data_tx, store_available_data_rx) = oneshot::channel();
- sender
- .send_message(AvailabilityStoreMessage::StoreAvailableData {
- candidate_hash: *req.candidate_hash(),
- n_validators: req.n_validators() as u32,
- available_data: available_data.clone(),
- tx: store_available_data_tx,
- })
- .await;
-
- match store_available_data_rx.await {
- Err(oneshot::Canceled) => {
- gum::warn!(
- target: LOG_TARGET,
- "`Oneshot` got cancelled when storing available data {:?}",
- req.candidate_hash(),
- );
- },
- Ok(Err(err)) => {
- gum::warn!(
- target: LOG_TARGET,
- ?err,
- "Failed to store available data for candidate {:?}",
- req.candidate_hash(),
- );
- },
- Ok(Ok(())) => {},
- }
-
// Issue a request to validate the candidate with the provided exhaustive
// parameters
//
diff --git a/node/core/dispute-coordinator/src/participation/queues/mod.rs b/node/core/dispute-coordinator/src/participation/queues/mod.rs
index 158bcfd2d3b6..3ec217628625 100644
--- a/node/core/dispute-coordinator/src/participation/queues/mod.rs
+++ b/node/core/dispute-coordinator/src/participation/queues/mod.rs
@@ -78,7 +78,6 @@ pub struct ParticipationRequest {
candidate_hash: CandidateHash,
candidate_receipt: CandidateReceipt,
session: SessionIndex,
- n_validators: usize,
}
/// Whether a `ParticipationRequest` should be put on best-effort or the priority queue.
@@ -122,12 +121,8 @@ pub enum QueueError {
impl ParticipationRequest {
/// Create a new `ParticipationRequest` to be queued.
- pub fn new(
- candidate_receipt: CandidateReceipt,
- session: SessionIndex,
- n_validators: usize,
- ) -> Self {
- Self { candidate_hash: candidate_receipt.hash(), candidate_receipt, session, n_validators }
+ pub fn new(candidate_receipt: CandidateReceipt, session: SessionIndex) -> Self {
+ Self { candidate_hash: candidate_receipt.hash(), candidate_receipt, session }
}
pub fn candidate_receipt(&'_ self) -> &'_ CandidateReceipt {
@@ -139,9 +134,6 @@ impl ParticipationRequest {
pub fn session(&self) -> SessionIndex {
self.session
}
- pub fn n_validators(&self) -> usize {
- self.n_validators
- }
pub fn into_candidate_info(self) -> (CandidateHash, CandidateReceipt) {
let Self { candidate_hash, candidate_receipt, .. } = self;
(candidate_hash, candidate_receipt)
diff --git a/node/core/dispute-coordinator/src/participation/queues/tests.rs b/node/core/dispute-coordinator/src/participation/queues/tests.rs
index 03c8e1f3b658..4e9019ebb499 100644
--- a/node/core/dispute-coordinator/src/participation/queues/tests.rs
+++ b/node/core/dispute-coordinator/src/participation/queues/tests.rs
@@ -25,7 +25,7 @@ fn make_participation_request(hash: Hash) -> ParticipationRequest {
let mut receipt = dummy_candidate_receipt(dummy_hash());
// make it differ:
receipt.commitments_hash = hash;
- ParticipationRequest::new(receipt, 1, 100)
+ ParticipationRequest::new(receipt, 1)
}
/// Make dummy comparator for request, based on the given block number.
diff --git a/node/core/dispute-coordinator/src/participation/tests.rs b/node/core/dispute-coordinator/src/participation/tests.rs
index 3ccb652fecc1..03772b1918dc 100644
--- a/node/core/dispute-coordinator/src/participation/tests.rs
+++ b/node/core/dispute-coordinator/src/participation/tests.rs
@@ -29,10 +29,7 @@ use parity_scale_codec::Encode;
use polkadot_node_primitives::{AvailableData, BlockData, InvalidCandidate, PoV};
use polkadot_node_subsystem::{
jaeger,
- messages::{
- AllMessages, DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest,
- ValidationFailed,
- },
+ messages::{AllMessages, DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest},
ActivatedLeaf, ActiveLeavesUpdate, LeafStatus, SpawnGlue,
};
use polkadot_node_subsystem_test_helpers::{
@@ -71,9 +68,8 @@ async fn participate_with_commitments_hash(
receipt
};
let session = 1;
- let n_validators = 10;
- let req = ParticipationRequest::new(candidate_receipt, session, n_validators);
+ let req = ParticipationRequest::new(candidate_receipt, session);
participation
.queue_participation(ctx, ParticipationPriority::BestEffort, req)
@@ -116,7 +112,6 @@ pub async fn participation_full_happy_path(
) {
recover_available_data(ctx_handle).await;
fetch_validation_code(ctx_handle).await;
- store_available_data(ctx_handle, true).await;
assert_matches!(
ctx_handle.recv().await,
@@ -185,20 +180,6 @@ async fn fetch_validation_code(virtual_overseer: &mut VirtualOverseer) -> Hash {
)
}
-async fn store_available_data(virtual_overseer: &mut VirtualOverseer, success: bool) {
- assert_matches!(
- virtual_overseer.recv().await,
- AllMessages::AvailabilityStore(AvailabilityStoreMessage::StoreAvailableData { tx, .. }) => {
- if success {
- tx.send(Ok(())).unwrap();
- } else {
- tx.send(Err(())).unwrap();
- }
- },
- "overseer did not receive store available data request",
- );
-}
-
#[test]
fn same_req_wont_get_queued_if_participation_is_already_running() {
futures::executor::block_on(async {
@@ -423,7 +404,6 @@ fn cast_invalid_vote_if_validation_fails_or_is_invalid() {
fetch_validation_code(&mut ctx_handle).await,
participation.recent_block.unwrap().1
);
- store_available_data(&mut ctx_handle, true).await;
assert_matches!(
ctx_handle.recv().await,
@@ -461,7 +441,6 @@ fn cast_invalid_vote_if_commitments_dont_match() {
fetch_validation_code(&mut ctx_handle).await,
participation.recent_block.unwrap().1
);
- store_available_data(&mut ctx_handle, true).await;
assert_matches!(
ctx_handle.recv().await,
@@ -499,7 +478,6 @@ fn cast_valid_vote_if_validation_passes() {
fetch_validation_code(&mut ctx_handle).await,
participation.recent_block.unwrap().1
);
- store_available_data(&mut ctx_handle, true).await;
assert_matches!(
ctx_handle.recv().await,
@@ -521,42 +499,3 @@ fn cast_valid_vote_if_validation_passes() {
);
})
}
-
-#[test]
-fn failure_to_store_available_data_does_not_preclude_participation() {
- futures::executor::block_on(async {
- let (mut ctx, mut ctx_handle) = make_our_subsystem_context(TaskExecutor::new());
-
- let (sender, mut worker_receiver) = mpsc::channel(1);
- let mut participation = Participation::new(sender);
- activate_leaf(&mut ctx, &mut participation, 10).await.unwrap();
- participate(&mut ctx, &mut participation).await.unwrap();
-
- recover_available_data(&mut ctx_handle).await;
- assert_eq!(
- fetch_validation_code(&mut ctx_handle).await,
- participation.recent_block.unwrap().1
- );
- // the store available data request should fail:
- store_available_data(&mut ctx_handle, false).await;
-
- assert_matches!(
- ctx_handle.recv().await,
- AllMessages::CandidateValidation(
- CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, timeout, tx)
- ) if timeout == APPROVAL_EXECUTION_TIMEOUT => {
- tx.send(Err(ValidationFailed("fail".to_string()))).unwrap();
- },
- "overseer did not receive candidate validation message",
- );
-
- let result = participation
- .get_participation_result(&mut ctx, worker_receiver.next().await.unwrap())
- .await
- .unwrap();
- assert_matches!(
- result.outcome,
- ParticipationOutcome::Invalid => {}
- );
- })
-}
diff --git a/node/core/dispute-coordinator/src/scraping/mod.rs b/node/core/dispute-coordinator/src/scraping/mod.rs
index 6fcae077ad8a..7d5d33e1ff4b 100644
--- a/node/core/dispute-coordinator/src/scraping/mod.rs
+++ b/node/core/dispute-coordinator/src/scraping/mod.rs
@@ -14,7 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see .
-use std::collections::{BTreeMap, HashSet};
+use std::{
+ collections::{BTreeMap, HashSet},
+ num::NonZeroUsize,
+};
use futures::channel::oneshot;
use lru::LruCache;
@@ -44,7 +47,10 @@ mod tests;
/// `last_observed_blocks` LRU. This means, this value should the very least be as large as the
/// number of expected forks for keeping chain scraping efficient. Making the LRU much larger than
/// that has very limited use.
-const LRU_OBSERVED_BLOCKS_CAPACITY: usize = 20;
+const LRU_OBSERVED_BLOCKS_CAPACITY: NonZeroUsize = match NonZeroUsize::new(20) {
+ Some(cap) => cap,
+ None => panic!("Observed blocks cache size must be non-zero"),
+};
/// Chain scraper
///
@@ -55,7 +61,7 @@ const LRU_OBSERVED_BLOCKS_CAPACITY: usize = 20;
/// - Monitors for inclusion events to keep track of candidates that have been included on chains.
/// - Calls `FetchOnChainVotes` for each block to gather potentially missed votes from chain.
///
-/// With this information it provies a `CandidateComparator` and as a return value of
+/// With this information it provides a `CandidateComparator` and as a return value of
/// `process_active_leaves_update` any scraped votes.
pub struct ChainScraper {
/// All candidates we have seen included, which not yet have been finalized.
@@ -136,7 +142,7 @@ impl ChainScraper {
let mut on_chain_votes = Vec::new();
for (block_number, block_hash) in block_numbers.zip(block_hashes) {
- gum::trace!(?block_number, ?block_hash, "In ancestor processesing.");
+ gum::trace!(?block_number, ?block_hash, "In ancestor processing.");
self.process_candidate_events(sender, block_number, block_hash).await?;
diff --git a/node/core/dispute-coordinator/src/status.rs b/node/core/dispute-coordinator/src/status.rs
index d2ad551bd9ad..6332c3653274 100644
--- a/node/core/dispute-coordinator/src/status.rs
+++ b/node/core/dispute-coordinator/src/status.rs
@@ -14,125 +14,18 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see .
-use std::time::{SystemTime, UNIX_EPOCH};
-
-use parity_scale_codec::{Decode, Encode};
+use polkadot_node_primitives::{dispute_is_inactive, DisputeStatus, Timestamp};
use polkadot_primitives::v2::{CandidateHash, SessionIndex};
+use std::time::{SystemTime, UNIX_EPOCH};
use crate::LOG_TARGET;
-/// The choice here is fairly arbitrary. But any dispute that concluded more than a few minutes ago
-/// is not worth considering anymore. Changing this value has little to no bearing on consensus,
-/// and really only affects the work that the node might do on startup during periods of many
-/// disputes.
-pub const ACTIVE_DURATION_SECS: Timestamp = 180;
-
-/// Timestamp based on the 1 Jan 1970 UNIX base, which is persistent across node restarts and OS reboots.
-pub type Timestamp = u64;
-
-/// The status of dispute. This is a state machine which can be altered by the
-/// helper methods.
-#[derive(Debug, Clone, Copy, Encode, Decode, PartialEq)]
-pub enum DisputeStatus {
- /// The dispute is active and unconcluded.
- #[codec(index = 0)]
- Active,
- /// The dispute has been concluded in favor of the candidate
- /// since the given timestamp.
- #[codec(index = 1)]
- ConcludedFor(Timestamp),
- /// The dispute has been concluded against the candidate
- /// since the given timestamp.
- ///
- /// This takes precedence over `ConcludedFor` in the case that
- /// both are true, which is impossible unless a large amount of
- /// validators are participating on both sides.
- #[codec(index = 2)]
- ConcludedAgainst(Timestamp),
- /// Dispute has been confirmed (more than `byzantine_threshold` have already participated/ or
- /// we have seen the candidate included already/participated successfully ourselves).
- #[codec(index = 3)]
- Confirmed,
-}
-
-impl DisputeStatus {
- /// Initialize the status to the active state.
- pub fn active() -> DisputeStatus {
- DisputeStatus::Active
- }
-
- /// Move status to confirmed status, if not yet concluded/confirmed already.
- pub fn confirm(self) -> DisputeStatus {
- match self {
- DisputeStatus::Active => DisputeStatus::Confirmed,
- DisputeStatus::Confirmed => DisputeStatus::Confirmed,
- DisputeStatus::ConcludedFor(_) | DisputeStatus::ConcludedAgainst(_) => self,
- }
- }
-
- /// Check whether the dispute is not a spam dispute.
- pub fn is_confirmed_concluded(&self) -> bool {
- match self {
- &DisputeStatus::Confirmed |
- &DisputeStatus::ConcludedFor(_) |
- DisputeStatus::ConcludedAgainst(_) => true,
- &DisputeStatus::Active => false,
- }
- }
-
- /// Transition the status to a new status after observing the dispute has concluded for the candidate.
- /// This may be a no-op if the status was already concluded.
- pub fn concluded_for(self, now: Timestamp) -> DisputeStatus {
- match self {
- DisputeStatus::Active | DisputeStatus::Confirmed => DisputeStatus::ConcludedFor(now),
- DisputeStatus::ConcludedFor(at) => DisputeStatus::ConcludedFor(std::cmp::min(at, now)),
- against => against,
- }
- }
-
- /// Transition the status to a new status after observing the dispute has concluded against the candidate.
- /// This may be a no-op if the status was already concluded.
- pub fn concluded_against(self, now: Timestamp) -> DisputeStatus {
- match self {
- DisputeStatus::Active | DisputeStatus::Confirmed =>
- DisputeStatus::ConcludedAgainst(now),
- DisputeStatus::ConcludedFor(at) =>
- DisputeStatus::ConcludedAgainst(std::cmp::min(at, now)),
- DisputeStatus::ConcludedAgainst(at) =>
- DisputeStatus::ConcludedAgainst(std::cmp::min(at, now)),
- }
- }
-
- /// Whether the disputed candidate is possibly invalid.
- pub fn is_possibly_invalid(&self) -> bool {
- match self {
- DisputeStatus::Active |
- DisputeStatus::Confirmed |
- DisputeStatus::ConcludedAgainst(_) => true,
- DisputeStatus::ConcludedFor(_) => false,
- }
- }
-
- /// Yields the timestamp this dispute concluded at, if any.
- pub fn concluded_at(&self) -> Option {
- match self {
- DisputeStatus::Active | DisputeStatus::Confirmed => None,
- DisputeStatus::ConcludedFor(at) | DisputeStatus::ConcludedAgainst(at) => Some(*at),
- }
- }
-}
-
/// Get active disputes as iterator, preserving its `DisputeStatus`.
pub fn get_active_with_status(
recent_disputes: impl Iterator
- ,
now: Timestamp,
) -> impl Iterator
- {
- recent_disputes.filter_map(move |(disputed, status)| {
- status
- .concluded_at()
- .filter(|at| *at + ACTIVE_DURATION_SECS < now)
- .map_or(Some((disputed, status)), |_| None)
- })
+ recent_disputes.filter(move |(_, status)| !dispute_is_inactive(status, &now))
}
pub trait Clock: Send + Sync {
diff --git a/node/core/dispute-coordinator/src/tests.rs b/node/core/dispute-coordinator/src/tests.rs
index 39fdc3a037e5..aaef00999259 100644
--- a/node/core/dispute-coordinator/src/tests.rs
+++ b/node/core/dispute-coordinator/src/tests.rs
@@ -49,6 +49,7 @@ use sp_keyring::Sr25519Keyring;
use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
use ::test_helpers::{dummy_candidate_receipt_bad_sig, dummy_digest, dummy_hash};
+use polkadot_node_primitives::{Timestamp, ACTIVE_DURATION_SECS};
use polkadot_node_subsystem::{
jaeger,
messages::{AllMessages, BlockDescription, RuntimeApiMessage, RuntimeApiRequest},
@@ -66,7 +67,7 @@ use crate::{
backend::Backend,
metrics::Metrics,
participation::{participation_full_happy_path, participation_missing_availability},
- status::{Clock, Timestamp, ACTIVE_DURATION_SECS},
+ status::Clock,
Config, DisputeCoordinatorSubsystem,
};
@@ -238,13 +239,15 @@ impl TestState {
)))
.await;
- self.handle_sync_queries(virtual_overseer, block_hash, session).await;
+ self.handle_sync_queries(virtual_overseer, block_hash, block_number, session)
+ .await;
}
async fn handle_sync_queries(
&mut self,
virtual_overseer: &mut VirtualOverseer,
block_hash: Hash,
+ block_number: BlockNumber,
session: SessionIndex,
) {
// Order of messages is not fixed (different on initializing):
@@ -277,11 +280,45 @@ impl TestState {
finished_steps.got_session_information = true;
assert_eq!(h, block_hash);
let _ = tx.send(Ok(session));
+
+ // Queries for fetching earliest unfinalized block session. See `RollingSessionWindow`.
+ assert_matches!(
+ overseer_recv(virtual_overseer).await,
+ AllMessages::ChainApi(ChainApiMessage::FinalizedBlockNumber(
+ s_tx,
+ )) => {
+ let _ = s_tx.send(Ok(block_number));
+ }
+ );
+
+ assert_matches!(
+ overseer_recv(virtual_overseer).await,
+ AllMessages::ChainApi(ChainApiMessage::FinalizedBlockHash(
+ number,
+ s_tx,
+ )) => {
+ assert_eq!(block_number, number);
+ let _ = s_tx.send(Ok(Some(block_hash)));
+ }
+ );
+
+ assert_matches!(
+ overseer_recv(virtual_overseer).await,
+ AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ h,
+ RuntimeApiRequest::SessionIndexForChild(s_tx),
+ )) => {
+ assert_eq!(h, block_hash);
+ let _ = s_tx.send(Ok(session));
+ }
+ );
+
// No queries, if subsystem knows about this session already.
if self.known_session == Some(session) {
continue
}
self.known_session = Some(session);
+
loop {
// answer session info queries until the current session is reached.
assert_matches!(
@@ -360,7 +397,8 @@ impl TestState {
)))
.await;
- self.handle_sync_queries(virtual_overseer, *leaf, session).await;
+ self.handle_sync_queries(virtual_overseer, *leaf, n as BlockNumber, session)
+ .await;
}
}
diff --git a/node/core/parachains-inherent/Cargo.toml b/node/core/parachains-inherent/Cargo.toml
index f46a8d47be87..615a87c058cb 100644
--- a/node/core/parachains-inherent/Cargo.toml
+++ b/node/core/parachains-inherent/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-core-parachains-inherent"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -9,9 +9,9 @@ futures = "0.3.21"
futures-timer = "3.0.2"
gum = { package = "tracing-gum", path = "../../gum" }
thiserror = "1.0.31"
-async-trait = "0.1.53"
+async-trait = "0.1.57"
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-primitives = { path = "../../../primitives" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
diff --git a/node/core/parachains-inherent/src/lib.rs b/node/core/parachains-inherent/src/lib.rs
index af14216749ff..e9441d21aefe 100644
--- a/node/core/parachains-inherent/src/lib.rs
+++ b/node/core/parachains-inherent/src/lib.rs
@@ -57,6 +57,11 @@ impl ParachainsInherentDataProvider {
) -> Result {
let pid = async {
let (sender, receiver) = futures::channel::oneshot::channel();
+ gum::trace!(
+ target: LOG_TARGET,
+ relay_parent = ?parent,
+ "Inherent data requested by Babe"
+ );
overseer.wait_for_activation(parent, sender).await;
receiver
.await
@@ -64,6 +69,11 @@ impl ParachainsInherentDataProvider {
.map_err(|e| Error::Subsystem(e))?;
let (sender, receiver) = futures::channel::oneshot::channel();
+ gum::trace!(
+ target: LOG_TARGET,
+ relay_parent = ?parent,
+ "Requesting inherent data (after having waited for activation)"
+ );
overseer
.send_msg(
ProvisionerMessage::RequestInherentData(parent, sender),
diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml
index bc8270412d88..fbaea19618f6 100644
--- a/node/core/provisioner/Cargo.toml
+++ b/node/core/provisioner/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-core-provisioner"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -13,15 +13,12 @@ polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
-futures-timer = "3.0.2"
rand = "0.8.5"
+futures-timer = "3.0.2"
fatality = "0.0.6"
[dev-dependencies]
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
-
-[features]
-staging-client = []
diff --git a/node/core/provisioner/src/disputes/mod.rs b/node/core/provisioner/src/disputes/mod.rs
new file mode 100644
index 000000000000..bd19e101bb2e
--- /dev/null
+++ b/node/core/provisioner/src/disputes/mod.rs
@@ -0,0 +1,53 @@
+// Copyright 2017-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 .
+
+//! The disputes module is responsible for selecting dispute votes to be sent with the inherent data. It contains two
+//! different implementations, extracted in two separate modules - `random_selection` and `prioritized_selection`. Which
+//! implementation will be executed depends on the version of the runtime. Runtime v2 supports `random_selection`. Runtime
+//! `v3` and above - `prioritized_selection`. The entrypoint to these implementations is the `select_disputes` function.
+//! `prioritized_selection` is considered superior and will be the default one in the future. Refer to the documentation of
+//! the modules for more details about each implementation.
+
+use crate::LOG_TARGET;
+use futures::channel::oneshot;
+use polkadot_node_primitives::CandidateVotes;
+use polkadot_node_subsystem::{messages::DisputeCoordinatorMessage, overseer};
+use polkadot_primitives::v2::{CandidateHash, SessionIndex};
+
+/// Request the relevant dispute statements for a set of disputes identified by `CandidateHash` and the `SessionIndex`.
+async fn request_votes(
+ sender: &mut impl overseer::ProvisionerSenderTrait,
+ disputes_to_query: Vec<(SessionIndex, CandidateHash)>,
+) -> Vec<(SessionIndex, CandidateHash, CandidateVotes)> {
+ let (tx, rx) = oneshot::channel();
+ // Bounded by block production - `ProvisionerMessage::RequestInherentData`.
+ sender.send_unbounded_message(DisputeCoordinatorMessage::QueryCandidateVotes(
+ disputes_to_query,
+ tx,
+ ));
+
+ match rx.await {
+ Ok(v) => v,
+ Err(oneshot::Canceled) => {
+ gum::warn!(target: LOG_TARGET, "Unable to query candidate votes");
+ Vec::new()
+ },
+ }
+}
+
+pub(crate) mod prioritized_selection;
+
+pub(crate) mod random_selection;
diff --git a/node/core/provisioner/src/disputes/prioritized_selection/mod.rs b/node/core/provisioner/src/disputes/prioritized_selection/mod.rs
new file mode 100644
index 000000000000..07426ef1a75b
--- /dev/null
+++ b/node/core/provisioner/src/disputes/prioritized_selection/mod.rs
@@ -0,0 +1,464 @@
+// Copyright 2017-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 .
+
+//! This module uses different approach for selecting dispute votes. It queries the Runtime
+//! about the votes already known onchain and tries to select only relevant votes. Refer to
+//! the documentation of `select_disputes` for more details about the actual implementation.
+
+use crate::{error::GetOnchainDisputesError, metrics, LOG_TARGET};
+use futures::channel::oneshot;
+use polkadot_node_primitives::{dispute_is_inactive, CandidateVotes, DisputeStatus, Timestamp};
+use polkadot_node_subsystem::{
+ errors::RuntimeApiError,
+ messages::{DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest},
+ overseer, ActivatedLeaf,
+};
+use polkadot_primitives::v2::{
+ supermajority_threshold, CandidateHash, DisputeState, DisputeStatement, DisputeStatementSet,
+ Hash, MultiDisputeStatementSet, SessionIndex, ValidatorIndex,
+};
+use std::{
+ collections::{BTreeMap, HashMap},
+ time::{SystemTime, UNIX_EPOCH},
+};
+
+#[cfg(test)]
+mod tests;
+
+/// The maximum number of disputes Provisioner will include in the inherent data.
+/// Serves as a protection not to flood the Runtime with excessive data.
+#[cfg(not(test))]
+pub const MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME: usize = 200_000;
+#[cfg(test)]
+pub const MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME: usize = 200;
+
+/// Controls how much dispute votes to be fetched from the `dispute-coordinator` per iteration in
+/// `fn vote_selection`. The purpose is to fetch the votes in batches until
+/// `MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME` is reached. If all votes are fetched in single call
+/// we might fetch votes which we never use. This will create unnecessary load on `dispute-coordinator`.
+///
+/// This value should be less than `MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME`. Increase it in case
+/// `provisioner` sends too many `QueryCandidateVotes` messages to `dispite-coordinator`.
+#[cfg(not(test))]
+const VOTES_SELECTION_BATCH_SIZE: usize = 1_100;
+#[cfg(test)]
+const VOTES_SELECTION_BATCH_SIZE: usize = 11;
+
+/// Implements the `select_disputes` function which selects dispute votes which should
+/// be sent to the Runtime.
+///
+/// # How the prioritization works
+///
+/// Generally speaking disputes can be described as:
+/// * Active vs Inactive
+/// * Known vs Unknown onchain
+/// * Offchain vs Onchain
+/// * Concluded onchain vs Unconcluded onchain
+///
+/// Provisioner fetches all disputes from `dispute-coordinator` and separates them in multiple partitions.
+/// Please refer to `struct PartitionedDisputes` for details about the actual partitions.
+/// Each partition has got a priority implicitly assigned to it and the disputes are selected based on this
+/// priority (e.g. disputes in partition 1, then if there is space - disputes from partition 2 and so on).
+///
+/// # Votes selection
+///
+/// Besides the prioritization described above the votes in each partition are filtered too. Provisioner
+/// fetches all onchain votes and filters them out from all partitions. As a result the Runtime receives
+/// only fresh votes (votes it didn't know about).
+///
+/// # How the onchain votes are fetched
+///
+/// The logic outlined above relies on `RuntimeApiRequest::Disputes` message from the Runtime. The user
+/// check the Runtime version before calling `select_disputes`. If the function is used with old runtime
+/// an error is logged and the logic will continue with empty onchain votes `HashMap`.
+pub async fn select_disputes(
+ sender: &mut Sender,
+ metrics: &metrics::Metrics,
+ leaf: &ActivatedLeaf,
+) -> MultiDisputeStatementSet
+where
+ Sender: overseer::ProvisionerSenderTrait,
+{
+ gum::trace!(
+ target: LOG_TARGET,
+ ?leaf,
+ "Selecting disputes for inherent data using prioritized selection"
+ );
+
+ // Fetch the onchain disputes. We'll do a prioritization based on them.
+ let onchain = match get_onchain_disputes(sender, leaf.hash.clone()).await {
+ Ok(r) => r,
+ Err(GetOnchainDisputesError::NotSupported(runtime_api_err, relay_parent)) => {
+ // Runtime version is checked before calling this method, so the error below should never happen!
+ gum::error!(
+ target: LOG_TARGET,
+ ?runtime_api_err,
+ ?relay_parent,
+ "Can't fetch onchain disputes, because ParachainHost runtime api version is old. Will continue with empty onchain disputes set.",
+ );
+ HashMap::new()
+ },
+ Err(GetOnchainDisputesError::Channel) => {
+ // This error usually means the node is shutting down. Log just in case.
+ gum::debug!(
+ target: LOG_TARGET,
+ "Channel error occurred while fetching onchain disputes. Will continue with empty onchain disputes set.",
+ );
+ HashMap::new()
+ },
+ Err(GetOnchainDisputesError::Execution(runtime_api_err, parent_hash)) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ ?runtime_api_err,
+ ?parent_hash,
+ "Unexpected execution error occurred while fetching onchain votes. Will continue with empty onchain disputes set.",
+ );
+ HashMap::new()
+ },
+ };
+
+ let recent_disputes = request_disputes(sender).await;
+ gum::trace!(
+ target: LOG_TARGET,
+ ?leaf,
+ "Got {} recent disputes and {} onchain disputes.",
+ recent_disputes.len(),
+ onchain.len(),
+ );
+
+ let partitioned = partition_recent_disputes(recent_disputes, &onchain);
+ metrics.on_partition_recent_disputes(&partitioned);
+
+ if partitioned.inactive_unknown_onchain.len() > 0 {
+ gum::warn!(
+ target: LOG_TARGET,
+ ?leaf,
+ "Got {} inactive unknown onchain disputes. This should not happen!",
+ partitioned.inactive_unknown_onchain.len()
+ );
+ }
+ let result = vote_selection(sender, partitioned, &onchain).await;
+
+ make_multi_dispute_statement_set(metrics, result)
+}
+
+/// Selects dispute votes from `PartitionedDisputes` which should be sent to the runtime. Votes which
+/// are already onchain are filtered out. Result should be sorted by `(SessionIndex, CandidateHash)`
+/// which is enforced by the `BTreeMap`. This is a requirement from the runtime.
+async fn vote_selection(
+ sender: &mut Sender,
+ partitioned: PartitionedDisputes,
+ onchain: &HashMap<(SessionIndex, CandidateHash), DisputeState>,
+) -> BTreeMap<(SessionIndex, CandidateHash), CandidateVotes>
+where
+ Sender: overseer::ProvisionerSenderTrait,
+{
+ // fetch in batches until there are enough votes
+ let mut disputes = partitioned.into_iter().collect::>();
+ let mut total_votes_len = 0;
+ let mut result = BTreeMap::new();
+ let mut request_votes_counter = 0;
+ while !disputes.is_empty() {
+ let batch_size = std::cmp::min(VOTES_SELECTION_BATCH_SIZE, disputes.len());
+ let batch = Vec::from_iter(disputes.drain(0..batch_size));
+
+ // Filter votes which are already onchain
+ request_votes_counter += 1;
+ let votes = super::request_votes(sender, batch)
+ .await
+ .into_iter()
+ .map(|(session_index, candidate_hash, mut votes)| {
+ let onchain_state =
+ if let Some(onchain_state) = onchain.get(&(session_index, candidate_hash)) {
+ onchain_state
+ } else {
+ // onchain knows nothing about this dispute - add all votes
+ return (session_index, candidate_hash, votes)
+ };
+
+ votes.valid.retain(|validator_idx, (statement_kind, _)| {
+ is_vote_worth_to_keep(
+ validator_idx,
+ DisputeStatement::Valid(*statement_kind),
+ &onchain_state,
+ )
+ });
+ votes.invalid.retain(|validator_idx, (statement_kind, _)| {
+ is_vote_worth_to_keep(
+ validator_idx,
+ DisputeStatement::Invalid(*statement_kind),
+ &onchain_state,
+ )
+ });
+ (session_index, candidate_hash, votes)
+ })
+ .collect::>();
+
+ // Check if votes are within the limit
+ for (session_index, candidate_hash, selected_votes) in votes {
+ let votes_len = selected_votes.valid.len() + selected_votes.invalid.len();
+ if votes_len + total_votes_len > MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME {
+ // we are done - no more votes can be added
+ return result
+ }
+ result.insert((session_index, candidate_hash), selected_votes);
+ total_votes_len += votes_len
+ }
+ }
+
+ gum::trace!(
+ target: LOG_TARGET,
+ ?request_votes_counter,
+ "vote_selection DisputeCoordinatorMessage::QueryCandidateVotes counter",
+ );
+
+ result
+}
+
+/// Contains disputes by partitions. Check the field comments for further details.
+#[derive(Default)]
+pub(crate) struct PartitionedDisputes {
+ /// Concluded and inactive disputes which are completely unknown for the Runtime.
+ /// Hopefully this should never happen.
+ /// Will be sent to the Runtime with FIRST priority.
+ pub inactive_unknown_onchain: Vec<(SessionIndex, CandidateHash)>,
+ /// Disputes which are INACTIVE locally but they are unconcluded for the Runtime.
+ /// A dispute can have enough local vote to conclude and at the same time the
+ /// Runtime knows nothing about them at treats it as unconcluded. This discrepancy
+ /// should be treated with high priority.
+ /// Will be sent to the Runtime with SECOND priority.
+ pub inactive_unconcluded_onchain: Vec<(SessionIndex, CandidateHash)>,
+ /// Active disputes completely unknown onchain.
+ /// Will be sent to the Runtime with THIRD priority.
+ pub active_unknown_onchain: Vec<(SessionIndex, CandidateHash)>,
+ /// Active disputes unconcluded onchain.
+ /// Will be sent to the Runtime with FOURTH priority.
+ pub active_unconcluded_onchain: Vec<(SessionIndex, CandidateHash)>,
+ /// Active disputes concluded onchain. New votes are not that important for
+ /// this partition.
+ /// Will be sent to the Runtime with FIFTH priority.
+ pub active_concluded_onchain: Vec<(SessionIndex, CandidateHash)>,
+ /// Inactive disputes which has concluded onchain. These are not interesting and
+ /// won't be sent to the Runtime.
+ /// Will be DROPPED
+ pub inactive_concluded_onchain: Vec<(SessionIndex, CandidateHash)>,
+}
+
+impl PartitionedDisputes {
+ fn new() -> PartitionedDisputes {
+ Default::default()
+ }
+
+ fn into_iter(self) -> impl Iterator
- {
+ self.inactive_unknown_onchain
+ .into_iter()
+ .chain(self.inactive_unconcluded_onchain.into_iter())
+ .chain(self.active_unknown_onchain.into_iter())
+ .chain(self.active_unconcluded_onchain.into_iter())
+ .chain(self.active_concluded_onchain.into_iter())
+ // inactive_concluded_onchain is dropped on purpose
+ }
+}
+
+fn secs_since_epoch() -> Timestamp {
+ match SystemTime::now().duration_since(UNIX_EPOCH) {
+ Ok(d) => d.as_secs(),
+ Err(e) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ err = ?e,
+ "Error getting system time."
+ );
+ 0
+ },
+ }
+}
+
+fn concluded_onchain(onchain_state: &DisputeState) -> bool {
+ // Check if there are enough onchain votes for or against to conclude the dispute
+ let supermajority = supermajority_threshold(onchain_state.validators_for.len());
+
+ onchain_state.validators_for.count_ones() >= supermajority ||
+ onchain_state.validators_against.count_ones() >= supermajority
+}
+
+fn partition_recent_disputes(
+ recent: Vec<(SessionIndex, CandidateHash, DisputeStatus)>,
+ onchain: &HashMap<(SessionIndex, CandidateHash), DisputeState>,
+) -> PartitionedDisputes {
+ let mut partitioned = PartitionedDisputes::new();
+
+ // Drop any duplicates
+ let unique_recent = recent
+ .into_iter()
+ .map(|(session_index, candidate_hash, dispute_state)| {
+ ((session_index, candidate_hash), dispute_state)
+ })
+ .collect::>();
+
+ // Split recent disputes in ACTIVE and INACTIVE
+ let time_now = &secs_since_epoch();
+ let (active, inactive): (
+ Vec<(SessionIndex, CandidateHash, DisputeStatus)>,
+ Vec<(SessionIndex, CandidateHash, DisputeStatus)>,
+ ) = unique_recent
+ .into_iter()
+ .map(|((session_index, candidate_hash), dispute_state)| {
+ (session_index, candidate_hash, dispute_state)
+ })
+ .partition(|(_, _, status)| !dispute_is_inactive(status, time_now));
+
+ // Split ACTIVE in three groups...
+ for (session_index, candidate_hash, _) in active {
+ match onchain.get(&(session_index, candidate_hash)) {
+ Some(d) => match concluded_onchain(d) {
+ true => partitioned.active_concluded_onchain.push((session_index, candidate_hash)),
+ false =>
+ partitioned.active_unconcluded_onchain.push((session_index, candidate_hash)),
+ },
+ None => partitioned.active_unknown_onchain.push((session_index, candidate_hash)),
+ };
+ }
+
+ // ... and INACTIVE in three more
+ for (session_index, candidate_hash, _) in inactive {
+ match onchain.get(&(session_index, candidate_hash)) {
+ Some(onchain_state) =>
+ if concluded_onchain(onchain_state) {
+ partitioned.inactive_concluded_onchain.push((session_index, candidate_hash));
+ } else {
+ partitioned.inactive_unconcluded_onchain.push((session_index, candidate_hash));
+ },
+ None => partitioned.inactive_unknown_onchain.push((session_index, candidate_hash)),
+ }
+ }
+
+ partitioned
+}
+
+/// Determines if a vote is worth to be kept, based on the onchain disputes
+fn is_vote_worth_to_keep(
+ validator_index: &ValidatorIndex,
+ dispute_statement: DisputeStatement,
+ onchain_state: &DisputeState,
+) -> bool {
+ let offchain_vote = match dispute_statement {
+ DisputeStatement::Valid(_) => true,
+ DisputeStatement::Invalid(_) => false,
+ };
+ let in_validators_for = onchain_state
+ .validators_for
+ .get(validator_index.0 as usize)
+ .as_deref()
+ .copied()
+ .unwrap_or(false);
+ let in_validators_against = onchain_state
+ .validators_against
+ .get(validator_index.0 as usize)
+ .as_deref()
+ .copied()
+ .unwrap_or(false);
+
+ if in_validators_for && in_validators_against {
+ // The validator has double voted and runtime knows about this. Ignore this vote.
+ return false
+ }
+
+ if offchain_vote && in_validators_against || !offchain_vote && in_validators_for {
+ // offchain vote differs from the onchain vote
+ // we need this vote to punish the offending validator
+ return true
+ }
+
+ // The vote is valid. Return true if it is not seen onchain.
+ !in_validators_for && !in_validators_against
+}
+
+/// Request disputes identified by `CandidateHash` and the `SessionIndex`.
+async fn request_disputes(
+ sender: &mut impl overseer::ProvisionerSenderTrait,
+) -> Vec<(SessionIndex, CandidateHash, DisputeStatus)> {
+ let (tx, rx) = oneshot::channel();
+ let msg = DisputeCoordinatorMessage::RecentDisputes(tx);
+
+ // Bounded by block production - `ProvisionerMessage::RequestInherentData`.
+ sender.send_unbounded_message(msg);
+
+ let recent_disputes = rx.await.unwrap_or_else(|err| {
+ gum::warn!(target: LOG_TARGET, err=?err, "Unable to gather recent disputes");
+ Vec::new()
+ });
+ recent_disputes
+}
+
+// This function produces the return value for `pub fn select_disputes()`
+fn make_multi_dispute_statement_set(
+ metrics: &metrics::Metrics,
+ dispute_candidate_votes: BTreeMap<(SessionIndex, CandidateHash), CandidateVotes>,
+) -> MultiDisputeStatementSet {
+ // Transform all `CandidateVotes` into `MultiDisputeStatementSet`.
+ dispute_candidate_votes
+ .into_iter()
+ .map(|((session_index, candidate_hash), votes)| {
+ let valid_statements = votes
+ .valid
+ .into_iter()
+ .map(|(i, (s, sig))| (DisputeStatement::Valid(s), i, sig));
+
+ let invalid_statements = votes
+ .invalid
+ .into_iter()
+ .map(|(i, (s, sig))| (DisputeStatement::Invalid(s), i, sig));
+
+ metrics.inc_valid_statements_by(valid_statements.len());
+ metrics.inc_invalid_statements_by(invalid_statements.len());
+ metrics.inc_dispute_statement_sets_by(1);
+
+ DisputeStatementSet {
+ candidate_hash,
+ session: session_index,
+ statements: valid_statements.chain(invalid_statements).collect(),
+ }
+ })
+ .collect()
+}
+
+/// Gets the on-chain disputes at a given block number and returns them as a `HashMap` so that searching in them is cheap.
+pub async fn get_onchain_disputes(
+ sender: &mut Sender,
+ relay_parent: Hash,
+) -> Result, GetOnchainDisputesError>
+where
+ Sender: overseer::ProvisionerSenderTrait,
+{
+ gum::trace!(target: LOG_TARGET, ?relay_parent, "Fetching on-chain disputes");
+ let (tx, rx) = oneshot::channel();
+ sender
+ .send_message(RuntimeApiMessage::Request(relay_parent, RuntimeApiRequest::Disputes(tx)))
+ .await;
+
+ rx.await
+ .map_err(|_| GetOnchainDisputesError::Channel)
+ .and_then(|res| {
+ res.map_err(|e| match e {
+ RuntimeApiError::Execution { .. } =>
+ GetOnchainDisputesError::Execution(e, relay_parent),
+ RuntimeApiError::NotSupported { .. } =>
+ GetOnchainDisputesError::NotSupported(e, relay_parent),
+ })
+ })
+ .map(|v| v.into_iter().map(|e| ((e.0, e.1), e.2)).collect())
+}
diff --git a/node/core/provisioner/src/disputes/prioritized_selection/tests.rs b/node/core/provisioner/src/disputes/prioritized_selection/tests.rs
new file mode 100644
index 000000000000..f76107dc65d4
--- /dev/null
+++ b/node/core/provisioner/src/disputes/prioritized_selection/tests.rs
@@ -0,0 +1,722 @@
+// Copyright 2017-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 .
+
+use super::super::{
+ super::{tests::common::test_harness, *},
+ prioritized_selection::*,
+};
+use bitvec::prelude::*;
+use futures::channel::mpsc;
+use polkadot_node_primitives::{CandidateVotes, DisputeStatus, ACTIVE_DURATION_SECS};
+use polkadot_node_subsystem::messages::{
+ AllMessages, DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest,
+};
+use polkadot_node_subsystem_test_helpers::TestSubsystemSender;
+use polkadot_primitives::v2::{
+ CandidateHash, DisputeState, InvalidDisputeStatementKind, SessionIndex,
+ ValidDisputeStatementKind, ValidatorSignature,
+};
+use std::sync::Arc;
+use test_helpers;
+
+//
+// Unit tests for various functions
+//
+#[test]
+fn should_keep_vote_behaves() {
+ let onchain_state = DisputeState {
+ validators_for: bitvec![u8, Lsb0; 1, 0, 1, 0, 1],
+ validators_against: bitvec![u8, Lsb0; 0, 1, 0, 0, 1],
+ start: 1,
+ concluded_at: None,
+ };
+
+ let local_valid_known = (ValidatorIndex(0), ValidDisputeStatementKind::Explicit);
+ let local_valid_unknown = (ValidatorIndex(3), ValidDisputeStatementKind::Explicit);
+
+ let local_invalid_known = (ValidatorIndex(1), InvalidDisputeStatementKind::Explicit);
+ let local_invalid_unknown = (ValidatorIndex(3), InvalidDisputeStatementKind::Explicit);
+
+ assert_eq!(
+ is_vote_worth_to_keep(
+ &local_valid_known.0,
+ DisputeStatement::Valid(local_valid_known.1),
+ &onchain_state
+ ),
+ false
+ );
+ assert_eq!(
+ is_vote_worth_to_keep(
+ &local_valid_unknown.0,
+ DisputeStatement::Valid(local_valid_unknown.1),
+ &onchain_state
+ ),
+ true
+ );
+ assert_eq!(
+ is_vote_worth_to_keep(
+ &local_invalid_known.0,
+ DisputeStatement::Invalid(local_invalid_known.1),
+ &onchain_state
+ ),
+ false
+ );
+ assert_eq!(
+ is_vote_worth_to_keep(
+ &local_invalid_unknown.0,
+ DisputeStatement::Invalid(local_invalid_unknown.1),
+ &onchain_state
+ ),
+ true
+ );
+
+ //double voting - onchain knows
+ let local_double_vote_onchain_knows =
+ (ValidatorIndex(4), InvalidDisputeStatementKind::Explicit);
+ assert_eq!(
+ is_vote_worth_to_keep(
+ &local_double_vote_onchain_knows.0,
+ DisputeStatement::Invalid(local_double_vote_onchain_knows.1),
+ &onchain_state
+ ),
+ false
+ );
+
+ //double voting - onchain doesn't know
+ let local_double_vote_onchain_doesnt_knows =
+ (ValidatorIndex(0), InvalidDisputeStatementKind::Explicit);
+ assert_eq!(
+ is_vote_worth_to_keep(
+ &local_double_vote_onchain_doesnt_knows.0,
+ DisputeStatement::Invalid(local_double_vote_onchain_doesnt_knows.1),
+ &onchain_state
+ ),
+ true
+ );
+
+ // empty onchain state
+ let empty_onchain_state = DisputeState {
+ validators_for: BitVec::new(),
+ validators_against: BitVec::new(),
+ start: 1,
+ concluded_at: None,
+ };
+ assert_eq!(
+ is_vote_worth_to_keep(
+ &local_double_vote_onchain_doesnt_knows.0,
+ DisputeStatement::Invalid(local_double_vote_onchain_doesnt_knows.1),
+ &empty_onchain_state
+ ),
+ true
+ );
+}
+
+#[test]
+fn partitioning_happy_case() {
+ let mut input = Vec::<(SessionIndex, CandidateHash, DisputeStatus)>::new();
+ let mut onchain = HashMap::<(u32, CandidateHash), DisputeState>::new();
+ let time_now = secs_since_epoch();
+
+ // Create one dispute for each partition
+ let inactive_unknown_onchain = (
+ 0,
+ CandidateHash(Hash::random()),
+ DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
+ );
+ input.push(inactive_unknown_onchain.clone());
+
+ let inactive_unconcluded_onchain = (
+ 1,
+ CandidateHash(Hash::random()),
+ DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
+ );
+ input.push(inactive_unconcluded_onchain.clone());
+ onchain.insert(
+ (inactive_unconcluded_onchain.0, inactive_unconcluded_onchain.1.clone()),
+ DisputeState {
+ validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
+ validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ start: 1,
+ concluded_at: None,
+ },
+ );
+
+ let active_unknown_onchain = (2, CandidateHash(Hash::random()), DisputeStatus::Active);
+ input.push(active_unknown_onchain.clone());
+
+ let active_unconcluded_onchain = (3, CandidateHash(Hash::random()), DisputeStatus::Active);
+ input.push(active_unconcluded_onchain.clone());
+ onchain.insert(
+ (active_unconcluded_onchain.0, active_unconcluded_onchain.1.clone()),
+ DisputeState {
+ validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
+ validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ start: 1,
+ concluded_at: None,
+ },
+ );
+
+ let active_concluded_onchain = (4, CandidateHash(Hash::random()), DisputeStatus::Active);
+ input.push(active_concluded_onchain.clone());
+ onchain.insert(
+ (active_concluded_onchain.0, active_concluded_onchain.1.clone()),
+ DisputeState {
+ validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 1, 0],
+ validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ start: 1,
+ concluded_at: Some(3),
+ },
+ );
+
+ let inactive_concluded_onchain = (
+ 5,
+ CandidateHash(Hash::random()),
+ DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
+ );
+ input.push(inactive_concluded_onchain.clone());
+ onchain.insert(
+ (inactive_concluded_onchain.0, inactive_concluded_onchain.1.clone()),
+ DisputeState {
+ validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 0, 0],
+ validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ start: 1,
+ concluded_at: Some(3),
+ },
+ );
+
+ let result = partition_recent_disputes(input, &onchain);
+
+ // Check results
+ assert_eq!(result.inactive_unknown_onchain.len(), 1);
+ assert_eq!(
+ result.inactive_unknown_onchain.get(0).unwrap(),
+ &(inactive_unknown_onchain.0, inactive_unknown_onchain.1)
+ );
+
+ assert_eq!(result.inactive_unconcluded_onchain.len(), 1);
+ assert_eq!(
+ result.inactive_unconcluded_onchain.get(0).unwrap(),
+ &(inactive_unconcluded_onchain.0, inactive_unconcluded_onchain.1)
+ );
+
+ assert_eq!(result.active_unknown_onchain.len(), 1);
+ assert_eq!(
+ result.active_unknown_onchain.get(0).unwrap(),
+ &(active_unknown_onchain.0, active_unknown_onchain.1)
+ );
+
+ assert_eq!(result.active_unconcluded_onchain.len(), 1);
+ assert_eq!(
+ result.active_unconcluded_onchain.get(0).unwrap(),
+ &(active_unconcluded_onchain.0, active_unconcluded_onchain.1)
+ );
+
+ assert_eq!(result.active_concluded_onchain.len(), 1);
+ assert_eq!(
+ result.active_concluded_onchain.get(0).unwrap(),
+ &(active_concluded_onchain.0, active_concluded_onchain.1)
+ );
+
+ assert_eq!(result.inactive_concluded_onchain.len(), 1);
+ assert_eq!(
+ result.inactive_concluded_onchain.get(0).unwrap(),
+ &(inactive_concluded_onchain.0, inactive_concluded_onchain.1)
+ );
+}
+
+// This test verifies the double voting behavior. Currently we don't care if a supermajority is achieved with or
+// without the 'help' of a double vote (a validator voting for and against at the same time). This makes the test
+// a bit pointless but anyway I'm leaving it here to make this decision explicit and have the test code ready in
+// case this behavior needs to be further tested in the future.
+// Link to the PR with the discussions: https://github.com/paritytech/polkadot/pull/5567
+#[test]
+fn partitioning_doubled_onchain_vote() {
+ let mut input = Vec::<(SessionIndex, CandidateHash, DisputeStatus)>::new();
+ let mut onchain = HashMap::<(u32, CandidateHash), DisputeState>::new();
+
+ // Dispute A relies on a 'double onchain vote' to conclude. Validator with index 0 has voted both `for` and `against`.
+ // Despite that this dispute should be considered 'can conclude onchain'.
+ let dispute_a = (3, CandidateHash(Hash::random()), DisputeStatus::Active);
+ // Dispute B has supermajority + 1 votes, so the doubled onchain vote doesn't affect it. It should be considered
+ // as 'can conclude onchain'.
+ let dispute_b = (4, CandidateHash(Hash::random()), DisputeStatus::Active);
+ input.push(dispute_a.clone());
+ input.push(dispute_b.clone());
+ onchain.insert(
+ (dispute_a.0, dispute_a.1.clone()),
+ DisputeState {
+ validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 0, 0],
+ validators_against: bitvec![u8, Lsb0; 1, 0, 0, 0, 0, 0, 0, 0, 0],
+ start: 1,
+ concluded_at: None,
+ },
+ );
+ onchain.insert(
+ (dispute_b.0, dispute_b.1.clone()),
+ DisputeState {
+ validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 1, 0],
+ validators_against: bitvec![u8, Lsb0; 1, 0, 0, 0, 0, 0, 0, 0, 0],
+ start: 1,
+ concluded_at: None,
+ },
+ );
+
+ let result = partition_recent_disputes(input, &onchain);
+
+ assert_eq!(result.active_unconcluded_onchain.len(), 0);
+ assert_eq!(result.active_concluded_onchain.len(), 2);
+}
+
+#[test]
+fn partitioning_duplicated_dispute() {
+ let mut input = Vec::<(SessionIndex, CandidateHash, DisputeStatus)>::new();
+ let mut onchain = HashMap::<(u32, CandidateHash), DisputeState>::new();
+
+ let some_dispute = (3, CandidateHash(Hash::random()), DisputeStatus::Active);
+ input.push(some_dispute.clone());
+ input.push(some_dispute.clone());
+ onchain.insert(
+ (some_dispute.0, some_dispute.1.clone()),
+ DisputeState {
+ validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
+ validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ start: 1,
+ concluded_at: None,
+ },
+ );
+
+ let result = partition_recent_disputes(input, &onchain);
+
+ assert_eq!(result.active_unconcluded_onchain.len(), 1);
+ assert_eq!(
+ result.active_unconcluded_onchain.get(0).unwrap(),
+ &(some_dispute.0, some_dispute.1)
+ );
+}
+
+//
+// end-to-end tests for select_disputes()
+//
+
+async fn mock_overseer(
+ mut receiver: mpsc::UnboundedReceiver,
+ disputes_db: &mut TestDisputes,
+ vote_queries_count: &mut usize,
+) {
+ while let Some(from_job) = receiver.next().await {
+ match from_job {
+ AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+ _,
+ RuntimeApiRequest::Disputes(sender),
+ )) => {
+ let _ = sender.send(Ok(disputes_db
+ .onchain_disputes
+ .clone()
+ .into_iter()
+ .map(|(k, v)| (k.0, k.1, v))
+ .collect::>()));
+ },
+ AllMessages::RuntimeApi(_) => panic!("Unexpected RuntimeApi request"),
+ AllMessages::DisputeCoordinator(DisputeCoordinatorMessage::RecentDisputes(sender)) => {
+ let _ = sender.send(disputes_db.local_disputes.clone());
+ },
+ AllMessages::DisputeCoordinator(DisputeCoordinatorMessage::QueryCandidateVotes(
+ disputes,
+ sender,
+ )) => {
+ *vote_queries_count += 1;
+ let mut res = Vec::new();
+ for d in disputes.iter() {
+ let v = disputes_db.votes_db.get(d).unwrap().clone();
+ res.push((d.0, d.1, v));
+ }
+
+ let _ = sender.send(res);
+ },
+ _ => panic!("Unexpected message: {:?}", from_job),
+ }
+ }
+}
+
+fn leaf() -> ActivatedLeaf {
+ ActivatedLeaf {
+ hash: Hash::repeat_byte(0xAA),
+ number: 0xAA,
+ status: LeafStatus::Fresh,
+ span: Arc::new(jaeger::Span::Disabled),
+ }
+}
+
+struct TestDisputes {
+ pub local_disputes: Vec<(SessionIndex, CandidateHash, DisputeStatus)>,
+ pub votes_db: HashMap<(SessionIndex, CandidateHash), CandidateVotes>,
+ pub onchain_disputes: HashMap<(u32, CandidateHash), DisputeState>,
+ validators_count: usize,
+}
+
+impl TestDisputes {
+ pub fn new(validators_count: usize) -> TestDisputes {
+ TestDisputes {
+ local_disputes: Vec::<(SessionIndex, CandidateHash, DisputeStatus)>::new(),
+ votes_db: HashMap::<(SessionIndex, CandidateHash), CandidateVotes>::new(),
+ onchain_disputes: HashMap::<(u32, CandidateHash), DisputeState>::new(),
+ validators_count,
+ }
+ }
+
+ // Offchain disputes are on node side
+ fn add_offchain_dispute(
+ &mut self,
+ dispute: (SessionIndex, CandidateHash, DisputeStatus),
+ local_votes_count: usize,
+ dummy_receipt: CandidateReceipt,
+ ) {
+ self.local_disputes.push(dispute.clone());
+ self.votes_db.insert(
+ (dispute.0, dispute.1),
+ CandidateVotes {
+ candidate_receipt: dummy_receipt,
+ valid: TestDisputes::generate_local_votes(
+ ValidDisputeStatementKind::Explicit,
+ 0,
+ local_votes_count,
+ ),
+ invalid: BTreeMap::new(),
+ },
+ );
+ }
+
+ fn add_onchain_dispute(
+ &mut self,
+ dispute: (SessionIndex, CandidateHash, DisputeStatus),
+ onchain_votes_count: usize,
+ ) {
+ let concluded_at = match dispute.2 {
+ DisputeStatus::Active | DisputeStatus::Confirmed => None,
+ DisputeStatus::ConcludedAgainst(_) | DisputeStatus::ConcludedFor(_) => Some(1),
+ };
+ self.onchain_disputes.insert(
+ (dispute.0, dispute.1.clone()),
+ DisputeState {
+ validators_for: TestDisputes::generate_bitvec(
+ self.validators_count,
+ 0,
+ onchain_votes_count,
+ ),
+ validators_against: bitvec![u8, Lsb0; 0; self.validators_count],
+ start: 1,
+ concluded_at,
+ },
+ );
+ }
+
+ pub fn add_unconfirmed_disputes_concluded_onchain(
+ &mut self,
+ dispute_count: usize,
+ ) -> (u32, usize) {
+ let local_votes_count = self.validators_count * 90 / 100;
+ let onchain_votes_count = self.validators_count * 80 / 100;
+ let session_idx = 0;
+ let lf = leaf();
+ let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
+ for _ in 0..dispute_count {
+ let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
+ self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
+ self.add_onchain_dispute(d, onchain_votes_count);
+ }
+
+ (session_idx, (local_votes_count - onchain_votes_count) * dispute_count)
+ }
+
+ pub fn add_unconfirmed_disputes_unconcluded_onchain(
+ &mut self,
+ dispute_count: usize,
+ ) -> (u32, usize) {
+ let local_votes_count = self.validators_count * 90 / 100;
+ let onchain_votes_count = self.validators_count * 40 / 100;
+ let session_idx = 1;
+ let lf = leaf();
+ let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
+ for _ in 0..dispute_count {
+ let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
+ self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
+ self.add_onchain_dispute(d, onchain_votes_count);
+ }
+
+ (session_idx, (local_votes_count - onchain_votes_count) * dispute_count)
+ }
+
+ pub fn add_unconfirmed_disputes_unknown_onchain(
+ &mut self,
+ dispute_count: usize,
+ ) -> (u32, usize) {
+ let local_votes_count = self.validators_count * 90 / 100;
+ let session_idx = 2;
+ let lf = leaf();
+ let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
+ for _ in 0..dispute_count {
+ let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
+ self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
+ }
+ (session_idx, local_votes_count * dispute_count)
+ }
+
+ pub fn add_concluded_disputes_known_onchain(&mut self, dispute_count: usize) -> (u32, usize) {
+ let local_votes_count = self.validators_count * 90 / 100;
+ let onchain_votes_count = self.validators_count * 75 / 100;
+ let session_idx = 3;
+ let lf = leaf();
+ let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
+ for _ in 0..dispute_count {
+ let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::ConcludedFor(0));
+ self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
+ self.add_onchain_dispute(d, onchain_votes_count);
+ }
+ (session_idx, (local_votes_count - onchain_votes_count) * dispute_count)
+ }
+
+ pub fn add_concluded_disputes_unknown_onchain(&mut self, dispute_count: usize) -> (u32, usize) {
+ let local_votes_count = self.validators_count * 90 / 100;
+ let session_idx = 4;
+ let lf = leaf();
+ let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
+ for _ in 0..dispute_count {
+ let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::ConcludedFor(0));
+ self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
+ }
+ (session_idx, local_votes_count * dispute_count)
+ }
+
+ fn generate_local_votes(
+ statement_kind: T,
+ start_idx: usize,
+ count: usize,
+ ) -> BTreeMap {
+ assert!(start_idx < count);
+ (start_idx..count)
+ .map(|idx| {
+ (
+ ValidatorIndex(idx as u32),
+ (statement_kind.clone(), test_helpers::dummy_signature()),
+ )
+ })
+ .collect::>()
+ }
+
+ fn generate_bitvec(
+ validator_count: usize,
+ start_idx: usize,
+ count: usize,
+ ) -> BitVec {
+ assert!(start_idx < count);
+ assert!(start_idx + count < validator_count);
+ let mut res = bitvec![u8, Lsb0; 0; validator_count];
+ for idx in start_idx..count {
+ res.set(idx, true);
+ }
+
+ res
+ }
+}
+
+#[test]
+fn normal_flow() {
+ const VALIDATOR_COUNT: usize = 10;
+ const DISPUTES_PER_BATCH: usize = 2;
+ const ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT: usize = 1;
+
+ let mut input = TestDisputes::new(VALIDATOR_COUNT);
+
+ // active, concluded onchain
+ let (third_idx, third_votes) =
+ input.add_unconfirmed_disputes_concluded_onchain(DISPUTES_PER_BATCH);
+
+ // active unconcluded onchain
+ let (first_idx, first_votes) =
+ input.add_unconfirmed_disputes_unconcluded_onchain(DISPUTES_PER_BATCH);
+
+ //concluded disputes unknown onchain
+ let (fifth_idx, fifth_votes) = input.add_concluded_disputes_unknown_onchain(DISPUTES_PER_BATCH);
+
+ // concluded disputes known onchain - these should be ignored
+ let (_, _) = input.add_concluded_disputes_known_onchain(DISPUTES_PER_BATCH);
+
+ // active disputes unknown onchain
+ let (second_idx, second_votes) =
+ input.add_unconfirmed_disputes_unknown_onchain(DISPUTES_PER_BATCH);
+
+ let metrics = metrics::Metrics::new_dummy();
+ let mut vote_queries: usize = 0;
+ test_harness(
+ |r| mock_overseer(r, &mut input, &mut vote_queries),
+ |mut tx: TestSubsystemSender| async move {
+ let lf = leaf();
+ let result = select_disputes(&mut tx, &metrics, &lf).await;
+
+ assert!(!result.is_empty());
+
+ assert_eq!(result.len(), 4 * DISPUTES_PER_BATCH);
+
+ // Naive checks that the result is partitioned correctly
+ let (first_batch, rest): (Vec, Vec) =
+ result.into_iter().partition(|d| d.session == first_idx);
+ assert_eq!(first_batch.len(), DISPUTES_PER_BATCH);
+
+ let (second_batch, rest): (Vec, Vec) =
+ rest.into_iter().partition(|d| d.session == second_idx);
+ assert_eq!(second_batch.len(), DISPUTES_PER_BATCH);
+
+ let (third_batch, rest): (Vec, Vec) =
+ rest.into_iter().partition(|d| d.session == third_idx);
+ assert_eq!(third_batch.len(), DISPUTES_PER_BATCH);
+
+ let (fifth_batch, rest): (Vec, Vec) =
+ rest.into_iter().partition(|d| d.session == fifth_idx);
+ assert_eq!(fifth_batch.len(), DISPUTES_PER_BATCH);
+
+ // Ensure there are no more disputes - fourth_batch should be dropped
+ assert_eq!(rest.len(), 0);
+
+ assert_eq!(
+ first_batch.iter().map(|d| d.statements.len()).fold(0, |acc, v| acc + v),
+ first_votes
+ );
+ assert_eq!(
+ second_batch.iter().map(|d| d.statements.len()).fold(0, |acc, v| acc + v),
+ second_votes
+ );
+ assert_eq!(
+ third_batch.iter().map(|d| d.statements.len()).fold(0, |acc, v| acc + v),
+ third_votes
+ );
+ assert_eq!(
+ fifth_batch.iter().map(|d| d.statements.len()).fold(0, |acc, v| acc + v),
+ fifth_votes
+ );
+ },
+ );
+ assert!(vote_queries <= ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT);
+}
+
+#[test]
+fn many_batches() {
+ const VALIDATOR_COUNT: usize = 10;
+ const DISPUTES_PER_PARTITION: usize = 10;
+
+ // 10 disputes per partition * 4 partitions = 40 disputes
+ // BATCH_SIZE = 11
+ // => There should be no more than 40 / 11 queries ( ~4 )
+ const ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT: usize = 4;
+
+ let mut input = TestDisputes::new(VALIDATOR_COUNT);
+
+ // active which can conclude onchain
+ input.add_unconfirmed_disputes_concluded_onchain(DISPUTES_PER_PARTITION);
+
+ // active which can't conclude onchain
+ input.add_unconfirmed_disputes_unconcluded_onchain(DISPUTES_PER_PARTITION);
+
+ //concluded disputes unknown onchain
+ input.add_concluded_disputes_unknown_onchain(DISPUTES_PER_PARTITION);
+
+ // concluded disputes known onchain
+ input.add_concluded_disputes_known_onchain(DISPUTES_PER_PARTITION);
+
+ // active disputes unknown onchain
+ input.add_unconfirmed_disputes_unknown_onchain(DISPUTES_PER_PARTITION);
+
+ let metrics = metrics::Metrics::new_dummy();
+ let mut vote_queries: usize = 0;
+ test_harness(
+ |r| mock_overseer(r, &mut input, &mut vote_queries),
+ |mut tx: TestSubsystemSender| async move {
+ let lf = leaf();
+ let result = select_disputes(&mut tx, &metrics, &lf).await;
+
+ assert!(!result.is_empty());
+
+ let vote_count = result.iter().map(|d| d.statements.len()).fold(0, |acc, v| acc + v);
+
+ assert!(
+ MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME - VALIDATOR_COUNT <= vote_count &&
+ vote_count <= MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME,
+ "vote_count: {}",
+ vote_count
+ );
+ },
+ );
+
+ assert!(
+ vote_queries <= ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT,
+ "vote_queries: {} ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT: {}",
+ vote_queries,
+ ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT
+ );
+}
+
+#[test]
+fn votes_above_limit() {
+ const VALIDATOR_COUNT: usize = 10;
+ const DISPUTES_PER_PARTITION: usize = 50;
+ const ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT: usize = 4;
+
+ let mut input = TestDisputes::new(VALIDATOR_COUNT);
+
+ // active which can conclude onchain
+ let (_, second_votes) =
+ input.add_unconfirmed_disputes_concluded_onchain(DISPUTES_PER_PARTITION);
+
+ // active which can't conclude onchain
+ let (_, first_votes) =
+ input.add_unconfirmed_disputes_unconcluded_onchain(DISPUTES_PER_PARTITION);
+
+ //concluded disputes unknown onchain
+ let (_, third_votes) = input.add_concluded_disputes_unknown_onchain(DISPUTES_PER_PARTITION);
+
+ assert!(
+ first_votes + second_votes + third_votes > 3 * MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME,
+ "Total relevant votes generated: {}",
+ first_votes + second_votes + third_votes
+ );
+
+ let metrics = metrics::Metrics::new_dummy();
+ let mut vote_queries: usize = 0;
+ test_harness(
+ |r| mock_overseer(r, &mut input, &mut vote_queries),
+ |mut tx: TestSubsystemSender| async move {
+ let lf = leaf();
+ let result = select_disputes(&mut tx, &metrics, &lf).await;
+
+ assert!(!result.is_empty());
+
+ let vote_count = result.iter().map(|d| d.statements.len()).fold(0, |acc, v| acc + v);
+
+ assert!(
+ MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME - VALIDATOR_COUNT <= vote_count &&
+ vote_count <= MAX_DISPUTE_VOTES_FORWARDED_TO_RUNTIME,
+ "vote_count: {}",
+ vote_count
+ );
+ },
+ );
+
+ assert!(
+ vote_queries <= ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT,
+ "vote_queries: {} ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT: {}",
+ vote_queries,
+ ACCEPTABLE_RUNTIME_VOTES_QUERIES_COUNT
+ );
+}
diff --git a/node/core/provisioner/src/disputes/random_selection/mod.rs b/node/core/provisioner/src/disputes/random_selection/mod.rs
new file mode 100644
index 000000000000..a25d3445ac6e
--- /dev/null
+++ b/node/core/provisioner/src/disputes/random_selection/mod.rs
@@ -0,0 +1,194 @@
+// Copyright 2017-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 .
+
+//! This module selects all RECENT disputes, fetches the votes for them from dispute-coordinator and
+//! returns them as `MultiDisputeStatementSet`. If the RECENT disputes are more than
+//! `MAX_DISPUTES_FORWARDED_TO_RUNTIME` constant - the ACTIVE disputes plus a random selection of
+//! RECENT disputes (up to `MAX_DISPUTES_FORWARDED_TO_RUNTIME`) are returned instead.
+//! If the ACTIVE disputes are also above `MAX_DISPUTES_FORWARDED_TO_RUNTIME` limit - a random selection
+//! of them is generated.
+
+use crate::{metrics, LOG_TARGET};
+use futures::channel::oneshot;
+use polkadot_node_subsystem::{messages::DisputeCoordinatorMessage, overseer};
+use polkadot_primitives::v2::{
+ CandidateHash, DisputeStatement, DisputeStatementSet, MultiDisputeStatementSet, SessionIndex,
+};
+use std::collections::HashSet;
+
+/// The maximum number of disputes Provisioner will include in the inherent data.
+/// Serves as a protection not to flood the Runtime with excessive data.
+const MAX_DISPUTES_FORWARDED_TO_RUNTIME: usize = 1_000;
+
+#[derive(Debug)]
+enum RequestType {
+ /// Query recent disputes, could be an excessive amount.
+ Recent,
+ /// Query the currently active and very recently concluded disputes.
+ Active,
+}
+
+/// Request open disputes identified by `CandidateHash` and the `SessionIndex`.
+async fn request_disputes(
+ sender: &mut impl overseer::ProvisionerSenderTrait,
+ active_or_recent: RequestType,
+) -> Vec<(SessionIndex, CandidateHash)> {
+ let disputes = match active_or_recent {
+ RequestType::Recent => {
+ let (tx, rx) = oneshot::channel();
+ let msg = DisputeCoordinatorMessage::RecentDisputes(tx);
+ sender.send_unbounded_message(msg);
+ let recent_disputes = match rx.await {
+ Ok(r) => r,
+ Err(oneshot::Canceled) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ "Channel closed: unable to gather {:?} disputes",
+ active_or_recent
+ );
+ Vec::new()
+ },
+ };
+ recent_disputes
+ .into_iter()
+ .map(|(sesion_idx, candodate_hash, _)| (sesion_idx, candodate_hash))
+ .collect::>()
+ },
+ RequestType::Active => {
+ let (tx, rx) = oneshot::channel();
+ let msg = DisputeCoordinatorMessage::ActiveDisputes(tx);
+ sender.send_unbounded_message(msg);
+ let active_disputes = match rx.await {
+ Ok(r) => r,
+ Err(oneshot::Canceled) => {
+ gum::warn!(
+ target: LOG_TARGET,
+ "Unable to gather {:?} disputes",
+ active_or_recent
+ );
+ Vec::new()
+ },
+ };
+ active_disputes
+ },
+ };
+
+ disputes
+}
+
+/// Extend `acc` by `n` random, picks of not-yet-present in `acc` items of `recent` without repetition and additions of recent.
+fn extend_by_random_subset_without_repetition(
+ acc: &mut Vec<(SessionIndex, CandidateHash)>,
+ extension: Vec<(SessionIndex, CandidateHash)>,
+ n: usize,
+) {
+ use rand::Rng;
+
+ let lut = acc.iter().cloned().collect::>();
+
+ let mut unique_new =
+ extension.into_iter().filter(|recent| !lut.contains(recent)).collect::>();
+
+ // we can simply add all
+ if unique_new.len() <= n {
+ acc.extend(unique_new)
+ } else {
+ acc.reserve(n);
+ let mut rng = rand::thread_rng();
+ for _ in 0..n {
+ let idx = rng.gen_range(0..unique_new.len());
+ acc.push(unique_new.swap_remove(idx));
+ }
+ }
+ // assure sorting stays candid according to session index
+ acc.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+}
+
+pub async fn select_disputes(
+ sender: &mut Sender,
+ metrics: &metrics::Metrics,
+) -> MultiDisputeStatementSet
+where
+ Sender: overseer::ProvisionerSenderTrait,
+{
+ gum::trace!(target: LOG_TARGET, "Selecting disputes for inherent data using random selection");
+
+ // We use `RecentDisputes` instead of `ActiveDisputes` because redundancy is fine.
+ // It's heavier than `ActiveDisputes` but ensures that everything from the dispute
+ // window gets on-chain, unlike `ActiveDisputes`.
+ // In case of an overload condition, we limit ourselves to active disputes, and fill up to the
+ // upper bound of disputes to pass to wasm `fn create_inherent_data`.
+ // If the active ones are already exceeding the bounds, randomly select a subset.
+ let recent = request_disputes(sender, RequestType::Recent).await;
+ let disputes = if recent.len() > MAX_DISPUTES_FORWARDED_TO_RUNTIME {
+ gum::warn!(
+ target: LOG_TARGET,
+ "Recent disputes are excessive ({} > {}), reduce to active ones, and selected",
+ recent.len(),
+ MAX_DISPUTES_FORWARDED_TO_RUNTIME
+ );
+ let mut active = request_disputes(sender, RequestType::Active).await;
+ let n_active = active.len();
+ let active = if active.len() > MAX_DISPUTES_FORWARDED_TO_RUNTIME {
+ let mut picked = Vec::with_capacity(MAX_DISPUTES_FORWARDED_TO_RUNTIME);
+ extend_by_random_subset_without_repetition(
+ &mut picked,
+ active,
+ MAX_DISPUTES_FORWARDED_TO_RUNTIME,
+ );
+ picked
+ } else {
+ extend_by_random_subset_without_repetition(
+ &mut active,
+ recent,
+ MAX_DISPUTES_FORWARDED_TO_RUNTIME.saturating_sub(n_active),
+ );
+ active
+ };
+ active
+ } else {
+ recent
+ };
+
+ // Load all votes for all disputes from the coordinator.
+ let dispute_candidate_votes = super::request_votes(sender, disputes).await;
+
+ // Transform all `CandidateVotes` into `MultiDisputeStatementSet`.
+ dispute_candidate_votes
+ .into_iter()
+ .map(|(session_index, candidate_hash, votes)| {
+ let valid_statements = votes
+ .valid
+ .into_iter()
+ .map(|(i, (s, sig))| (DisputeStatement::Valid(s), i, sig));
+
+ let invalid_statements = votes
+ .invalid
+ .into_iter()
+ .map(|(i, (s, sig))| (DisputeStatement::Invalid(s), i, sig));
+
+ metrics.inc_valid_statements_by(valid_statements.len());
+ metrics.inc_invalid_statements_by(invalid_statements.len());
+ metrics.inc_dispute_statement_sets_by(1);
+
+ DisputeStatementSet {
+ candidate_hash,
+ session: session_index,
+ statements: valid_statements.chain(invalid_statements).collect(),
+ }
+ })
+ .collect()
+}
diff --git a/node/core/provisioner/src/error.rs b/node/core/provisioner/src/error.rs
index 05e437854eac..9fb958c4f339 100644
--- a/node/core/provisioner/src/error.rs
+++ b/node/core/provisioner/src/error.rs
@@ -88,9 +88,7 @@ pub enum GetOnchainDisputesError {
#[error("runtime execution error occurred while fetching onchain disputes for parent {1}")]
Execution(#[source] RuntimeApiError, Hash),
- #[error(
- "runtime doesn't support RuntimeApiRequest::Disputes/RuntimeApiRequest::StagingDisputes for parent {1}"
- )]
+ #[error("runtime doesn't support RuntimeApiRequest::Disputes for parent {1}")]
NotSupported(#[source] RuntimeApiError, Hash),
}
diff --git a/node/core/provisioner/src/lib.rs b/node/core/provisioner/src/lib.rs
index 0f3099c7df33..f669f9ddae2c 100644
--- a/node/core/provisioner/src/lib.rs
+++ b/node/core/provisioner/src/lib.rs
@@ -25,29 +25,27 @@ use futures::{
};
use futures_timer::Delay;
-use polkadot_node_primitives::CandidateVotes;
use polkadot_node_subsystem::{
jaeger,
messages::{
- CandidateBackingMessage, ChainApiMessage, DisputeCoordinatorMessage, ProvisionableData,
- ProvisionerInherentData, ProvisionerMessage,
+ CandidateBackingMessage, ChainApiMessage, ProvisionableData, ProvisionerInherentData,
+ ProvisionerMessage, RuntimeApiMessage, RuntimeApiRequest,
},
overseer, ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal,
- PerLeafSpan, SpawnedSubsystem, SubsystemError,
+ PerLeafSpan, RuntimeApiError, SpawnedSubsystem, SubsystemError,
};
use polkadot_node_subsystem_util::{
request_availability_cores, request_persisted_validation_data, TimeoutExt,
};
use polkadot_primitives::v2::{
- BackedCandidate, BlockNumber, CandidateHash, CandidateReceipt, CoreState, DisputeState,
- DisputeStatement, DisputeStatementSet, Hash, MultiDisputeStatementSet, OccupiedCoreAssumption,
- SessionIndex, SignedAvailabilityBitfield, ValidatorIndex,
+ BackedCandidate, BlockNumber, CandidateReceipt, CoreState, Hash, OccupiedCoreAssumption,
+ SignedAvailabilityBitfield, ValidatorIndex,
};
-use std::collections::{BTreeMap, HashMap, HashSet};
+use std::collections::{BTreeMap, HashMap};
+mod disputes;
mod error;
mod metrics;
-mod onchain_disputes;
pub use self::metrics::*;
use error::{Error, FatalResult};
@@ -62,6 +60,9 @@ const SEND_INHERENT_DATA_TIMEOUT: std::time::Duration = core::time::Duration::fr
const LOG_TARGET: &str = "parachain::provisioner";
+const PRIORITIZED_SELECTION_RUNTIME_VERSION_REQUIREMENT: u32 =
+ RuntimeApiRequest::DISPUTES_RUNTIME_REQUIREMENT;
+
/// The provisioner subsystem.
pub struct ProvisionerSubsystem {
metrics: Metrics,
@@ -270,7 +271,15 @@ async fn send_inherent_data_bg(
match send_result.await {
Err(err) => {
- gum::warn!(target: LOG_TARGET, err = ?err, "failed to assemble or send inherent data");
+ if let Error::CanceledBackedCandidates(_) = err {
+ gum::debug!(
+ target: LOG_TARGET,
+ err = ?err,
+ "Failed to assemble or send inherent data - block got likely obsoleted already."
+ );
+ } else {
+ gum::warn!(target: LOG_TARGET, err = ?err, "failed to assemble or send inherent data");
+ }
metrics.on_inherent_data_request(Err(()));
},
Ok(()) => {
@@ -361,7 +370,18 @@ async fn send_inherent_data(
relay_parent = ?leaf.hash,
"Selecting disputes"
);
- let disputes = select_disputes(from_job, metrics, leaf).await?;
+
+ let disputes = match has_required_runtime(
+ from_job,
+ leaf.hash.clone(),
+ PRIORITIZED_SELECTION_RUNTIME_VERSION_REQUIREMENT,
+ )
+ .await
+ {
+ true => disputes::prioritized_selection::select_disputes(from_job, metrics, leaf).await,
+ false => disputes::random_selection::select_disputes(from_job, metrics).await,
+ };
+
gum::trace!(
target: LOG_TARGET,
relay_parent = ?leaf.hash,
@@ -677,275 +697,55 @@ fn bitfields_indicate_availability(
3 * availability.count_ones() >= 2 * availability.len()
}
-#[derive(Debug)]
-enum RequestType {
- /// Query recent disputes, could be an excessive amount.
- Recent,
- /// Query the currently active and very recently concluded disputes.
- Active,
-}
-
-/// Request open disputes identified by `CandidateHash` and the `SessionIndex`.
-async fn request_disputes(
+// If we have to be absolutely precise here, this method gets the version of the `ParachainHost` api.
+// For brevity we'll just call it 'runtime version'.
+async fn has_required_runtime(
sender: &mut impl overseer::ProvisionerSenderTrait,
- active_or_recent: RequestType,
-) -> Vec<(SessionIndex, CandidateHash)> {
- let (tx, rx) = oneshot::channel();
- let msg = match active_or_recent {
- RequestType::Recent => DisputeCoordinatorMessage::RecentDisputes(tx),
- RequestType::Active => DisputeCoordinatorMessage::ActiveDisputes(tx),
- };
- // Bounded by block production - `ProvisionerMessage::RequestInherentData`.
- sender.send_unbounded_message(msg);
-
- let recent_disputes = match rx.await {
- Ok(r) => r,
- Err(oneshot::Canceled) => {
- gum::warn!(target: LOG_TARGET, "Unable to gather {:?} disputes", active_or_recent);
- Vec::new()
- },
- };
- recent_disputes
-}
-
-/// Request the relevant dispute statements for a set of disputes identified by `CandidateHash` and the `SessionIndex`.
-async fn request_votes(
- sender: &mut impl overseer::ProvisionerSenderTrait,
- disputes_to_query: Vec<(SessionIndex, CandidateHash)>,
-) -> Vec<(SessionIndex, CandidateHash, CandidateVotes)> {
- // No need to send dummy request, if nothing to request:
- if disputes_to_query.is_empty() {
- gum::trace!(target: LOG_TARGET, "No disputes, nothing to request - returning empty `Vec`.");
+ relay_parent: Hash,
+ required_runtime_version: u32,
+) -> bool {
+ gum::trace!(target: LOG_TARGET, ?relay_parent, "Fetching ParachainHost runtime api version");
- return Vec::new()
- }
let (tx, rx) = oneshot::channel();
- // Bounded by block production - `ProvisionerMessage::RequestInherentData`.
- sender.send_unbounded_message(DisputeCoordinatorMessage::QueryCandidateVotes(
- disputes_to_query,
- tx,
- ));
+ sender
+ .send_message(RuntimeApiMessage::Request(relay_parent, RuntimeApiRequest::Version(tx)))
+ .await;
match rx.await {
- Ok(v) => v,
- Err(oneshot::Canceled) => {
- gum::warn!(target: LOG_TARGET, "Unable to query candidate votes");
- Vec::new()
+ Result::Ok(Ok(runtime_version)) => {
+ gum::trace!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ ?runtime_version,
+ ?required_runtime_version,
+ "Fetched ParachainHost runtime api version"
+ );
+ runtime_version >= required_runtime_version
},
- }
-}
-
-/// Extend `acc` by `n` random, picks of not-yet-present in `acc` items of `recent` without repetition and additions of recent.
-fn extend_by_random_subset_without_repetition(
- acc: &mut Vec<(SessionIndex, CandidateHash)>,
- extension: Vec<(SessionIndex, CandidateHash)>,
- n: usize,
-) {
- use rand::Rng;
-
- let lut = acc.iter().cloned().collect::>();
-
- let mut unique_new =
- extension.into_iter().filter(|recent| !lut.contains(recent)).collect::>();
-
- // we can simply add all
- if unique_new.len() <= n {
- acc.extend(unique_new)
- } else {
- acc.reserve(n);
- let mut rng = rand::thread_rng();
- for _ in 0..n {
- let idx = rng.gen_range(0..unique_new.len());
- acc.push(unique_new.swap_remove(idx));
- }
- }
- // assure sorting stays candid according to session index
- acc.sort_unstable_by(|a, b| a.0.cmp(&b.0));
-}
-
-/// The maximum number of disputes Provisioner will include in the inherent data.
-/// Serves as a protection not to flood the Runtime with excessive data.
-const MAX_DISPUTES_FORWARDED_TO_RUNTIME: usize = 1_000;
-
-async fn select_disputes(
- sender: &mut impl overseer::ProvisionerSenderTrait,
- metrics: &metrics::Metrics,
- _leaf: &ActivatedLeaf,
-) -> Result {
- // Helper lambda
- // Gets the active disputes as input and partitions it in seen and unseen disputes by the Runtime
- // Returns as much unseen disputes as possible and optionally some seen disputes up to `MAX_DISPUTES_FORWARDED_TO_RUNTIME` limit.
- let generate_unseen_active_subset =
- |active: Vec<(SessionIndex, CandidateHash)>,
- onchain: HashMap<(SessionIndex, CandidateHash), DisputeState>|
- -> Vec<(SessionIndex, CandidateHash)> {
- let (seen_onchain, mut unseen_onchain): (
- Vec<(SessionIndex, CandidateHash)>,
- Vec<(SessionIndex, CandidateHash)>,
- ) = active.into_iter().partition(|d| onchain.contains_key(d));
-
- if unseen_onchain.len() > MAX_DISPUTES_FORWARDED_TO_RUNTIME {
- // Even unseen on-chain don't fit within the limit. Add as many as possible.
- let mut unseen_subset = Vec::with_capacity(MAX_DISPUTES_FORWARDED_TO_RUNTIME);
- extend_by_random_subset_without_repetition(
- &mut unseen_subset,
- unseen_onchain,
- MAX_DISPUTES_FORWARDED_TO_RUNTIME,
- );
- unseen_subset
- } else {
- // Add all unseen onchain disputes and as much of the seen ones as there is space.
- let n_unseen_onchain = unseen_onchain.len();
- extend_by_random_subset_without_repetition(
- &mut unseen_onchain,
- seen_onchain,
- MAX_DISPUTES_FORWARDED_TO_RUNTIME.saturating_sub(n_unseen_onchain),
- );
- unseen_onchain
- }
- };
-
- // Helper lambda
- // Extends the active disputes with recent ones up to `MAX_DISPUTES_FORWARDED_TO_RUNTIME` limit. Unseen recent disputes are prioritised.
- let generate_active_and_unseen_recent_subset =
- |recent: Vec<(SessionIndex, CandidateHash)>,
- mut active: Vec<(SessionIndex, CandidateHash)>,
- onchain: HashMap<(SessionIndex, CandidateHash), DisputeState>|
- -> Vec<(SessionIndex, CandidateHash)> {
- let mut n_active = active.len();
- // All active disputes can be sent. Fill the rest of the space with recent ones.
- // We assume there is not enough space for all recent disputes. So we prioritise the unseen ones.
- let (seen_onchain, unseen_onchain): (
- Vec<(SessionIndex, CandidateHash)>,
- Vec<(SessionIndex, CandidateHash)>,
- ) = recent.into_iter().partition(|d| onchain.contains_key(d));
-
- extend_by_random_subset_without_repetition(
- &mut active,
- unseen_onchain,
- MAX_DISPUTES_FORWARDED_TO_RUNTIME.saturating_sub(n_active),
+ Result::Ok(Err(RuntimeApiError::Execution { source: error, .. })) => {
+ gum::trace!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ ?error,
+ "Execution error while fetching ParachainHost runtime api version"
);
- n_active = active.len();
-
- if n_active < MAX_DISPUTES_FORWARDED_TO_RUNTIME {
- // Looks like we can add some of the seen disputes too
- extend_by_random_subset_without_repetition(
- &mut active,
- seen_onchain,
- MAX_DISPUTES_FORWARDED_TO_RUNTIME.saturating_sub(n_active),
- );
- }
- active
- };
-
- gum::trace!(
- target: LOG_TARGET,
- relay_parent = ?_leaf.hash,
- "Request recent disputes"
- );
-
- // We use `RecentDisputes` instead of `ActiveDisputes` because redundancy is fine.
- // It's heavier than `ActiveDisputes` but ensures that everything from the dispute
- // window gets on-chain, unlike `ActiveDisputes`.
- // In case of an overload condition, we limit ourselves to active disputes, and fill up to the
- // upper bound of disputes to pass to wasm `fn create_inherent_data`.
- // If the active ones are already exceeding the bounds, randomly select a subset.
- let recent = request_disputes(sender, RequestType::Recent).await;
-
- gum::trace!(
- target: LOG_TARGET,
- relay_paent = ?_leaf.hash,
- "Received recent disputes"
- );
-
- gum::trace!(
- target: LOG_TARGET,
- relay_paent = ?_leaf.hash,
- "Request on chain disputes"
- );
-
- // On chain disputes are fetched from the runtime. We want to prioritise the inclusion of unknown
- // disputes in the inherent data. The call relies on staging Runtime API. If the staging API is not
- // enabled in the binary an empty set is generated which doesn't affect the rest of the logic.
- let onchain = match onchain_disputes::get_onchain_disputes(sender, _leaf.hash.clone()).await {
- Ok(r) => r,
- Err(e) => {
- gum::debug!(
+ false
+ },
+ Result::Ok(Err(RuntimeApiError::NotSupported { .. })) => {
+ gum::trace!(
target: LOG_TARGET,
- ?e,
- "Can't fetch onchain disputes. Will continue with empty onchain disputes set.",
+ ?relay_parent,
+ "NotSupported error while fetching ParachainHost runtime api version"
);
- HashMap::new()
+ false
},
- };
-
- gum::trace!(
- target: LOG_TARGET,
- relay_paent = ?_leaf.hash,
- "Received on chain disputes"
- );
-
- gum::trace!(
- target: LOG_TARGET,
- relay_paent = ?_leaf.hash,
- "Filtering disputes"
- );
-
- let disputes = if recent.len() > MAX_DISPUTES_FORWARDED_TO_RUNTIME {
- gum::warn!(
- target: LOG_TARGET,
- "Recent disputes are excessive ({} > {}), reduce to active ones, and selected",
- recent.len(),
- MAX_DISPUTES_FORWARDED_TO_RUNTIME
- );
- let active = request_disputes(sender, RequestType::Active).await;
- if active.len() > MAX_DISPUTES_FORWARDED_TO_RUNTIME {
- generate_unseen_active_subset(active, onchain)
- } else {
- generate_active_and_unseen_recent_subset(recent, active, onchain)
- }
- } else {
- recent
- };
-
- gum::trace!(
- target: LOG_TARGET,
- relay_paent = ?_leaf.hash,
- "Calling `request_votes`"
- );
-
- // Load all votes for all disputes from the coordinator.
- let dispute_candidate_votes = request_votes(sender, disputes).await;
-
- gum::trace!(
- target: LOG_TARGET,
- relay_paent = ?_leaf.hash,
- "Finished `request_votes`"
- );
-
- // Transform all `CandidateVotes` into `MultiDisputeStatementSet`.
- Ok(dispute_candidate_votes
- .into_iter()
- .map(|(session_index, candidate_hash, votes)| {
- let valid_statements = votes
- .valid
- .into_iter()
- .map(|(i, (s, sig))| (DisputeStatement::Valid(s), i, sig));
-
- let invalid_statements = votes
- .invalid
- .into_iter()
- .map(|(i, (s, sig))| (DisputeStatement::Invalid(s), i, sig));
-
- metrics.inc_valid_statements_by(valid_statements.len());
- metrics.inc_invalid_statements_by(invalid_statements.len());
- metrics.inc_dispute_statement_sets_by(1);
-
- DisputeStatementSet {
- candidate_hash,
- session: session_index,
- statements: valid_statements.chain(invalid_statements).collect(),
- }
- })
- .collect())
+ Result::Err(_) => {
+ gum::trace!(
+ target: LOG_TARGET,
+ ?relay_parent,
+ "Cancelled error while fetching ParachainHost runtime api version"
+ );
+ false
+ },
+ }
}
diff --git a/node/core/provisioner/src/metrics.rs b/node/core/provisioner/src/metrics.rs
index 829293dfed53..8b6bb37284cb 100644
--- a/node/core/provisioner/src/metrics.rs
+++ b/node/core/provisioner/src/metrics.rs
@@ -14,13 +14,18 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see .
+use crate::disputes::prioritized_selection::PartitionedDisputes;
use polkadot_node_subsystem_util::metrics::{self, prometheus};
#[derive(Clone)]
struct MetricsInner {
+ /// Tracks successful/unsuccessful inherent data requests
inherent_data_requests: prometheus::CounterVec,
- request_inherent_data: prometheus::Histogram,
- provisionable_data: prometheus::Histogram,
+ /// How much time the `RequestInherentData` processing takes
+ request_inherent_data_duration: prometheus::Histogram,
+ /// How much time `ProvisionableData` processing takes
+ provisionable_data_duration: prometheus::Histogram,
+ /// Bitfields array length in `ProvisionerInherentData` (the result for `RequestInherentData`)
inherent_data_response_bitfields: prometheus::Histogram,
/// The following metrics track how many disputes/votes the runtime will have to process. These will count
@@ -28,6 +33,9 @@ struct MetricsInner {
/// 4 hours on Polkadot. The metrics are updated only when the node authors a block, so values vary across nodes.
inherent_data_dispute_statement_sets: prometheus::Counter,
inherent_data_dispute_statements: prometheus::CounterVec,
+
+ /// The disputes received from `disputes-coordinator` by partition
+ partitioned_disputes: prometheus::CounterVec,
}
/// Provisioner metrics.
@@ -54,14 +62,16 @@ impl Metrics {
pub(crate) fn time_request_inherent_data(
&self,
) -> Option {
- self.0.as_ref().map(|metrics| metrics.request_inherent_data.start_timer())
+ self.0
+ .as_ref()
+ .map(|metrics| metrics.request_inherent_data_duration.start_timer())
}
/// Provide a timer for `provisionable_data` which observes on drop.
pub(crate) fn time_provisionable_data(
&self,
) -> Option {
- self.0.as_ref().map(|metrics| metrics.provisionable_data.start_timer())
+ self.0.as_ref().map(|metrics| metrics.provisionable_data_duration.start_timer())
}
pub(crate) fn observe_inherent_data_bitfields_count(&self, bitfields_count: usize) {
@@ -95,6 +105,44 @@ impl Metrics {
.inc_by(disputes.try_into().unwrap_or(0));
}
}
+
+ pub(crate) fn on_partition_recent_disputes(&self, disputes: &PartitionedDisputes) {
+ if let Some(metrics) = &self.0 {
+ let PartitionedDisputes {
+ inactive_unknown_onchain,
+ inactive_unconcluded_onchain: inactive_unconcluded_known_onchain,
+ active_unknown_onchain,
+ active_unconcluded_onchain,
+ active_concluded_onchain,
+ inactive_concluded_onchain: inactive_concluded_known_onchain,
+ } = disputes;
+
+ metrics
+ .partitioned_disputes
+ .with_label_values(&["inactive_unknown_onchain"])
+ .inc_by(inactive_unknown_onchain.len().try_into().unwrap_or(0));
+ metrics
+ .partitioned_disputes
+ .with_label_values(&["inactive_unconcluded_known_onchain"])
+ .inc_by(inactive_unconcluded_known_onchain.len().try_into().unwrap_or(0));
+ metrics
+ .partitioned_disputes
+ .with_label_values(&["active_unknown_onchain"])
+ .inc_by(active_unknown_onchain.len().try_into().unwrap_or(0));
+ metrics
+ .partitioned_disputes
+ .with_label_values(&["active_unconcluded_onchain"])
+ .inc_by(active_unconcluded_onchain.len().try_into().unwrap_or(0));
+ metrics
+ .partitioned_disputes
+ .with_label_values(&["active_concluded_onchain"])
+ .inc_by(active_concluded_onchain.len().try_into().unwrap_or(0));
+ metrics
+ .partitioned_disputes
+ .with_label_values(&["inactive_concluded_known_onchain"])
+ .inc_by(inactive_concluded_known_onchain.len().try_into().unwrap_or(0));
+ }
+ }
}
impl metrics::Metrics for Metrics {
@@ -110,14 +158,14 @@ impl metrics::Metrics for Metrics {
)?,
registry,
)?,
- request_inherent_data: prometheus::register(
+ request_inherent_data_duration: prometheus::register(
prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
"polkadot_parachain_provisioner_request_inherent_data_time",
"Time spent within `provisioner::request_inherent_data`",
))?,
registry,
)?,
- provisionable_data: prometheus::register(
+ provisionable_data_duration: prometheus::register(
prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
"polkadot_parachain_provisioner_provisionable_data_time",
"Time spent within `provisioner::provisionable_data`",
@@ -150,6 +198,16 @@ impl metrics::Metrics for Metrics {
)?,
registry,
)?,
+ partitioned_disputes: prometheus::register(
+ prometheus::CounterVec::new(
+ prometheus::Opts::new(
+ "polkadot_parachain_provisioner_partitioned_disputes",
+ "some fancy description",
+ ),
+ &["partition"],
+ )?,
+ ®istry,
+ )?,
};
Ok(Metrics(Some(metrics)))
}
diff --git a/node/core/provisioner/src/onchain_disputes.rs b/node/core/provisioner/src/onchain_disputes.rs
deleted file mode 100644
index 6c83d77fc9c9..000000000000
--- a/node/core/provisioner/src/onchain_disputes.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2017-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 .
-
-use crate::error::GetOnchainDisputesError;
-use polkadot_node_subsystem::overseer;
-use polkadot_primitives::v2::{CandidateHash, DisputeState, Hash, SessionIndex};
-use std::collections::HashMap;
-
-pub async fn get_onchain_disputes(
- _sender: &mut Sender,
- _relay_parent: Hash,
-) -> Result, GetOnchainDisputesError>
-where
- Sender: overseer::ProvisionerSenderTrait,
-{
- let _onchain = Result::<
- HashMap<(SessionIndex, CandidateHash), DisputeState>,
- GetOnchainDisputesError,
- >::Ok(HashMap::new());
- #[cfg(feature = "staging-client")]
- let _onchain = self::staging_impl::get_onchain_disputes(_sender, _relay_parent).await;
-
- _onchain
-}
-
-// Merge this module with the outer (current one) when promoting to stable
-#[cfg(feature = "staging-client")]
-mod staging_impl {
- use super::*; // remove this when promoting to stable
- use crate::LOG_TARGET;
- use futures::channel::oneshot;
- use polkadot_node_subsystem::{
- errors::RuntimeApiError,
- messages::{RuntimeApiMessage, RuntimeApiRequest},
- SubsystemSender,
- };
-
- /// Gets the on-chain disputes at a given block number and returns them as a `HashSet` so that searching in them is cheap.
- pub async fn get_onchain_disputes(
- sender: &mut Sender,
- relay_parent: Hash,
- ) -> Result, GetOnchainDisputesError> {
- gum::trace!(target: LOG_TARGET, ?relay_parent, "Fetching on-chain disputes");
- let (tx, rx) = oneshot::channel();
- sender
- .send_message(
- RuntimeApiMessage::Request(relay_parent, RuntimeApiRequest::StagingDisputes(tx))
- .into(),
- )
- .await;
-
- rx.await
- .map_err(|_| GetOnchainDisputesError::Channel)
- .and_then(|res| {
- res.map_err(|e| match e {
- RuntimeApiError::Execution { .. } =>
- GetOnchainDisputesError::Execution(e, relay_parent),
- RuntimeApiError::NotSupported { .. } =>
- GetOnchainDisputesError::NotSupported(e, relay_parent),
- })
- })
- .map(|v| v.into_iter().map(|e| ((e.0, e.1), e.2)).collect())
- }
-}
diff --git a/node/core/provisioner/src/tests.rs b/node/core/provisioner/src/tests.rs
index d0ca425210ed..08eba8eabe80 100644
--- a/node/core/provisioner/src/tests.rs
+++ b/node/core/provisioner/src/tests.rs
@@ -195,7 +195,7 @@ mod select_availability_bitfields {
}
}
-mod common {
+pub(crate) mod common {
use super::super::*;
use futures::channel::mpsc;
use polkadot_node_subsystem::messages::AllMessages;
@@ -497,403 +497,3 @@ mod select_candidates {
)
}
}
-
-mod select_disputes {
- use super::{super::*, common::test_harness};
- use futures::channel::mpsc;
- use polkadot_node_subsystem::{
- messages::{AllMessages, DisputeCoordinatorMessage, RuntimeApiMessage, RuntimeApiRequest},
- RuntimeApiError,
- };
- use polkadot_node_subsystem_test_helpers::TestSubsystemSender;
- use polkadot_primitives::v2::DisputeState;
- use std::sync::Arc;
- use test_helpers;
-
- // Global Test Data
- fn recent_disputes(len: usize) -> Vec<(SessionIndex, CandidateHash)> {
- let mut res = Vec::with_capacity(len);
- for _ in 0..len {
- res.push((0, CandidateHash(Hash::random())));
- }
-
- res
- }
-
- // same as recent_disputes() but with SessionIndex set to 1
- fn active_disputes(len: usize) -> Vec<(SessionIndex, CandidateHash)> {
- let mut res = Vec::with_capacity(len);
- for _ in 0..len {
- res.push((1, CandidateHash(Hash::random())));
- }
-
- res
- }
-
- fn leaf() -> ActivatedLeaf {
- ActivatedLeaf {
- hash: Hash::repeat_byte(0xAA),
- number: 0xAA,
- status: LeafStatus::Fresh,
- span: Arc::new(jaeger::Span::Disabled),
- }
- }
-
- async fn mock_overseer(
- leaf: ActivatedLeaf,
- mut receiver: mpsc::UnboundedReceiver,
- onchain_disputes: Result, RuntimeApiError>,
- recent_disputes: Vec<(SessionIndex, CandidateHash)>,
- active_disputes: Vec<(SessionIndex, CandidateHash)>,
- ) {
- while let Some(from_job) = receiver.next().await {
- match from_job {
- AllMessages::RuntimeApi(RuntimeApiMessage::Request(
- _,
- RuntimeApiRequest::StagingDisputes(sender),
- )) => {
- let _ = sender.send(onchain_disputes.clone());
- },
- AllMessages::RuntimeApi(_) => panic!("Unexpected RuntimeApi request"),
- AllMessages::DisputeCoordinator(DisputeCoordinatorMessage::RecentDisputes(
- sender,
- )) => {
- let _ = sender.send(recent_disputes.clone());
- },
- AllMessages::DisputeCoordinator(DisputeCoordinatorMessage::ActiveDisputes(
- sender,
- )) => {
- let _ = sender.send(active_disputes.clone());
- },
- AllMessages::DisputeCoordinator(
- DisputeCoordinatorMessage::QueryCandidateVotes(disputes, sender),
- ) => {
- let mut res = Vec::new();
- let v = CandidateVotes {
- candidate_receipt: test_helpers::dummy_candidate_receipt(leaf.hash.clone()),
- valid: BTreeMap::new(),
- invalid: BTreeMap::new(),
- };
- for r in disputes.iter() {
- res.push((r.0, r.1, v.clone()));
- }
-
- let _ = sender.send(res);
- },
- _ => panic!("Unexpected message: {:?}", from_job),
- }
- }
- }
-
- #[test]
- fn recent_disputes_are_withing_onchain_limit() {
- const RECENT_DISPUTES_SIZE: usize = 10;
- let metrics = metrics::Metrics::new_dummy();
- let onchain_disputes = Ok(Vec::new());
- let active_disputes = Vec::new();
- let recent_disputes = recent_disputes(RECENT_DISPUTES_SIZE);
-
- let recent_disputes_overseer = recent_disputes.clone();
- test_harness(
- |r| {
- mock_overseer(
- leaf(),
- r,
- onchain_disputes,
- recent_disputes_overseer,
- active_disputes,
- )
- },
- |mut tx: TestSubsystemSender| async move {
- let lf = leaf();
- let disputes = select_disputes(&mut tx, &metrics, &lf).await.unwrap();
-
- assert!(!disputes.is_empty());
-
- let result = disputes.iter().zip(recent_disputes.iter());
- // We should get all recent disputes.
- for (d, r) in result {
- assert_eq!(d.session, r.0);
- assert_eq!(d.candidate_hash, r.1);
- }
- },
- )
- }
-
- #[test]
- fn recent_disputes_are_too_much_but_active_are_within_limit() {
- const RECENT_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME + 10;
- const ACTIVE_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME;
- let metrics = metrics::Metrics::new_dummy();
- let onchain_disputes = Ok(Vec::new());
- let recent_disputes = recent_disputes(RECENT_DISPUTES_SIZE);
- let active_disputes = active_disputes(ACTIVE_DISPUTES_SIZE);
-
- let active_disputes_overseer = active_disputes.clone();
- test_harness(
- |r| {
- mock_overseer(
- leaf(),
- r,
- onchain_disputes,
- recent_disputes,
- active_disputes_overseer,
- )
- },
- |mut tx: TestSubsystemSender| async move {
- let lf = leaf();
- let disputes = select_disputes(&mut tx, &metrics, &lf).await.unwrap();
-
- assert!(!disputes.is_empty());
-
- let result = disputes.iter().zip(active_disputes.iter());
- // We should get all active disputes.
- for (d, r) in result {
- assert_eq!(d.session, r.0);
- assert_eq!(d.candidate_hash, r.1);
- }
- },
- )
- }
-
- #[test]
- fn recent_disputes_are_too_much_but_active_are_less_than_the_limit() {
- // In this case all active disputes + a random set of recent disputes should be returned
- const RECENT_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME + 10;
- const ACTIVE_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME - 10;
- let metrics = metrics::Metrics::new_dummy();
- let onchain_disputes = Ok(Vec::new());
- let recent_disputes = recent_disputes(RECENT_DISPUTES_SIZE);
- let active_disputes = active_disputes(ACTIVE_DISPUTES_SIZE);
-
- let active_disputes_overseer = active_disputes.clone();
- test_harness(
- |r| {
- mock_overseer(
- leaf(),
- r,
- onchain_disputes,
- recent_disputes,
- active_disputes_overseer,
- )
- },
- |mut tx: TestSubsystemSender| async move {
- let lf = leaf();
- let disputes = select_disputes(&mut tx, &metrics, &lf).await.unwrap();
-
- assert!(!disputes.is_empty());
-
- // Recent disputes are generated with `SessionIndex` = 0
- let (res_recent, res_active): (Vec, Vec) =
- disputes.into_iter().partition(|d| d.session == 0);
-
- // It should be good enough the count the number of active disputes and not compare them one by one. Checking the exact values is already covered by the previous tests.
- assert_eq!(res_active.len(), active_disputes.len()); // We have got all active disputes
- assert_eq!(res_active.len() + res_recent.len(), MAX_DISPUTES_FORWARDED_TO_RUNTIME);
- // And some recent ones.
- },
- )
- }
-
- //These tests rely on staging Runtime functions so they are separated and compiled conditionally.
- #[cfg(feature = "staging-client")]
- mod staging_tests {
- use super::*;
-
- fn dummy_dispute_state() -> DisputeState {
- DisputeState {
- validators_for: BitVec::new(),
- validators_against: BitVec::new(),
- start: 0,
- concluded_at: None,
- }
- }
-
- #[test]
- fn recent_disputes_are_too_much_active_fits_test_recent_prioritisation() {
- // In this case recent disputes are above `MAX_DISPUTES_FORWARDED_TO_RUNTIME` limit and the active ones are below it.
- // The expected behaviour is to send all active disputes and extend the set with recent ones. During the extension the disputes unknown for the Runtime are added with priority.
- const RECENT_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME + 10;
- const ACTIVE_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME - 10;
- const ONCHAIN_DISPUTE_SIZE: usize = RECENT_DISPUTES_SIZE - 9;
- let metrics = metrics::Metrics::new_dummy();
- let recent_disputes = recent_disputes(RECENT_DISPUTES_SIZE);
- let active_disputes = active_disputes(ACTIVE_DISPUTES_SIZE);
- let onchain_disputes: Result<
- Vec<(SessionIndex, CandidateHash, DisputeState)>,
- RuntimeApiError,
- > = Ok(Vec::from(&recent_disputes[0..ONCHAIN_DISPUTE_SIZE])
- .iter()
- .map(|(session_index, candidate_hash)| {
- (*session_index, candidate_hash.clone(), dummy_dispute_state())
- })
- .collect());
- let active_disputes_overseer = active_disputes.clone();
- let recent_disputes_overseer = recent_disputes.clone();
- test_harness(
- |r| {
- mock_overseer(
- leaf(),
- r,
- onchain_disputes,
- recent_disputes_overseer,
- active_disputes_overseer,
- )
- },
- |mut tx: TestSubsystemSender| async move {
- let lf = leaf();
- let disputes = select_disputes(&mut tx, &metrics, &lf).await.unwrap();
-
- assert!(!disputes.is_empty());
-
- // Recent disputes are generated with `SessionIndex` = 0
- let (res_recent, res_active): (
- Vec,
- Vec,
- ) = disputes.into_iter().partition(|d| d.session == 0);
-
- // It should be good enough the count the number of the disputes and not compare them one by one as this was already covered in other tests.
- assert_eq!(res_active.len(), active_disputes.len()); // We've got all active disputes.
- assert_eq!(
- res_recent.len(),
- MAX_DISPUTES_FORWARDED_TO_RUNTIME - active_disputes.len()
- ); // And some recent ones.
-
- // Check if the recent disputes were unknown for the Runtime.
- let expected_recent_disputes =
- Vec::from(&recent_disputes[ONCHAIN_DISPUTE_SIZE..]);
- let res_recent_set: HashSet<(SessionIndex, CandidateHash)> = HashSet::from_iter(
- res_recent.iter().map(|d| (d.session, d.candidate_hash)),
- );
-
- // Explicitly check that all unseen disputes are sent to the Runtime.
- for d in &expected_recent_disputes {
- assert_eq!(res_recent_set.contains(d), true);
- }
- },
- )
- }
-
- #[test]
- fn active_disputes_are_too_much_test_active_prioritisation() {
- // In this case the active disputes are above the `MAX_DISPUTES_FORWARDED_TO_RUNTIME` limit so the unseen ones should be prioritised.
- const RECENT_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME + 10;
- const ACTIVE_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME + 10;
- const ONCHAIN_DISPUTE_SIZE: usize = ACTIVE_DISPUTES_SIZE - 9;
-
- let metrics = metrics::Metrics::new_dummy();
- let recent_disputes = recent_disputes(RECENT_DISPUTES_SIZE);
- let active_disputes = active_disputes(ACTIVE_DISPUTES_SIZE);
- let onchain_disputes: Result<
- Vec<(SessionIndex, CandidateHash, DisputeState)>,
- RuntimeApiError,
- > = Ok(Vec::from(&active_disputes[0..ONCHAIN_DISPUTE_SIZE])
- .iter()
- .map(|(session_index, candidate_hash)| {
- (*session_index, candidate_hash.clone(), dummy_dispute_state())
- })
- .collect());
- let active_disputes_overseer = active_disputes.clone();
- let recent_disputes_overseer = recent_disputes.clone();
- test_harness(
- |r| {
- mock_overseer(
- leaf(),
- r,
- onchain_disputes,
- recent_disputes_overseer,
- active_disputes_overseer,
- )
- },
- |mut tx: TestSubsystemSender| async move {
- let lf = leaf();
- let disputes = select_disputes(&mut tx, &metrics, &lf).await.unwrap();
-
- assert!(!disputes.is_empty());
-
- // Recent disputes are generated with `SessionIndex` = 0
- let (res_recent, res_active): (
- Vec,
- Vec,
- ) = disputes.into_iter().partition(|d| d.session == 0);
-
- // It should be good enough the count the number of the disputes and not compare them one by one
- assert_eq!(res_recent.len(), 0); // We expect no recent disputes
- assert_eq!(res_active.len(), MAX_DISPUTES_FORWARDED_TO_RUNTIME);
-
- let expected_active_disputes =
- Vec::from(&active_disputes[ONCHAIN_DISPUTE_SIZE..]);
- let res_active_set: HashSet<(SessionIndex, CandidateHash)> = HashSet::from_iter(
- res_active.iter().map(|d| (d.session, d.candidate_hash)),
- );
-
- // Explicitly check that the unseen disputes are delivered to the Runtime.
- for d in &expected_active_disputes {
- assert_eq!(res_active_set.contains(d), true);
- }
- },
- )
- }
-
- #[test]
- fn active_disputes_are_too_much_and_are_all_unseen() {
- // In this case there are a lot of active disputes unseen by the Runtime. The focus of the test is to verify that in such cases known disputes are NOT sent to the Runtime.
- const RECENT_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME + 10;
- const ACTIVE_DISPUTES_SIZE: usize = MAX_DISPUTES_FORWARDED_TO_RUNTIME + 5;
- const ONCHAIN_DISPUTE_SIZE: usize = 5;
-
- let metrics = metrics::Metrics::new_dummy();
- let recent_disputes = recent_disputes(RECENT_DISPUTES_SIZE);
- let active_disputes = active_disputes(ACTIVE_DISPUTES_SIZE);
- let onchain_disputes: Result<
- Vec<(SessionIndex, CandidateHash, DisputeState)>,
- RuntimeApiError,
- > = Ok(Vec::from(&active_disputes[0..ONCHAIN_DISPUTE_SIZE])
- .iter()
- .map(|(session_index, candidate_hash)| {
- (*session_index, candidate_hash.clone(), dummy_dispute_state())
- })
- .collect());
- let active_disputes_overseer = active_disputes.clone();
- let recent_disputes_overseer = recent_disputes.clone();
- test_harness(
- |r| {
- mock_overseer(
- leaf(),
- r,
- onchain_disputes,
- recent_disputes_overseer,
- active_disputes_overseer,
- )
- },
- |mut tx: TestSubsystemSender| async move {
- let lf = leaf();
- let disputes = select_disputes(&mut tx, &metrics, &lf).await.unwrap();
- assert!(!disputes.is_empty());
-
- // Recent disputes are generated with `SessionIndex` = 0
- let (res_recent, res_active): (
- Vec,
- Vec,
- ) = disputes.into_iter().partition(|d| d.session == 0);
-
- // It should be good enough the count the number of the disputes and not compare them one by one
- assert_eq!(res_recent.len(), 0);
- assert_eq!(res_active.len(), MAX_DISPUTES_FORWARDED_TO_RUNTIME);
-
- // For sure we don't want to see any of this disputes in the result
- let unexpected_active_disputes =
- Vec::from(&active_disputes[0..ONCHAIN_DISPUTE_SIZE]);
- let res_active_set: HashSet<(SessionIndex, CandidateHash)> = HashSet::from_iter(
- res_active.iter().map(|d| (d.session, d.candidate_hash)),
- );
-
- // Verify that the result DOESN'T contain known disputes (because there is an excessive number of unknown onces).
- for d in &unexpected_active_disputes {
- assert_eq!(res_active_set.contains(d), false);
- }
- },
- )
- }
- }
-}
diff --git a/node/core/pvf-checker/Cargo.toml b/node/core/pvf-checker/Cargo.toml
index d4f7ec83d8ab..85749daaff50 100644
--- a/node/core/pvf-checker/Cargo.toml
+++ b/node/core/pvf-checker/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-core-pvf-checker"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -15,14 +15,14 @@ polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-overseer = { path = "../../overseer" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
[dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers"}
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
futures-timer = "3.0.2"
diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
index 01021da1f2f5..7ba85a9d141f 100644
--- a/node/core/pvf/Cargo.toml
+++ b/node/core/pvf/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-core-pvf"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
@@ -24,16 +24,16 @@ rayon = "1.5.1"
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
polkadot-parachain = { path = "../../../parachain" }
polkadot-core-primitives = { path = "../../../core-primitives" }
-polkadot-node-subsystem-util = { path = "../../subsystem-util"}
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-executor-wasmtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+polkadot-node-metrics = { path = "../../metrics"}
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-executor-wasmtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
[dev-dependencies]
adder = { package = "test-parachain-adder", path = "../../../parachain/test-parachains/adder" }
diff --git a/node/core/pvf/src/host.rs b/node/core/pvf/src/host.rs
index 36fd30d73fc1..77c9a29babf4 100644
--- a/node/core/pvf/src/host.rs
+++ b/node/core/pvf/src/host.rs
@@ -38,6 +38,16 @@ use std::{
time::{Duration, SystemTime},
};
+/// The time period after which the precheck preparation worker is considered unresponsive and will
+/// be killed.
+// NOTE: If you change this make sure to fix the buckets of `pvf_preparation_time` metric.
+pub const PRECHECK_COMPILATION_TIMEOUT: Duration = Duration::from_secs(60);
+
+/// The time period after which the execute preparation worker is considered unresponsive and will
+/// be killed.
+// NOTE: If you change this make sure to fix the buckets of `pvf_preparation_time` metric.
+pub const EXECUTE_COMPILATION_TIMEOUT: Duration = Duration::from_secs(180);
+
/// An alias to not spell the type for the oneshot sender for the PVF execution result.
pub(crate) type ResultSender = oneshot::Sender>;
@@ -51,10 +61,11 @@ pub struct ValidationHost {
}
impl ValidationHost {
- /// Precheck PVF with the given code, i.e. verify that it compiles within a reasonable time limit.
- /// The result of execution will be sent to the provided result sender.
+ /// Precheck PVF with the given code, i.e. verify that it compiles within a reasonable time
+ /// limit. This will prepare the PVF. The result of preparation will be sent to the provided
+ /// result sender.
///
- /// This is async to accommodate the fact a possibility of back-pressure. In the vast majority of
+ /// This is async to accommodate the possibility of back-pressure. In the vast majority of
/// situations this function should return immediately.
///
/// Returns an error if the request cannot be sent to the validation host, i.e. if it shut down.
@@ -72,7 +83,7 @@ impl ValidationHost {
/// Execute PVF with the given code, execution timeout, parameters and priority.
/// The result of execution will be sent to the provided result sender.
///
- /// This is async to accommodate the fact a possibility of back-pressure. In the vast majority of
+ /// This is async to accommodate the possibility of back-pressure. In the vast majority of
/// situations this function should return immediately.
///
/// Returns an error if the request cannot be sent to the validation host, i.e. if it shut down.
@@ -92,7 +103,7 @@ impl ValidationHost {
/// Sends a signal to the validation host requesting to prepare a list of the given PVFs.
///
- /// This is async to accommodate the fact a possibility of back-pressure. In the vast majority of
+ /// This is async to accommodate the possibility of back-pressure. In the vast majority of
/// situations this function should return immediately.
///
/// Returns an error if the request cannot be sent to the validation host, i.e. if it shut down.
@@ -418,6 +429,9 @@ async fn handle_to_host(
Ok(())
}
+/// Handles PVF prechecking.
+///
+/// This tries to prepare the PVF by compiling the WASM blob within a given timeout ([`PRECHECK_COMPILATION_TIMEOUT`]).
async fn handle_precheck_pvf(
artifacts: &mut Artifacts,
prepare_queue: &mut mpsc::Sender,
@@ -440,12 +454,24 @@ async fn handle_precheck_pvf(
}
} else {
artifacts.insert_preparing(artifact_id, vec![result_sender]);
- send_prepare(prepare_queue, prepare::ToQueue::Enqueue { priority: Priority::Normal, pvf })
- .await?;
+ send_prepare(
+ prepare_queue,
+ prepare::ToQueue::Enqueue {
+ priority: Priority::Normal,
+ pvf,
+ compilation_timeout: PRECHECK_COMPILATION_TIMEOUT,
+ },
+ )
+ .await?;
}
Ok(())
}
+/// Handles PVF execution.
+///
+/// This will first try to prepare the PVF, if a prepared artifact does not already exist. If there is already a
+/// preparation job, we coalesce the two preparation jobs. When preparing for execution, we use a more lenient timeout
+/// ([`EXECUTE_COMPILATION_TIMEOUT`]) than when prechecking.
async fn handle_execute_pvf(
cache_path: &Path,
artifacts: &mut Artifacts,
@@ -462,7 +488,7 @@ async fn handle_execute_pvf(
if let Some(state) = artifacts.artifact_state_mut(&artifact_id) {
match state {
- ArtifactState::Prepared { ref mut last_time_needed } => {
+ ArtifactState::Prepared { last_time_needed } => {
*last_time_needed = SystemTime::now();
send_execute(
@@ -485,9 +511,17 @@ async fn handle_execute_pvf(
}
} else {
// Artifact is unknown: register it and enqueue a job with the corresponding priority and
- //
+ // PVF.
artifacts.insert_preparing(artifact_id.clone(), Vec::new());
- send_prepare(prepare_queue, prepare::ToQueue::Enqueue { priority, pvf }).await?;
+ send_prepare(
+ prepare_queue,
+ prepare::ToQueue::Enqueue {
+ priority,
+ pvf,
+ compilation_timeout: EXECUTE_COMPILATION_TIMEOUT,
+ },
+ )
+ .await?;
awaiting_prepare.add(artifact_id, execution_timeout, params, result_tx);
}
@@ -520,7 +554,11 @@ async fn handle_heads_up(
send_prepare(
prepare_queue,
- prepare::ToQueue::Enqueue { priority: Priority::Normal, pvf: active_pvf },
+ prepare::ToQueue::Enqueue {
+ priority: Priority::Normal,
+ pvf: active_pvf,
+ compilation_timeout: EXECUTE_COMPILATION_TIMEOUT,
+ },
)
.await?;
}
diff --git a/node/core/pvf/src/metrics.rs b/node/core/pvf/src/metrics.rs
index 615dd084d2af..547ee65f3e9d 100644
--- a/node/core/pvf/src/metrics.rs
+++ b/node/core/pvf/src/metrics.rs
@@ -16,7 +16,7 @@
//! Prometheus metrics related to the validation host.
-use polkadot_node_subsystem_util::metrics::{self, prometheus};
+use polkadot_node_metrics::metrics::{self, prometheus};
/// Validation host metrics.
#[derive(Default, Clone)]
@@ -155,7 +155,8 @@ impl metrics::Metrics for Metrics {
"Time spent in preparing PVF artifacts in seconds",
)
.buckets(vec![
- // This is synchronized with COMPILATION_TIMEOUT=60s constant found in
+ // This is synchronized with the PRECHECK_COMPILATION_TIMEOUT=60s
+ // and EXECUTE_COMPILATION_TIMEOUT=180s constants found in
// src/prepare/worker.rs
0.1,
0.5,
@@ -166,6 +167,7 @@ impl metrics::Metrics for Metrics {
20.0,
30.0,
60.0,
+ 180.0,
]),
)?,
registry,
diff --git a/node/core/pvf/src/prepare/pool.rs b/node/core/pvf/src/prepare/pool.rs
index 4902c4c7e3b3..fad6ed167614 100644
--- a/node/core/pvf/src/prepare/pool.rs
+++ b/node/core/pvf/src/prepare/pool.rs
@@ -61,7 +61,12 @@ pub enum ToPool {
///
/// In either case, the worker is considered busy and no further `StartWork` messages should be
/// sent until either `Concluded` or `Rip` message is received.
- StartWork { worker: Worker, code: Arc>, artifact_path: PathBuf },
+ StartWork {
+ worker: Worker,
+ code: Arc>,
+ artifact_path: PathBuf,
+ compilation_timeout: Duration,
+ },
}
/// A message sent from pool to its client.
@@ -205,7 +210,7 @@ fn handle_to_pool(
metrics.prepare_worker().on_begin_spawn();
mux.push(spawn_worker_task(program_path.to_owned(), spawn_timeout).boxed());
},
- ToPool::StartWork { worker, code, artifact_path } => {
+ ToPool::StartWork { worker, code, artifact_path, compilation_timeout } => {
if let Some(data) = spawned.get_mut(worker) {
if let Some(idle) = data.idle.take() {
let preparation_timer = metrics.time_preparation();
@@ -216,6 +221,7 @@ fn handle_to_pool(
code,
cache_path.to_owned(),
artifact_path,
+ compilation_timeout,
preparation_timer,
)
.boxed(),
@@ -263,9 +269,11 @@ async fn start_work_task(
code: Arc>,
cache_path: PathBuf,
artifact_path: PathBuf,
+ compilation_timeout: Duration,
_preparation_timer: Option,
) -> PoolEvent {
- let outcome = worker::start_work(idle, code, &cache_path, artifact_path).await;
+ let outcome =
+ worker::start_work(idle, code, &cache_path, artifact_path, compilation_timeout).await;
PoolEvent::StartWork(worker, outcome)
}
diff --git a/node/core/pvf/src/prepare/queue.rs b/node/core/pvf/src/prepare/queue.rs
index 5aa1402916d6..a77b88e00345 100644
--- a/node/core/pvf/src/prepare/queue.rs
+++ b/node/core/pvf/src/prepare/queue.rs
@@ -21,7 +21,10 @@ use crate::{artifacts::ArtifactId, metrics::Metrics, PrepareResult, Priority, Pv
use always_assert::{always, never};
use async_std::path::PathBuf;
use futures::{channel::mpsc, stream::StreamExt as _, Future, SinkExt};
-use std::collections::{HashMap, VecDeque};
+use std::{
+ collections::{HashMap, VecDeque},
+ time::Duration,
+};
/// A request to pool.
#[derive(Debug)]
@@ -30,7 +33,7 @@ pub enum ToQueue {
///
/// Note that it is incorrect to enqueue the same PVF again without first receiving the
/// [`FromQueue`] response.
- Enqueue { priority: Priority, pvf: Pvf },
+ Enqueue { priority: Priority, pvf: Pvf, compilation_timeout: Duration },
}
/// A response from queue.
@@ -76,6 +79,8 @@ struct JobData {
/// The priority of this job. Can be bumped.
priority: Priority,
pvf: Pvf,
+ /// The timeout for the preparation job.
+ compilation_timeout: Duration,
worker: Option,
}
@@ -91,7 +96,7 @@ impl WorkerData {
}
/// A queue structured like this is prone to starving, however, we don't care that much since we expect
-/// there is going to be a limited number of critical jobs and we don't really care if background starve.
+/// there is going to be a limited number of critical jobs and we don't really care if background starve.
#[derive(Default)]
struct Unscheduled {
normal: VecDeque,
@@ -203,18 +208,24 @@ impl Queue {
async fn handle_to_queue(queue: &mut Queue, to_queue: ToQueue) -> Result<(), Fatal> {
match to_queue {
- ToQueue::Enqueue { priority, pvf } => {
- handle_enqueue(queue, priority, pvf).await?;
+ ToQueue::Enqueue { priority, pvf, compilation_timeout } => {
+ handle_enqueue(queue, priority, pvf, compilation_timeout).await?;
},
}
Ok(())
}
-async fn handle_enqueue(queue: &mut Queue, priority: Priority, pvf: Pvf) -> Result<(), Fatal> {
+async fn handle_enqueue(
+ queue: &mut Queue,
+ priority: Priority,
+ pvf: Pvf,
+ compilation_timeout: Duration,
+) -> Result<(), Fatal> {
gum::debug!(
target: LOG_TARGET,
validation_code_hash = ?pvf.code_hash,
?priority,
+ ?compilation_timeout,
"PVF is enqueued for preparation.",
);
queue.metrics.prepare_enqueued();
@@ -225,7 +236,7 @@ async fn handle_enqueue(queue: &mut Queue, priority: Priority, pvf: Pvf) -> Resu
"second Enqueue sent for a known artifact"
) {
// This function is called in response to a `Enqueue` message;
- // Precondtion for `Enqueue` is that it is sent only once for a PVF;
+ // Precondition for `Enqueue` is that it is sent only once for a PVF;
// Thus this should always be `false`;
// qed.
gum::warn!(
@@ -236,7 +247,7 @@ async fn handle_enqueue(queue: &mut Queue, priority: Priority, pvf: Pvf) -> Resu
return Ok(())
}
- let job = queue.jobs.insert(JobData { priority, pvf, worker: None });
+ let job = queue.jobs.insert(JobData { priority, pvf, compilation_timeout, worker: None });
queue.artifact_id_to_job.insert(artifact_id, job);
if let Some(available) = find_idle_worker(queue) {
@@ -424,7 +435,12 @@ async fn assign(queue: &mut Queue, worker: Worker, job: Job) -> Result<(), Fatal
send_pool(
&mut queue.to_pool_tx,
- pool::ToPool::StartWork { worker, code: job_data.pvf.code.clone(), artifact_path },
+ pool::ToPool::StartWork {
+ worker,
+ code: job_data.pvf.code.clone(),
+ artifact_path,
+ compilation_timeout: job_data.compilation_timeout,
+ },
)
.await?;
@@ -478,7 +494,7 @@ pub fn start(
#[cfg(test)]
mod tests {
use super::*;
- use crate::error::PrepareError;
+ use crate::{error::PrepareError, host::PRECHECK_COMPILATION_TIMEOUT};
use assert_matches::assert_matches;
use futures::{future::BoxFuture, FutureExt};
use slotmap::SlotMap;
@@ -571,7 +587,6 @@ mod tests {
async fn poll_ensure_to_pool_is_empty(&mut self) {
use futures_timer::Delay;
- use std::time::Duration;
let to_pool_rx = &mut self.to_pool_rx;
run_until(
@@ -594,7 +609,11 @@ mod tests {
async fn properly_concludes() {
let mut test = Test::new(2, 2);
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(1) });
+ test.send_queue(ToQueue::Enqueue {
+ priority: Priority::Normal,
+ pvf: pvf(1),
+ compilation_timeout: PRECHECK_COMPILATION_TIMEOUT,
+ });
assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Spawn);
let w = test.workers.insert(());
@@ -607,10 +626,12 @@ mod tests {
#[async_std::test]
async fn dont_spawn_over_soft_limit_unless_critical() {
let mut test = Test::new(2, 3);
+ let compilation_timeout = PRECHECK_COMPILATION_TIMEOUT;
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(1) });
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(2) });
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(3) });
+ let priority = Priority::Normal;
+ test.send_queue(ToQueue::Enqueue { priority, pvf: pvf(1), compilation_timeout });
+ test.send_queue(ToQueue::Enqueue { priority, pvf: pvf(2), compilation_timeout });
+ test.send_queue(ToQueue::Enqueue { priority, pvf: pvf(3), compilation_timeout });
// Receive only two spawns.
assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Spawn);
@@ -631,7 +652,11 @@ mod tests {
assert_matches!(test.poll_and_recv_to_pool().await, pool::ToPool::StartWork { .. });
// Enqueue a critical job.
- test.send_queue(ToQueue::Enqueue { priority: Priority::Critical, pvf: pvf(4) });
+ test.send_queue(ToQueue::Enqueue {
+ priority: Priority::Critical,
+ pvf: pvf(4),
+ compilation_timeout,
+ });
// 2 out of 2 are working, but there is a critical job incoming. That means that spawning
// another worker is warranted.
@@ -641,15 +666,24 @@ mod tests {
#[async_std::test]
async fn cull_unwanted() {
let mut test = Test::new(1, 2);
+ let compilation_timeout = PRECHECK_COMPILATION_TIMEOUT;
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(1) });
+ test.send_queue(ToQueue::Enqueue {
+ priority: Priority::Normal,
+ pvf: pvf(1),
+ compilation_timeout,
+ });
assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Spawn);
let w1 = test.workers.insert(());
test.send_from_pool(pool::FromPool::Spawned(w1));
assert_matches!(test.poll_and_recv_to_pool().await, pool::ToPool::StartWork { .. });
// Enqueue a critical job, which warrants spawning over the soft limit.
- test.send_queue(ToQueue::Enqueue { priority: Priority::Critical, pvf: pvf(2) });
+ test.send_queue(ToQueue::Enqueue {
+ priority: Priority::Critical,
+ pvf: pvf(2),
+ compilation_timeout,
+ });
assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Spawn);
// However, before the new worker had a chance to spawn, the first worker finishes with its
@@ -667,9 +701,10 @@ mod tests {
async fn worker_mass_die_out_doesnt_stall_queue() {
let mut test = Test::new(2, 2);
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(1) });
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(2) });
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(3) });
+ let (priority, compilation_timeout) = (Priority::Normal, PRECHECK_COMPILATION_TIMEOUT);
+ test.send_queue(ToQueue::Enqueue { priority, pvf: pvf(1), compilation_timeout });
+ test.send_queue(ToQueue::Enqueue { priority, pvf: pvf(2), compilation_timeout });
+ test.send_queue(ToQueue::Enqueue { priority, pvf: pvf(3), compilation_timeout });
assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Spawn);
assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Spawn);
@@ -696,7 +731,11 @@ mod tests {
async fn doesnt_resurrect_ripped_worker_if_no_work() {
let mut test = Test::new(2, 2);
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(1) });
+ test.send_queue(ToQueue::Enqueue {
+ priority: Priority::Normal,
+ pvf: pvf(1),
+ compilation_timeout: PRECHECK_COMPILATION_TIMEOUT,
+ });
assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Spawn);
@@ -717,7 +756,11 @@ mod tests {
async fn rip_for_start_work() {
let mut test = Test::new(2, 2);
- test.send_queue(ToQueue::Enqueue { priority: Priority::Normal, pvf: pvf(1) });
+ test.send_queue(ToQueue::Enqueue {
+ priority: Priority::Normal,
+ pvf: pvf(1),
+ compilation_timeout: PRECHECK_COMPILATION_TIMEOUT,
+ });
assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Spawn);
diff --git a/node/core/pvf/src/prepare/worker.rs b/node/core/pvf/src/prepare/worker.rs
index a9124b3926c5..77570b47360b 100644
--- a/node/core/pvf/src/prepare/worker.rs
+++ b/node/core/pvf/src/prepare/worker.rs
@@ -32,10 +32,6 @@ use parity_scale_codec::{Decode, Encode};
use sp_core::hexdisplay::HexDisplay;
use std::{panic, sync::Arc, time::Duration};
-/// The time period after which the preparation worker is considered unresponsive and will be killed.
-// NOTE: If you change this make sure to fix the buckets of `pvf_preparation_time` metric.
-const COMPILATION_TIMEOUT: Duration = Duration::from_secs(60);
-
/// Spawns a new worker with the given program path that acts as the worker and the spawn timeout.
///
/// The program should be able to handle ` prepare-worker ` invocation.
@@ -69,6 +65,7 @@ pub async fn start_work(
code: Arc>,
cache_path: &Path,
artifact_path: PathBuf,
+ compilation_timeout: Duration,
) -> Outcome {
let IdleWorker { mut stream, pid } = worker;
@@ -103,7 +100,7 @@ pub async fn start_work(
}
let selected =
- match async_std::future::timeout(COMPILATION_TIMEOUT, framed_recv(&mut stream)).await {
+ match async_std::future::timeout(compilation_timeout, framed_recv(&mut stream)).await {
Ok(Ok(response_bytes)) => {
// Received bytes from worker within the time limit.
// By convention we expect encoded `PrepareResult`.
diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml
index 749fcf97daa2..232d7741bc81 100644
--- a/node/core/runtime-api/Cargo.toml
+++ b/node/core/runtime-api/Cargo.toml
@@ -1,16 +1,16 @@
[package]
name = "polkadot-node-core-runtime-api"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
futures = "0.3.21"
gum = { package = "tracing-gum", path = "../../gum" }
-memory-lru = "0.1.0"
-parity-util-mem = { version = "0.11.0", default-features = false }
+memory-lru = "0.1.1"
+parity-util-mem = { version = "0.12.0", default-features = false }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
@@ -18,10 +18,10 @@ polkadot-node-subsystem-types = { path = "../../subsystem-types" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
[dev-dependencies]
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
futures = { version = "0.3.21", features = ["thread-pool"] }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
polkadot-node-primitives = { path = "../../primitives" }
diff --git a/node/core/runtime-api/src/cache.rs b/node/core/runtime-api/src/cache.rs
index 6f5fdc5d4657..0fe9b74dc86d 100644
--- a/node/core/runtime-api/src/cache.rs
+++ b/node/core/runtime-api/src/cache.rs
@@ -463,5 +463,5 @@ pub(crate) enum RequestResult {
SubmitPvfCheckStatement(Hash, PvfCheckStatement, ValidatorSignature, ()),
ValidationCodeHash(Hash, ParaId, OccupiedCoreAssumption, Option),
Version(Hash, u32),
- StagingDisputes(Hash, Vec<(SessionIndex, CandidateHash, DisputeState)>),
+ Disputes(Hash, Vec<(SessionIndex, CandidateHash, DisputeState)>),
}
diff --git a/node/core/runtime-api/src/lib.rs b/node/core/runtime-api/src/lib.rs
index a815b76a8d7c..36355b5759e6 100644
--- a/node/core/runtime-api/src/lib.rs
+++ b/node/core/runtime-api/src/lib.rs
@@ -153,7 +153,7 @@ where
.cache_validation_code_hash((relay_parent, para_id, assumption), hash),
Version(relay_parent, version) =>
self.requests_cache.cache_version(relay_parent, version),
- StagingDisputes(relay_parent, disputes) =>
+ Disputes(relay_parent, disputes) =>
self.requests_cache.cache_disputes(relay_parent, disputes),
}
}
@@ -256,8 +256,8 @@ where
Request::ValidationCodeHash(para, assumption, sender) =>
query!(validation_code_hash(para, assumption), sender)
.map(|sender| Request::ValidationCodeHash(para, assumption, sender)),
- Request::StagingDisputes(sender) =>
- query!(disputes(), sender).map(|sender| Request::StagingDisputes(sender)),
+ Request::Disputes(sender) =>
+ query!(disputes(), sender).map(|sender| Request::Disputes(sender)),
}
}
@@ -351,8 +351,9 @@ where
let _timer = metrics.time_make_runtime_api_request();
macro_rules! query {
- ($req_variant:ident, $api_name:ident ($($param:expr),*), ver = $version:literal, $sender:expr) => {{
+ ($req_variant:ident, $api_name:ident ($($param:expr),*), ver = $version:expr, $sender:expr) => {{
let sender = $sender;
+ let version: u32 = $version; // enforce type for the version expression
let runtime_version = client.api_version_parachain_host(relay_parent).await
.unwrap_or_else(|e| {
gum::warn!(
@@ -370,7 +371,7 @@ where
0
});
- let res = if runtime_version >= $version {
+ let res = if runtime_version >= version {
client.$api_name(relay_parent $(, $param.clone() )*).await
.map_err(|e| RuntimeApiError::Execution {
runtime_api_name: stringify!($api_name),
@@ -499,7 +500,7 @@ where
},
Request::ValidationCodeHash(para, assumption, sender) =>
query!(ValidationCodeHash, validation_code_hash(para, assumption), ver = 2, sender),
- Request::StagingDisputes(sender) =>
- query!(StagingDisputes, staging_get_disputes(), ver = 2, sender),
+ Request::Disputes(sender) =>
+ query!(Disputes, disputes(), ver = Request::DISPUTES_RUNTIME_REQUIREMENT, sender),
}
}
diff --git a/node/core/runtime-api/src/tests.rs b/node/core/runtime-api/src/tests.rs
index b1a1bba73769..2fab84179433 100644
--- a/node/core/runtime-api/src/tests.rs
+++ b/node/core/runtime-api/src/tests.rs
@@ -23,11 +23,11 @@ use polkadot_node_subsystem_test_helpers::make_subsystem_context;
use polkadot_primitives::{
runtime_api::ParachainHost,
v2::{
- AuthorityDiscoveryId, Block, BlockNumber, CandidateEvent, CandidateHash,
- CommittedCandidateReceipt, CoreState, DisputeState, GroupRotationInfo, Id as ParaId,
- InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption,
- PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo,
- ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature,
+ AuthorityDiscoveryId, Block, CandidateEvent, CommittedCandidateReceipt, CoreState,
+ GroupRotationInfo, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage,
+ OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
+ SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
+ ValidatorSignature,
},
};
use sp_api::ProvideRuntimeApi;
@@ -196,14 +196,10 @@ sp_api::mock_impl_runtime_apis! {
) -> Option {
self.validation_code_hash.get(¶).map(|c| c.clone())
}
-
- fn staging_get_disputes() -> Vec<(SessionIndex, CandidateHash, DisputeState)> {
- unimplemented!()
- }
}
impl BabeApi for MockRuntimeApi {
- fn configuration(&self) -> sp_consensus_babe::BabeGenesisConfiguration {
+ fn configuration(&self) -> sp_consensus_babe::BabeConfiguration {
unimplemented!()
}
diff --git a/node/gum/Cargo.toml b/node/gum/Cargo.toml
index 9768057c5d5c..c9338cd71a81 100644
--- a/node/gum/Cargo.toml
+++ b/node/gum/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tracing-gum"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
description = "Stick logs together with the TraceID as provided by tempo"
diff --git a/node/gum/proc-macro/Cargo.toml b/node/gum/proc-macro/Cargo.toml
index 3b2866c6ad5e..7fa597f759fe 100644
--- a/node/gum/proc-macro/Cargo.toml
+++ b/node/gum/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tracing-gum-proc-macro"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
description = "Generate an overseer including builder pattern and message wrapper from a single annotated struct definition."
@@ -14,7 +14,7 @@ proc-macro = true
[dependencies]
syn = { version = "1.0.95", features = ["full", "extra-traits"] }
quote = "1.0.20"
-proc-macro2 = "1.0.40"
+proc-macro2 = "1.0.43"
proc-macro-crate = "1.1.3"
expander = "0.0.6"
diff --git a/node/gum/src/tests.rs b/node/gum/src/tests.rs
index 4b52147f2948..c4077c7615c7 100644
--- a/node/gum/src/tests.rs
+++ b/node/gum/src/tests.rs
@@ -32,7 +32,7 @@ fn plain() {
fn wo_alias() {
let a: i32 = 7;
error!(target: "foo",
- "Something something {}, {:?}, or maybe {}",
+ "Something something {}, {b:?}, or maybe {c}",
a,
b = Y::default(),
c = a
diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml
index 829df94d50a2..a4a20fb5374b 100644
--- a/node/jaeger/Cargo.toml
+++ b/node/jaeger/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-node-jaeger"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
description = "Polkadot Jaeger primitives, but equally useful for Grafana/Tempo"
@@ -12,8 +12,8 @@ lazy_static = "1.4"
parking_lot = "0.12.0"
polkadot-primitives = { path = "../../primitives" }
polkadot-node-primitives = { path = "../primitives" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
thiserror = "1.0.31"
log = "0.4.17"
parity-scale-codec = { version = "3.1.5", default-features = false }
diff --git a/node/malus/Cargo.toml b/node/malus/Cargo.toml
index 7122d699c994..49271c4e7c4c 100644
--- a/node/malus/Cargo.toml
+++ b/node/malus/Cargo.toml
@@ -2,7 +2,7 @@
name = "polkadot-test-malus"
description = "Misbehaving nodes for local testnets, system and Simnet tests."
license = "GPL-3.0-only"
-version = "0.9.28"
+version = "0.9.31"
authors = ["Parity Technologies "]
edition = "2021"
readme = "README.md"
@@ -23,22 +23,23 @@ polkadot-node-core-backing = { path = "../core/backing" }
polkadot-node-primitives = { path = "../primitives" }
polkadot-primitives = { path = "../../primitives" }
polkadot-node-core-pvf = { path = "../core/pvf" }
-parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] }
+parity-util-mem = { version = "0.12.0", default-features = false, features = ["jemalloc-global"] }
color-eyre = { version = "0.6.1", default-features = false }
assert_matches = "1.5"
-async-trait = "0.1.53"
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-clap = { version = "3.1", features = ["derive"] }
+async-trait = "0.1.57"
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+clap = { version = "4.0.9", features = ["derive"] }
futures = "0.3.21"
futures-timer = "3.0.2"
gum = { package = "tracing-gum", path = "../gum/" }
erasure = { package = "polkadot-erasure-coding", path = "../../erasure-coding" }
+rand = "0.8.5"
[features]
default = []
[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
futures = { version = "0.3.21", features = ["thread-pool"] }
diff --git a/node/malus/README.md b/node/malus/README.md
index 4f71016d77ba..fb4bb0cd272f 100644
--- a/node/malus/README.md
+++ b/node/malus/README.md
@@ -13,8 +13,8 @@ The first argument determines the behavior strain. The currently supported are:
To define integration tests create file
in the toml format as used with [zombienet][zombienet]
under `./integrationtests` describing the network to spawn and
-also the `feature` file (with `.feature` extension ) using the format
-defined in the [DSL doc](https://github.com/paritytech/zombienet/blob/main/docs/testing-dsl-definition.md).
+also the `zndsl` file (with `.zndsl` extension ) using the format
+defined in the [(DSL[(**D**omain **S**pecific **L**anguage)]) doc](https://paritytech.github.io/zombienet/cli/test-dsl-definition-spec.html).
## Usage
@@ -37,7 +37,7 @@ gcloud container clusters get-credentials "parity-zombienet" --zone "europe-west
# launching the actual test
cd zombienet
npm run build
-node dist/cli.js test /node/malus/integrationtests/0001-dispute-valid-block.feature
+node dist/cli.js test /node/malus/integrationtests/0001-dispute-valid-block.zndsl
# Access logs (in google cloud storage)
gsutil ls gs://zombienet-logs/zombie-/logs/
diff --git a/node/malus/integrationtests/0001-dispute-valid-block.feature b/node/malus/integrationtests/0001-dispute-valid-block.zndsl
similarity index 99%
rename from node/malus/integrationtests/0001-dispute-valid-block.feature
rename to node/malus/integrationtests/0001-dispute-valid-block.zndsl
index fe0c14c791e4..f778b0231ba9 100644
--- a/node/malus/integrationtests/0001-dispute-valid-block.feature
+++ b/node/malus/integrationtests/0001-dispute-valid-block.zndsl
@@ -6,7 +6,7 @@ Creds: config
alice: is up
bob: is up
charlie: is up
-david is up
+dave: is up
alice: reports node_roles is 4
bob: reports node_roles is 4
alice: reports sub_libp2p_is_major_syncing is 0
diff --git a/node/malus/src/malus.rs b/node/malus/src/malus.rs
index dd9f1377f14a..bb466d4ba4de 100644
--- a/node/malus/src/malus.rs
+++ b/node/malus/src/malus.rs
@@ -18,7 +18,6 @@
use clap::Parser;
use color_eyre::eyre;
-use polkadot_cli::{Cli, RunCmd};
pub(crate) mod interceptor;
pub(crate) mod shared;
@@ -29,52 +28,66 @@ use variants::*;
/// Define the different variants of behavior.
#[derive(Debug, Parser)]
-#[clap(about = "Malus - the nemesis of polkadot.", version)]
-#[clap(rename_all = "kebab-case")]
+#[command(about = "Malus - the nemesis of polkadot.", version, rename_all = "kebab-case")]
enum NemesisVariant {
/// Suggest a candidate with an invalid proof of validity.
- SuggestGarbageCandidate(RunCmd),
+ SuggestGarbageCandidate(SuggestGarbageCandidateOptions),
/// Back a candidate with a specifically crafted proof of validity.
- BackGarbageCandidate(RunCmd),
+ BackGarbageCandidate(BackGarbageCandidateOptions),
/// Delayed disputing of ancestors that are perfectly fine.
DisputeAncestor(DisputeAncestorOptions),
#[allow(missing_docs)]
- #[clap(name = "prepare-worker", hide = true)]
+ #[command(name = "prepare-worker", hide = true)]
PvfPrepareWorker(polkadot_cli::ValidationWorkerCommand),
#[allow(missing_docs)]
- #[clap(name = "execute-worker", hide = true)]
+ #[command(name = "execute-worker", hide = true)]
PvfExecuteWorker(polkadot_cli::ValidationWorkerCommand),
}
#[derive(Debug, Parser)]
#[allow(missing_docs)]
struct MalusCli {
- #[clap(subcommand)]
+ #[command(subcommand)]
pub variant: NemesisVariant,
/// Sets the minimum delay between the best and finalized block.
pub finality_delay: Option,
}
-fn run_cmd(run: RunCmd) -> Cli {
- Cli { subcommand: None, run }
-}
-
impl MalusCli {
/// Launch a malus node.
fn launch(self) -> eyre::Result<()> {
let finality_delay = self.finality_delay;
match self.variant {
- NemesisVariant::BackGarbageCandidate(cmd) =>
- polkadot_cli::run_node(run_cmd(cmd), BackGarbageCandidate, finality_delay)?,
- NemesisVariant::SuggestGarbageCandidate(cmd) =>
- polkadot_cli::run_node(run_cmd(cmd), BackGarbageCandidateWrapper, finality_delay)?,
- NemesisVariant::DisputeAncestor(opts) => polkadot_cli::run_node(
- run_cmd(opts.clone().cmd),
- DisputeValidCandidates::new(opts),
- finality_delay,
- )?,
+ NemesisVariant::BackGarbageCandidate(opts) => {
+ let BackGarbageCandidateOptions { percentage, cli } = opts;
+
+ polkadot_cli::run_node(cli, BackGarbageCandidates { percentage }, finality_delay)?
+ },
+ NemesisVariant::SuggestGarbageCandidate(opts) => {
+ let SuggestGarbageCandidateOptions { percentage, cli } = opts;
+
+ polkadot_cli::run_node(
+ cli,
+ SuggestGarbageCandidates { percentage },
+ finality_delay,
+ )?
+ },
+ NemesisVariant::DisputeAncestor(opts) => {
+ let DisputeAncestorOptions {
+ fake_validation,
+ fake_validation_error,
+ percentage,
+ cli,
+ } = opts;
+
+ polkadot_cli::run_node(
+ cli,
+ DisputeValidCandidates { fake_validation, fake_validation_error, percentage },
+ finality_delay,
+ )?
+ },
NemesisVariant::PvfPrepareWorker(cmd) => {
#[cfg(target_os = "android")]
{
@@ -126,7 +139,80 @@ mod tests {
variant: NemesisVariant::DisputeAncestor(run),
..
} => {
- assert!(run.cmd.base.bob);
+ assert!(run.cli.run.base.bob);
+ });
+ }
+
+ #[test]
+ fn percentage_works_suggest_garbage() {
+ let cli = MalusCli::try_parse_from(IntoIterator::into_iter([
+ "malus",
+ "suggest-garbage-candidate",
+ "--percentage",
+ "100",
+ "--bob",
+ ]))
+ .unwrap();
+ assert_matches::assert_matches!(cli, MalusCli {
+ variant: NemesisVariant::SuggestGarbageCandidate(run),
+ ..
+ } => {
+ assert!(run.cli.run.base.bob);
+ });
+ }
+
+ #[test]
+ fn percentage_works_dispute_ancestor() {
+ let cli = MalusCli::try_parse_from(IntoIterator::into_iter([
+ "malus",
+ "dispute-ancestor",
+ "--percentage",
+ "100",
+ "--bob",
+ ]))
+ .unwrap();
+ assert_matches::assert_matches!(cli, MalusCli {
+ variant: NemesisVariant::DisputeAncestor(run),
+ ..
+ } => {
+ assert!(run.cli.run.base.bob);
+ });
+ }
+
+ #[test]
+ fn percentage_works_back_garbage() {
+ let cli = MalusCli::try_parse_from(IntoIterator::into_iter([
+ "malus",
+ "back-garbage-candidate",
+ "--percentage",
+ "100",
+ "--bob",
+ ]))
+ .unwrap();
+ assert_matches::assert_matches!(cli, MalusCli {
+ variant: NemesisVariant::BackGarbageCandidate(run),
+ ..
+ } => {
+ assert!(run.cli.run.base.bob);
+ });
+ }
+
+ #[test]
+ #[should_panic]
+ fn validate_range_for_percentage() {
+ let cli = MalusCli::try_parse_from(IntoIterator::into_iter([
+ "malus",
+ "suggest-garbage-candidate",
+ "--percentage",
+ "101",
+ "--bob",
+ ]))
+ .unwrap();
+ assert_matches::assert_matches!(cli, MalusCli {
+ variant: NemesisVariant::DisputeAncestor(run),
+ ..
+ } => {
+ assert!(run.cli.run.base.bob);
});
}
}
diff --git a/node/malus/src/variants/back_garbage_candidate.rs b/node/malus/src/variants/back_garbage_candidate.rs
index cf72776b5f28..b17b8bca5887 100644
--- a/node/malus/src/variants/back_garbage_candidate.rs
+++ b/node/malus/src/variants/back_garbage_candidate.rs
@@ -25,6 +25,7 @@ use polkadot_cli::{
OverseerConnector, OverseerGen, OverseerGenArgs, OverseerHandle, ParachainHost,
ProvideRuntimeApi,
},
+ Cli,
};
use polkadot_node_subsystem::SpawnGlue;
use sp_core::traits::SpawnNamed;
@@ -36,11 +37,27 @@ use crate::{
use std::sync::Arc;
+#[derive(Debug, clap::Parser)]
+#[clap(rename_all = "kebab-case")]
+#[allow(missing_docs)]
+pub struct BackGarbageCandidateOptions {
+ /// Determines the percentage of garbage candidates that should be backed.
+ /// Defaults to 100% of garbage candidates being backed.
+ #[clap(short, long, ignore_case = true, default_value_t = 100, value_parser = clap::value_parser!(u8).range(0..=100))]
+ pub percentage: u8,
+
+ #[clap(flatten)]
+ pub cli: Cli,
+}
+
/// Generates an overseer that replaces the candidate validation subsystem with our malicious
/// variant.
-pub(crate) struct BackGarbageCandidate;
+pub(crate) struct BackGarbageCandidates {
+ /// The probability of behaving maliciously.
+ pub percentage: u8,
+}
-impl OverseerGen for BackGarbageCandidate {
+impl OverseerGen for BackGarbageCandidates {
fn generate<'a, Spawner, RuntimeClient>(
&self,
connector: OverseerConnector,
@@ -55,6 +72,7 @@ impl OverseerGen for BackGarbageCandidate {
let validation_filter = ReplaceValidationResult::new(
FakeCandidateValidation::BackingAndApprovalValid,
FakeCandidateValidationError::InvalidOutputs,
+ f64::from(self.percentage),
SpawnGlue(spawner),
);
diff --git a/node/malus/src/variants/common.rs b/node/malus/src/variants/common.rs
index e112aa49f83e..610b43bc33a4 100644
--- a/node/malus/src/variants/common.rs
+++ b/node/malus/src/variants/common.rs
@@ -33,9 +33,10 @@ use polkadot_primitives::v2::{
};
use futures::channel::oneshot;
+use rand::distributions::{Bernoulli, Distribution};
-#[derive(clap::ArgEnum, Clone, Copy, Debug, PartialEq)]
-#[clap(rename_all = "kebab-case")]
+#[derive(clap::ValueEnum, Clone, Copy, Debug, PartialEq)]
+#[value(rename_all = "kebab-case")]
#[non_exhaustive]
pub enum FakeCandidateValidation {
Disabled,
@@ -48,8 +49,8 @@ pub enum FakeCandidateValidation {
}
/// Candidate invalidity details
-#[derive(clap::ArgEnum, Clone, Copy, Debug, PartialEq)]
-#[clap(rename_all = "kebab-case")]
+#[derive(clap::ValueEnum, Clone, Copy, Debug, PartialEq)]
+#[value(rename_all = "kebab-case")]
pub enum FakeCandidateValidationError {
/// Validation outputs check doesn't pass.
InvalidOutputs,
@@ -109,6 +110,7 @@ impl Into for FakeCandidateValidationError {
pub struct ReplaceValidationResult {
fake_validation: FakeCandidateValidation,
fake_validation_error: FakeCandidateValidationError,
+ distribution: Bernoulli,
spawner: Spawner,
}
@@ -119,9 +121,12 @@ where
pub fn new(
fake_validation: FakeCandidateValidation,
fake_validation_error: FakeCandidateValidationError,
+ percentage: f64,
spawner: Spawner,
) -> Self {
- Self { fake_validation, fake_validation_error, spawner }
+ let distribution = Bernoulli::new(percentage / 100.0)
+ .expect("Invalid probability! Percentage must be in range [0..=100].");
+ Self { fake_validation, fake_validation_error, distribution, spawner }
}
/// Creates and sends the validation response for a given candidate. Queries the runtime to obtain the validation data for the
@@ -202,13 +207,14 @@ where
{
type Message = CandidateValidationMessage;
- // Capture all candidate validation requests and depending on configuration fail them.
+ // Capture all (approval and backing) candidate validation requests and depending on configuration fail them.
fn intercept_incoming(
&self,
subsystem_sender: &mut Sender,
msg: FromOrchestra,
) -> Option> {
match msg {
+ // Message sent by the approval voting subsystem
FromOrchestra::Communication {
msg:
CandidateValidationMessage::ValidateFromExhaustive(
@@ -236,28 +242,84 @@ where
),
})
}
- create_validation_response(
- validation_data,
- candidate_receipt.descriptor,
- sender,
- );
- None
+ // Create the fake response with probability `p` if the `PoV` is malicious,
+ // where 'p' defaults to 100% for suggest-garbage-candidate variant.
+ let behave_maliciously = self.distribution.sample(&mut rand::thread_rng());
+ match behave_maliciously {
+ true => {
+ gum::info!(
+ target: MALUS,
+ ?behave_maliciously,
+ "😈 Creating malicious ValidationResult::Valid message with fake candidate commitments.",
+ );
+
+ create_validation_response(
+ validation_data,
+ candidate_receipt.descriptor,
+ sender,
+ );
+ None
+ },
+ false => {
+ // Behave normally with probability `(1-p)` for a malicious `PoV`.
+ gum::info!(
+ target: MALUS,
+ ?behave_maliciously,
+ "😈 Passing CandidateValidationMessage::ValidateFromExhaustive to the candidate validation subsystem.",
+ );
+
+ Some(FromOrchestra::Communication {
+ msg: CandidateValidationMessage::ValidateFromExhaustive(
+ validation_data,
+ validation_code,
+ candidate_receipt,
+ pov,
+ timeout,
+ sender,
+ ),
+ })
+ },
+ }
},
FakeCandidateValidation::ApprovalInvalid |
FakeCandidateValidation::BackingAndApprovalInvalid => {
- let validation_result =
- ValidationResult::Invalid(InvalidCandidate::InvalidOutputs);
+ // Set the validation result to invalid with probability `p` and trigger a dispute
+ let behave_maliciously = self.distribution.sample(&mut rand::thread_rng());
+ match behave_maliciously {
+ true => {
+ let validation_result =
+ ValidationResult::Invalid(InvalidCandidate::InvalidOutputs);
+
+ gum::info!(
+ target: MALUS,
+ ?behave_maliciously,
+ para_id = ?candidate_receipt.descriptor.para_id,
+ "😈 Maliciously sending invalid validation result: {:?}.",
+ &validation_result,
+ );
+
+ // We're not even checking the candidate, this makes us appear faster than honest validators.
+ sender.send(Ok(validation_result)).unwrap();
+ None
+ },
+ false => {
+ // Behave normally with probability `(1-p)`
+ gum::info!(target: MALUS, "😈 'Decided' to not act maliciously.",);
- gum::debug!(
- target: MALUS,
- para_id = ?candidate_receipt.descriptor.para_id,
- "ValidateFromExhaustive result: {:?}",
- &validation_result
- );
- // We're not even checking the candidate, this makes us appear faster than honest validators.
- sender.send(Ok(validation_result)).unwrap();
- None
+ Some(FromOrchestra::Communication {
+ msg: CandidateValidationMessage::ValidateFromExhaustive(
+ validation_data,
+ validation_code,
+ candidate_receipt,
+ pov,
+ timeout,
+ sender,
+ ),
+ })
+ },
+ }
},
+ // Handle FakeCandidateValidation::Disabled
_ => Some(FromOrchestra::Communication {
msg: CandidateValidationMessage::ValidateFromExhaustive(
validation_data,
@@ -270,6 +332,7 @@ where
}),
}
},
+ // Behaviour related to the backing subsystem
FromOrchestra::Communication {
msg:
CandidateValidationMessage::ValidateFromChainState(
@@ -293,27 +356,68 @@ where
),
})
}
- self.send_validation_response(
- candidate_receipt.descriptor,
- subsystem_sender.clone(),
- response_sender,
- );
- None
+ // If the `PoV` is malicious, back the candidate with some probability `p`,
+ // where 'p' defaults to 100% for suggest-garbage-candidate variant.
+ let behave_maliciously = self.distribution.sample(&mut rand::thread_rng());
+ match behave_maliciously {
+ true => {
+ gum::info!(
+ target: MALUS,
+ ?behave_maliciously,
+ "😈 Backing candidate with malicious PoV.",
+ );
+
+ self.send_validation_response(
+ candidate_receipt.descriptor,
+ subsystem_sender.clone(),
+ response_sender,
+ );
+ None
+ },
+ // If the `PoV` is malicious, we behave normally with some probability `(1-p)`
+ false => Some(FromOrchestra::Communication {
+ msg: CandidateValidationMessage::ValidateFromChainState(
+ candidate_receipt,
+ pov,
+ timeout,
+ response_sender,
+ ),
+ }),
+ }
},
FakeCandidateValidation::BackingInvalid |
FakeCandidateValidation::BackingAndApprovalInvalid => {
- let validation_result =
- ValidationResult::Invalid(self.fake_validation_error.clone().into());
- gum::debug!(
- target: MALUS,
- para_id = ?candidate_receipt.descriptor.para_id,
- "ValidateFromChainState result: {:?}",
- &validation_result
- );
+ // Maliciously set the validation result to invalid for a valid candidate with probability `p`
+ let behave_maliciously = self.distribution.sample(&mut rand::thread_rng());
+ match behave_maliciously {
+ true => {
+ let validation_result = ValidationResult::Invalid(
+ self.fake_validation_error.clone().into(),
+ );
+ gum::info!(
+ target: MALUS,
+ para_id = ?candidate_receipt.descriptor.para_id,
+ "😈 Maliciously sending invalid validation result: {:?}.",
+ &validation_result,
+ );
+ // We're not even checking the candidate, this makes us appear faster than honest validators.
+ response_sender.send(Ok(validation_result)).unwrap();
+ None
+ },
+ // With some probability `(1-p)` we behave normally
+ false => {
+ gum::info!(target: MALUS, "😈 'Decided' to not act maliciously.",);
- // We're not even checking the candidate, this makes us appear faster than honest validators.
- response_sender.send(Ok(validation_result)).unwrap();
- None
+ Some(FromOrchestra::Communication {
+ msg: CandidateValidationMessage::ValidateFromChainState(
+ candidate_receipt,
+ pov,
+ timeout,
+ response_sender,
+ ),
+ })
+ },
+ }
},
_ => Some(FromOrchestra::Communication {
msg: CandidateValidationMessage::ValidateFromChainState(
diff --git a/node/malus/src/variants/dispute_valid_candidates.rs b/node/malus/src/variants/dispute_valid_candidates.rs
index 17ac070e619b..cea058023d6f 100644
--- a/node/malus/src/variants/dispute_valid_candidates.rs
+++ b/node/malus/src/variants/dispute_valid_candidates.rs
@@ -29,7 +29,7 @@ use polkadot_cli::{
OverseerConnector, OverseerGen, OverseerGenArgs, OverseerHandle, ParachainHost,
ProvideRuntimeApi,
},
- RunCmd,
+ Cli,
};
use polkadot_node_subsystem::SpawnGlue;
use sp_core::traits::SpawnNamed;
@@ -40,34 +40,37 @@ use crate::{interceptor::*, variants::ReplaceValidationResult};
use std::sync::Arc;
-#[derive(Clone, Debug, clap::Parser)]
-#[clap(rename_all = "kebab-case")]
+#[derive(Debug, clap::Parser)]
+#[command(rename_all = "kebab-case")]
#[allow(missing_docs)]
pub struct DisputeAncestorOptions {
/// Malicious candidate validation subsystem configuration. When enabled, node PVF execution is skipped
/// during backing and/or approval and it's result can by specified by this option and `--fake-validation-error`
/// for invalid candidate outcomes.
- #[clap(long, arg_enum, ignore_case = true, default_value_t = FakeCandidateValidation::BackingAndApprovalInvalid)]
+ #[arg(long, value_enum, ignore_case = true, default_value_t = FakeCandidateValidation::BackingAndApprovalInvalid)]
pub fake_validation: FakeCandidateValidation,
/// Applies only when `--fake-validation` is configured to reject candidates as invalid. It allows
/// to specify the exact error to return from the malicious candidate validation subsystem.
- #[clap(long, arg_enum, ignore_case = true, default_value_t = FakeCandidateValidationError::InvalidOutputs)]
+ #[arg(long, value_enum, ignore_case = true, default_value_t = FakeCandidateValidationError::InvalidOutputs)]
pub fake_validation_error: FakeCandidateValidationError,
+ /// Determines the percentage of candidates that should be disputed. Allows for fine-tuning
+ /// the intensity of the behavior of the malicious node. Value must be in the range [0..=100].
+ #[clap(short, long, ignore_case = true, default_value_t = 100, value_parser = clap::value_parser!(u8).range(0..=100))]
+ pub percentage: u8,
+
#[clap(flatten)]
- pub cmd: RunCmd,
+ pub cli: Cli,
}
pub(crate) struct DisputeValidCandidates {
/// Fake validation config (applies to disputes as well).
- opts: DisputeAncestorOptions,
-}
-
-impl DisputeValidCandidates {
- pub fn new(opts: DisputeAncestorOptions) -> Self {
- Self { opts }
- }
+ pub fake_validation: FakeCandidateValidation,
+ /// Fake validation error config.
+ pub fake_validation_error: FakeCandidateValidationError,
+ /// The probability of behaving maliciously.
+ pub percentage: u8,
}
impl OverseerGen for DisputeValidCandidates {
@@ -83,8 +86,9 @@ impl OverseerGen for DisputeValidCandidates {
{
let spawner = args.spawner.clone();
let validation_filter = ReplaceValidationResult::new(
- self.opts.fake_validation,
- self.opts.fake_validation_error,
+ self.fake_validation,
+ self.fake_validation_error,
+ f64::from(self.percentage),
SpawnGlue(spawner.clone()),
);
diff --git a/node/malus/src/variants/mod.rs b/node/malus/src/variants/mod.rs
index d57580fdf8d3..6f9a9359e025 100644
--- a/node/malus/src/variants/mod.rs
+++ b/node/malus/src/variants/mod.rs
@@ -22,8 +22,8 @@ mod dispute_valid_candidates;
mod suggest_garbage_candidate;
pub(crate) use self::{
- back_garbage_candidate::BackGarbageCandidate,
+ back_garbage_candidate::{BackGarbageCandidateOptions, BackGarbageCandidates},
dispute_valid_candidates::{DisputeAncestorOptions, DisputeValidCandidates},
- suggest_garbage_candidate::BackGarbageCandidateWrapper,
+ suggest_garbage_candidate::{SuggestGarbageCandidateOptions, SuggestGarbageCandidates},
};
pub(crate) use common::*;
diff --git a/node/malus/src/variants/suggest_garbage_candidate.rs b/node/malus/src/variants/suggest_garbage_candidate.rs
index b8aaaa18c10d..86b0c49e7125 100644
--- a/node/malus/src/variants/suggest_garbage_candidate.rs
+++ b/node/malus/src/variants/suggest_garbage_candidate.rs
@@ -29,14 +29,17 @@ use polkadot_cli::{
OverseerConnector, OverseerGen, OverseerGenArgs, OverseerHandle, ParachainHost,
ProvideRuntimeApi,
},
+ Cli,
};
use polkadot_node_core_candidate_validation::find_validation_data;
use polkadot_node_primitives::{AvailableData, BlockData, PoV};
-use polkadot_primitives::v2::{CandidateDescriptor, CandidateHash};
+use polkadot_primitives::v2::CandidateDescriptor;
use polkadot_node_subsystem_util::request_validators;
use sp_core::traits::SpawnNamed;
+use rand::distributions::{Bernoulli, Distribution};
+
// Filter wrapping related types.
use crate::{
interceptor::*,
@@ -49,28 +52,16 @@ use crate::{
// Import extra types relevant to the particular
// subsystem.
-use polkadot_node_subsystem::{
- messages::{CandidateBackingMessage, CollatorProtocolMessage},
- SpawnGlue,
-};
+use polkadot_node_subsystem::{messages::CandidateBackingMessage, SpawnGlue};
use polkadot_primitives::v2::CandidateReceipt;
-use std::{
- collections::HashMap,
- sync::{Arc, Mutex},
-};
-
-struct Inner {
- /// Maps malicious candidate hash to original candidate hash.
- /// It is used to replace outgoing collator protocol seconded messages.
- map: HashMap,
-}
+use std::sync::Arc;
/// Replace outgoing approval messages with disputes.
#[derive(Clone)]
struct NoteCandidate {
- inner: Arc>,
spawner: Spawner,
+ percentage: f64,
}
impl MessageInterceptor for NoteCandidate
@@ -80,7 +71,7 @@ where
{
type Message = CandidateBackingMessage;
- /// Intercept incoming `Second` requests from the `collator-protocol` subsystem. We take
+ /// Intercept incoming `Second` requests from the `collator-protocol` subsystem.
fn intercept_incoming(
&self,
subsystem_sender: &mut Sender,
@@ -88,163 +79,174 @@ where
) -> Option> {
match msg {
FromOrchestra::Communication {
- msg: CandidateBackingMessage::Second(relay_parent, candidate, _pov),
+ msg: CandidateBackingMessage::Second(relay_parent, ref candidate, ref _pov),
} => {
gum::debug!(
target: MALUS,
candidate_hash = ?candidate.hash(),
?relay_parent,
- "Received request to second candidate"
- );
-
- let pov = PoV { block_data: BlockData(MALICIOUS_POV.into()) };
-
- let (sender, receiver) = std::sync::mpsc::channel();
- let mut new_sender = subsystem_sender.clone();
- let _candidate = candidate.clone();
- self.spawner.spawn_blocking(
- "malus-get-validation-data",
- Some("malus"),
- Box::pin(async move {
- gum::trace!(target: MALUS, "Requesting validators");
- let n_validators = request_validators(relay_parent, &mut new_sender)
- .await
- .await
- .unwrap()
- .unwrap()
- .len();
- gum::trace!(target: MALUS, "Validators {}", n_validators);
- match find_validation_data(&mut new_sender, &_candidate.descriptor()).await
- {
- Ok(Some((validation_data, validation_code))) => {
- sender
- .send((validation_data, validation_code, n_validators))
- .expect("channel is still open");
- },
- _ => {
- panic!("Unable to fetch validation data");
- },
- }
- }),
- );
-
- let (validation_data, validation_code, n_validators) = receiver.recv().unwrap();
-
- let validation_data_hash = validation_data.hash();
- let validation_code_hash = validation_code.hash();
- let validation_data_relay_parent_number = validation_data.relay_parent_number;
-
- gum::trace!(
- target: MALUS,
- candidate_hash = ?candidate.hash(),
- ?relay_parent,
- ?n_validators,
- ?validation_data_hash,
- ?validation_code_hash,
- ?validation_data_relay_parent_number,
- "Fetched validation data."
+ "Received request to second candidate",
);
- let malicious_available_data =
- AvailableData { pov: Arc::new(pov.clone()), validation_data };
-
- let pov_hash = pov.hash();
- let erasure_root = {
- let chunks =
- erasure::obtain_chunks_v1(n_validators as usize, &malicious_available_data)
- .unwrap();
-
- let branches = erasure::branches(chunks.as_ref());
- branches.root()
- };
-
- let (collator_id, collator_signature) = {
- use polkadot_primitives::v2::CollatorPair;
- use sp_core::crypto::Pair;
-
- let collator_pair = CollatorPair::generate().0;
- let signature_payload = polkadot_primitives::v2::collator_signature_payload(
- &relay_parent,
- &candidate.descriptor().para_id,
- &validation_data_hash,
- &pov_hash,
- &validation_code_hash,
+ // Need to draw value from Bernoulli distribution with given probability of success defined by the clap parameter.
+ // Note that clap parameter must be f64 since this is expected by the Bernoulli::new() function.
+ // It must be converted from u8, due to the lack of support for the .range() call on u64 in the clap crate.
+ let distribution = Bernoulli::new(self.percentage / 100.0)
+ .expect("Invalid probability! Percentage must be in range [0..=100].");
+
+ // Draw a random boolean from the Bernoulli distribution with probability of true equal to `p`.
+ // We use `rand::thread_rng` as the source of randomness.
+ let generate_malicious_candidate = distribution.sample(&mut rand::thread_rng());
+
+ if generate_malicious_candidate == true {
+ gum::debug!(target: MALUS, "😈 Suggesting malicious candidate.",);
+
+ let pov = PoV { block_data: BlockData(MALICIOUS_POV.into()) };
+
+ let (sender, receiver) = std::sync::mpsc::channel();
+ let mut new_sender = subsystem_sender.clone();
+ let _candidate = candidate.clone();
+ self.spawner.spawn_blocking(
+ "malus-get-validation-data",
+ Some("malus"),
+ Box::pin(async move {
+ gum::trace!(target: MALUS, "Requesting validators");
+ let n_validators = request_validators(relay_parent, &mut new_sender)
+ .await
+ .await
+ .unwrap()
+ .unwrap()
+ .len();
+ gum::trace!(target: MALUS, "Validators {}", n_validators);
+ match find_validation_data(&mut new_sender, &_candidate.descriptor())
+ .await
+ {
+ Ok(Some((validation_data, validation_code))) => {
+ sender
+ .send((validation_data, validation_code, n_validators))
+ .expect("channel is still open");
+ },
+ _ => {
+ panic!("Unable to fetch validation data");
+ },
+ }
+ }),
);
- (collator_pair.public(), collator_pair.sign(&signature_payload))
- };
-
- let malicious_commitments =
- create_fake_candidate_commitments(&malicious_available_data.validation_data);
-
- let malicious_candidate = CandidateReceipt {
- descriptor: CandidateDescriptor {
- para_id: candidate.descriptor().para_id,
- relay_parent,
- collator: collator_id,
- persisted_validation_data_hash: validation_data_hash,
- pov_hash,
- erasure_root,
- signature: collator_signature,
- para_head: malicious_commitments.head_data.hash(),
- validation_code_hash,
- },
- commitments_hash: malicious_commitments.hash(),
- };
- let malicious_candidate_hash = malicious_candidate.hash();
-
- gum::debug!(
- target: MALUS,
- candidate_hash = ?candidate.hash(),
- ?malicious_candidate_hash,
- "Created malicious candidate"
- );
-
- // Map malicious candidate to the original one. We need this mapping to send back the correct seconded statement
- // to the collators.
- self.inner
- .lock()
- .expect("bad lock")
- .map
- .insert(malicious_candidate_hash, candidate.hash());
+ let (validation_data, validation_code, n_validators) = receiver.recv().unwrap();
+
+ let validation_data_hash = validation_data.hash();
+ let validation_code_hash = validation_code.hash();
+ let validation_data_relay_parent_number = validation_data.relay_parent_number;
+
+ gum::trace!(
+ target: MALUS,
+ candidate_hash = ?candidate.hash(),
+ ?relay_parent,
+ ?n_validators,
+ ?validation_data_hash,
+ ?validation_code_hash,
+ ?validation_data_relay_parent_number,
+ "Fetched validation data."
+ );
- let message = FromOrchestra::Communication {
- msg: CandidateBackingMessage::Second(relay_parent, malicious_candidate, pov),
- };
+ let malicious_available_data =
+ AvailableData { pov: Arc::new(pov.clone()), validation_data };
+
+ let pov_hash = pov.hash();
+ let erasure_root = {
+ let chunks = erasure::obtain_chunks_v1(
+ n_validators as usize,
+ &malicious_available_data,
+ )
+ .unwrap();
+
+ let branches = erasure::branches(chunks.as_ref());
+ branches.root()
+ };
+
+ let (collator_id, collator_signature) = {
+ use polkadot_primitives::v2::CollatorPair;
+ use sp_core::crypto::Pair;
+
+ let collator_pair = CollatorPair::generate().0;
+ let signature_payload = polkadot_primitives::v2::collator_signature_payload(
+ &relay_parent,
+ &candidate.descriptor().para_id,
+ &validation_data_hash,
+ &pov_hash,
+ &validation_code_hash,
+ );
+
+ (collator_pair.public(), collator_pair.sign(&signature_payload))
+ };
+
+ let malicious_commitments = create_fake_candidate_commitments(
+ &malicious_available_data.validation_data,
+ );
- Some(message)
+ let malicious_candidate = CandidateReceipt {
+ descriptor: CandidateDescriptor {
+ para_id: candidate.descriptor().para_id,
+ relay_parent,
+ collator: collator_id,
+ persisted_validation_data_hash: validation_data_hash,
+ pov_hash,
+ erasure_root,
+ signature: collator_signature,
+ para_head: malicious_commitments.head_data.hash(),
+ validation_code_hash,
+ },
+ commitments_hash: malicious_commitments.hash(),
+ };
+ let malicious_candidate_hash = malicious_candidate.hash();
+
+ let message = FromOrchestra::Communication {
+ msg: CandidateBackingMessage::Second(
+ relay_parent,
+ malicious_candidate,
+ pov,
+ ),
+ };
+
+ gum::info!(
+ target: MALUS,
+ candidate_hash = ?candidate.hash(),
+ "😈 Intercepted CandidateBackingMessage::Second and created malicious candidate with hash: {:?}",
+ &malicious_candidate_hash
+ );
+ Some(message)
+ } else {
+ Some(msg)
+ }
},
FromOrchestra::Communication { msg } => Some(FromOrchestra::Communication { msg }),
FromOrchestra::Signal(signal) => Some(FromOrchestra::Signal(signal)),
}
}
+}
- fn intercept_outgoing(
- &self,
- msg: overseer::CandidateBackingOutgoingMessages,
- ) -> Option {
- let msg = match msg {
- overseer::CandidateBackingOutgoingMessages::CollatorProtocolMessage(
- CollatorProtocolMessage::Seconded(relay_parent, statement),
- ) => {
- // `parachain::collator-protocol: received an unexpected `CollationSeconded`: unknown statement statement=...`
- // TODO: Fix this error. We get this on colaltors because `malicious backing` creates a candidate that gets backed/included.
- // It is harmless for test parachain collators, but it will prevent cumulus based collators to make progress
- // as they wait for the relay chain to confirm the seconding of the collation.
- overseer::CandidateBackingOutgoingMessages::CollatorProtocolMessage(
- CollatorProtocolMessage::Seconded(relay_parent, statement),
- )
- },
- msg => msg,
- };
- Some(msg)
- }
+#[derive(Debug, clap::Parser)]
+#[clap(rename_all = "kebab-case")]
+#[allow(missing_docs)]
+pub struct SuggestGarbageCandidateOptions {
+ /// Determines the percentage of malicious candidates that are suggested by malus,
+ /// based on the total number of intercepted CandidateBacking
+ /// Must be in the range [0..=100].
+ #[clap(short, long, ignore_case = true, default_value_t = 100, value_parser = clap::value_parser!(u8).range(0..=100))]
+ pub percentage: u8,
+
+ #[clap(flatten)]
+ pub cli: Cli,
}
/// Garbage candidate implementation wrapper which implements `OverseerGen` glue.
-pub(crate) struct BackGarbageCandidateWrapper;
+pub(crate) struct SuggestGarbageCandidates {
+ /// The probability of behaving maliciously.
+ pub percentage: u8,
+}
-impl OverseerGen for BackGarbageCandidateWrapper {
+impl OverseerGen for SuggestGarbageCandidates {
fn generate<'a, Spawner, RuntimeClient>(
&self,
connector: OverseerConnector,
@@ -255,14 +257,21 @@ impl OverseerGen for BackGarbageCandidateWrapper {
RuntimeClient::Api: ParachainHost + BabeApi + AuthorityDiscoveryApi,
Spawner: 'static + SpawnNamed + Clone + Unpin,
{
- let inner = Inner { map: std::collections::HashMap::new() };
- let inner_mut = Arc::new(Mutex::new(inner));
- let note_candidate =
- NoteCandidate { inner: inner_mut.clone(), spawner: SpawnGlue(args.spawner.clone()) };
+ gum::info!(
+ target: MALUS,
+ "😈 Started Malus node with a {:?} percent chance of behaving maliciously for a given candidate.",
+ &self.percentage,
+ );
+ let note_candidate = NoteCandidate {
+ spawner: SpawnGlue(args.spawner.clone()),
+ percentage: f64::from(self.percentage),
+ };
+ let fake_valid_probability = 100.0;
let validation_filter = ReplaceValidationResult::new(
FakeCandidateValidation::BackingAndApprovalValid,
FakeCandidateValidationError::InvalidOutputs,
+ fake_valid_probability,
SpawnGlue(args.spawner.clone()),
);
diff --git a/node/metered-channel/Cargo.toml b/node/metered-channel/Cargo.toml
deleted file mode 100644
index da95d0db8d6c..000000000000
--- a/node/metered-channel/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "prioritized-metered-channel"
-version = "0.2.0"
-authors = ["Parity Technologies "]
-edition = "2021"
-description = "Channels with built-in observability and message priorizitazion (coming soon™)"
-repository = "https://github.com/paritytech/polkadot.git"
-license = "MIT OR Apache-2.0"
-
-[dependencies]
-futures = "0.3.21"
-futures-timer = "3.0.2"
-derive_more = "0.99"
-tracing = "0.1.35"
-thiserror = "1.0.31"
-crossbeam-queue = "0.3.5"
-nanorand = { version = "0.7.0", default-features = false, features = ["wyrand"] }
-coarsetime = "^0.1.22"
-
-[dev-dependencies]
-futures = { version = "0.3.21", features = ["thread-pool"] }
-assert_matches = "1.5"
-env_logger = "0.9"
-log = "0.4"
-tracing = { version = "0.1.35", features = ["log"] }
diff --git a/node/metered-channel/src/bounded.rs b/node/metered-channel/src/bounded.rs
deleted file mode 100644
index 4d3abffe729e..000000000000
--- a/node/metered-channel/src/bounded.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2017-2021 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 .
-
-//! Metered variant of bounded mpsc channels to be able to extract metrics.
-
-use futures::{
- channel::mpsc,
- sink::SinkExt,
- stream::Stream,
- task::{Context, Poll},
-};
-
-use std::{pin::Pin, result};
-
-use super::{measure_tof_check, CoarseInstant, MaybeTimeOfFlight, Meter};
-
-/// Create a wrapped `mpsc::channel` pair of `MeteredSender` and `MeteredReceiver`.
-pub fn channel(capacity: usize) -> (MeteredSender, MeteredReceiver) {
- let (tx, rx) = mpsc::channel::>(capacity);
- let shared_meter = Meter::default();
- let tx = MeteredSender { meter: shared_meter.clone(), inner: tx };
- let rx = MeteredReceiver { meter: shared_meter, inner: rx };
- (tx, rx)
-}
-
-/// A receiver tracking the messages consumed by itself.
-#[derive(Debug)]
-pub struct MeteredReceiver {
- // count currently contained messages
- meter: Meter,
- inner: mpsc::Receiver>,
-}
-
-impl std::ops::Deref for MeteredReceiver {
- type Target = mpsc::Receiver>;
- fn deref(&self) -> &Self::Target {
- &self.inner
- }
-}
-
-impl std::ops::DerefMut for MeteredReceiver {
- fn deref_mut(&mut self) -> &mut Self::Target {
- &mut self.inner
- }
-}
-
-impl Stream for MeteredReceiver {
- type Item = T;
- fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> {
- match mpsc::Receiver::poll_next(Pin::new(&mut self.inner), cx) {
- Poll::Ready(maybe_value) => Poll::Ready(self.maybe_meter_tof(maybe_value)),
- Poll::Pending => Poll::Pending,
- }
- }
-
- /// Don't rely on the unreliable size hint.
- fn size_hint(&self) -> (usize, Option) {
- self.inner.size_hint()
- }
-}
-
-impl MeteredReceiver {
- fn maybe_meter_tof(&mut self, maybe_value: Option>) -> Option {
- self.meter.note_received();
- maybe_value.map(|value| {
- match value {
- MaybeTimeOfFlight::::WithTimeOfFlight(value, tof_start) => {
- // do not use `.elapsed()` of `std::time`, it may panic
- // `coarsetime` does a saturating sub for all `CoarseInstant` substractions
- let duration = tof_start.elapsed();
- self.meter.note_time_of_flight(duration);
- value
- },
- MaybeTimeOfFlight::::Bare(value) => value,
- }
- .into()
- })
- }
-
- /// Get an updated accessor object for all metrics collected.
- pub fn meter(&self) -> &Meter {
- &self.meter
- }
-
- /// Attempt to receive the next item.
- pub fn try_next(&mut self) -> Result, mpsc::TryRecvError> {
- match self.inner.try_next()? {
- Some(value) => Ok(self.maybe_meter_tof(Some(value))),
- None => Ok(None),
- }
- }
-}
-
-impl futures::stream::FusedStream for MeteredReceiver {
- fn is_terminated(&self) -> bool {
- self.inner.is_terminated()
- }
-}
-
-/// The sender component, tracking the number of items
-/// sent across it.
-#[derive(Debug)]
-pub struct MeteredSender {
- meter: Meter,
- inner: mpsc::Sender>,
-}
-
-impl Clone for MeteredSender {
- fn clone(&self) -> Self {
- Self { meter: self.meter.clone(), inner: self.inner.clone() }
- }
-}
-
-impl std::ops::Deref for MeteredSender {
- type Target = mpsc::Sender>;
- fn deref(&self) -> &Self::Target {
- &self.inner
- }
-}
-
-impl std::ops::DerefMut for MeteredSender {
- fn deref_mut(&mut self) -> &mut Self::Target {
- &mut self.inner
- }
-}
-
-impl MeteredSender {
- fn prepare_with_tof(&self, item: T) -> MaybeTimeOfFlight {
- let previous = self.meter.note_sent();
- let item = if measure_tof_check(previous) {
- MaybeTimeOfFlight::WithTimeOfFlight(item, CoarseInstant::now())
- } else {
- MaybeTimeOfFlight::Bare(item)
- };
- item
- }
-
- /// Get an updated accessor object for all metrics collected.
- pub fn meter(&self) -> &Meter {
- &self.meter
- }
-
- /// Send message, wait until capacity is available.
- pub async fn send(&mut self, msg: T) -> result::Result<(), mpsc::SendError>
- where
- Self: Unpin,
- {
- match self.try_send(msg) {
- Err(send_err) => {
- if !send_err.is_full() {
- return Err(send_err.into_send_error())
- }
-
- let msg = send_err.into_inner();
- self.meter.note_sent();
- let fut = self.inner.send(msg);
- futures::pin_mut!(fut);
- fut.await.map_err(|e| {
- self.meter.retract_sent();
- e
- })
- },
- _ => Ok(()),
- }
- }
-
- /// Attempt to send message or fail immediately.
- pub fn try_send(
- &mut self,
- msg: T,
- ) -> result::Result<(), mpsc::TrySendError>> {
- let msg = self.prepare_with_tof(msg);
- self.inner.try_send(msg).map_err(|e| {
- if e.is_full() {
- // Count bounded channel sends that block.
- self.meter.note_blocked();
- }
- self.meter.retract_sent();
- e
- })
- }
-}
diff --git a/node/metered-channel/src/lib.rs b/node/metered-channel/src/lib.rs
deleted file mode 100644
index 726d7163270c..000000000000
--- a/node/metered-channel/src/lib.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2017-2021 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 .
-
-//! Metered variant of mpsc channels to be able to extract metrics.
-
-use std::sync::{
- atomic::{AtomicUsize, Ordering},
- Arc,
-};
-
-use derive_more::Display;
-
-mod bounded;
-pub mod oneshot;
-mod unbounded;
-
-pub use self::{bounded::*, unbounded::*};
-
-pub use coarsetime::Duration as CoarseDuration;
-use coarsetime::Instant as CoarseInstant;
-
-#[cfg(test)]
-mod tests;
-
-/// A peek into the inner state of a meter.
-#[derive(Debug, Clone)]
-pub struct Meter {
- // Number of sends on this channel.
- sent: Arc,
- // Number of receives on this channel.
- received: Arc,
- // Number of times senders blocked while sending messages to a subsystem.
- blocked: Arc,
- // Atomic ringbuffer of the last 50 time of flight values
- tof: Arc>,
-}
-
-impl std::default::Default for Meter {
- fn default() -> Self {
- Self {
- sent: Arc::new(AtomicUsize::new(0)),
- received: Arc::new(AtomicUsize::new(0)),
- blocked: Arc::new(AtomicUsize::new(0)),
- tof: Arc::new(crossbeam_queue::ArrayQueue::new(100)),
- }
- }
-}
-
-/// A readout of sizes from the meter. Note that it is possible, due to asynchrony, for received
-/// to be slightly higher than sent.
-#[derive(Debug, Display, Clone, Default, PartialEq)]
-#[display(fmt = "(sent={} received={})", sent, received)]
-pub struct Readout {
- /// The amount of messages sent on the channel, in aggregate.
- pub sent: usize,
- /// The amount of messages received on the channel, in aggregate.
- pub received: usize,
- /// How many times the caller blocked when sending messages.
- pub blocked: usize,
- /// Time of flight in micro seconds (us)
- pub tof: Vec,
-}
-
-impl Meter {
- /// Count the number of items queued up inside the channel.
- pub fn read(&self) -> Readout {
- // when obtaining we don't care much about off by one
- // accuracy
- Readout {
- sent: self.sent.load(Ordering::Relaxed),
- received: self.received.load(Ordering::Relaxed),
- blocked: self.blocked.load(Ordering::Relaxed),
- tof: {
- let mut acc = Vec::with_capacity(self.tof.len());
- while let Some(value) = self.tof.pop() {
- acc.push(value)
- }
- acc
- },
- }
- }
-
- fn note_sent(&self) -> usize {
- self.sent.fetch_add(1, Ordering::Relaxed)
- }
-
- fn retract_sent(&self) {
- self.sent.fetch_sub(1, Ordering::Relaxed);
- }
-
- fn note_received(&self) {
- self.received.fetch_add(1, Ordering::Relaxed);
- }
-
- fn note_blocked(&self) {
- self.blocked.fetch_add(1, Ordering::Relaxed);
- }
-
- fn note_time_of_flight(&self, tof: CoarseDuration) {
- let _ = self.tof.force_push(tof);
- }
-}
-
-/// Determine if this instance shall be measured
-#[inline(always)]
-fn measure_tof_check(nth: usize) -> bool {
- if cfg!(test) {
- // for tests, be deterministic and pick every second
- nth & 0x01 == 0
- } else {
- use nanorand::Rng;
- let mut rng = nanorand::WyRand::new_seed(nth as u64);
- let pick = rng.generate_range(1_usize..=1000);
- // measure 5.3%
- pick <= 53
- }
-}
-
-/// Measure the time of flight between insertion and removal
-/// of a single type `T`
-
-#[derive(Debug)]
-pub enum MaybeTimeOfFlight {
- Bare(T),
- WithTimeOfFlight(T, CoarseInstant),
-}
-
-impl