diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 000000000000..66b28b3485d8
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,32 @@
+#
+# An auto defined `clippy` feature was introduced,
+# but it was found to clash with user defined features,
+# so was renamed to `cargo-clippy`.
+#
+# If you want standard clippy run:
+# RUSTFLAGS= cargo clippy
+[target.'cfg(feature = "cargo-clippy")']
+rustflags = [
+ "-Aclippy::all",
+ "-Dclippy::correctness",
+ "-Aclippy::if-same-then-else",
+ "-Aclippy::clone-double-ref",
+ "-Dclippy::complexity",
+ "-Aclippy::zero-prefixed-literal", # 00_1000_000
+ "-Aclippy::type_complexity", # raison d'etre
+ "-Aclippy::nonminimal-bool", # maybe
+ "-Aclippy::borrowed-box", # Reasonable to fix this one
+ "-Aclippy::too-many-arguments", # (Turning this on would lead to)
+ "-Aclippy::unnecessary_cast", # Types may change
+ "-Aclippy::identity-op", # One case where we do 0 +
+ "-Aclippy::useless_conversion", # Types may change
+ "-Aclippy::unit_arg", # styalistic.
+ "-Aclippy::option-map-unit-fn", # styalistic
+ "-Aclippy::bind_instead_of_map", # styalistic
+ "-Aclippy::erasing_op", # E.g. 0 * DOLLARS
+ "-Aclippy::eq_op", # In tests we test equality.
+ "-Aclippy::while_immutable_condition", # false positives
+ "-Aclippy::needless_option_as_deref", # false positives
+ "-Aclippy::derivable_impls", # false positives
+ "-Aclippy::stable_sort_primitive", # prefer stable sort
+]
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/dependabot.yml b/.github/dependabot.yml
index b49246776c54..665e9417256a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,7 +10,7 @@ updates:
- dependency-name: "sp-*"
- dependency-name: "frame-*"
- dependency-name: "fork-tree"
- - dependency-name: "remote-externalities"
+ - dependency-name: "frame-remote-externalities"
- dependency-name: "pallet-*"
- dependency-name: "beefy-*"
- dependency-name: "try-runtime-*"
@@ -21,6 +21,6 @@ updates:
interval: "daily"
- package-ecosystem: github-actions
directory: '/'
- labels: ["A2-insubstantial", "B0-silent", "C1-low 📌", "E3-dependencies"]
+ labels: ["A2-insubstantial", "B0-silent", "C1-low 📌", "E2-dependencies"]
schedule:
interval: daily
diff --git a/.github/workflows/release-50_publish-docker-release.yml b/.github/workflows/release-50_publish-docker-release.yml
index bb74b32e8000..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@dc7b9719a96d48369863986a06765841d7ea23f6 # 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 3caea3e3c3c9..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@dc7b9719a96d48369863986a06765841d7ea23f6 # v1.7
+ uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # v2.1.0
- name: Cache Docker layers
uses: actions/cache@v3
with:
diff --git a/.gitignore b/.gitignore
index 5ea0458ddfc8..f9ab33eb63f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,4 @@ polkadot.*
!polkadot.service
!.rpm/*
.DS_Store
-.cargo
.env
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3a4d2eaf381..6d9300ba93a0 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:
@@ -30,15 +33,22 @@ variables:
GIT_DEPTH: 100
CI_SERVER_NAME: "GitLab CI"
CI_IMAGE: "paritytech/ci-linux:production"
+ BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.56"
- PIPELINE_SCRIPTS_TAG: "v0.4"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.78"
default:
cache: {}
+ retry:
+ max: 2
+ when:
+ - runner_system_failure
+ - unknown_failure
+ - api_failure
+ interruptible: true
-.collect-artifacts: &collect-artifacts
+.collect-artifacts:
artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
when: on_success
@@ -46,7 +56,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,54 +66,51 @@ 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:
+ - !reference [.job-switcher, 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
- retry:
- max: 2
- when:
- - runner_system_failure
- - unknown_failure
- - api_failure
- interruptible: true
+.job-switcher:
+ before_script:
+ - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
+
+.kubernetes-env:
+ image: "${CI_IMAGE}"
+ before_script:
+ - !reference [.job-switcher, before_script]
tags:
- kubernetes-parity-build
-.docker-env: &docker-env
+.docker-env:
image: "${CI_IMAGE}"
- retry:
- max: 2
- when:
- - runner_system_failure
- - unknown_failure
- - api_failure
- interruptible: true
+ before_script:
+ - !reference [.job-switcher, before_script]
tags:
- - linux-docker
+ - linux-docker-vm-c2
-.compiler-info: &compiler-info
+.compiler-info:
before_script:
+ - !reference [.job-switcher, 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 +120,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 +135,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 +152,9 @@ 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
- image: quay.io/buildah/stable
- variables: &image-variables
- GIT_STRATEGY: none
- DOCKER_USER: ${PARITYPR_USER}
- DOCKER_PASS: ${PARITYPR_PASS}
- before_script: &check-versions
+.build-push-image:
+ before_script:
+ - !reference [.job-switcher, before_script]
- test -s ./artifacts/VERSION || exit 1
- test -s ./artifacts/EXTRATAG || exit 1
- VERSION="$(cat ./artifacts/VERSION)"
@@ -179,864 +181,34 @@ 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
-
-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/
+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
-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,6 +226,21 @@ short-benchmark-westend:
PR_NUM: "${PR_NUM}"
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
+ branch: "as-improve"
+
+remove-cancel-pipeline-message:
+ stage: .post
+ rules:
+ - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+ variables:
+ PROJECT_ID: "${CI_PROJECT_ID}"
+ PROJECT_NAME: "${CI_PROJECT_NAME}"
+ PIPELINE_ID: "${CI_PIPELINE_ID}"
+ FAILED_JOB_URL: "https://gitlab.com"
+ FAILED_JOB_NAME: "nope"
+ PR_NUM: "${CI_COMMIT_REF_NAME}"
+ trigger:
+ project: "parity/infrastructure/ci_cd/pipeline-stopper"
cancel-pipeline-test-linux-stable:
extends: .cancel-pipeline-template
diff --git a/Cargo.lock b/Cargo.lock
index b9f15ad0ed18..c748b5d956ff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,7 +18,16 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
dependencies = [
- "gimli",
+ "gimli 0.26.1",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli 0.27.0",
]
[[package]]
@@ -42,7 +51,7 @@ version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"cipher",
"cpufeatures",
"opaque-debug 0.3.0",
@@ -99,9 +108,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.51"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
[[package]]
name = "approx"
@@ -119,19 +128,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "510c76ecefdceada737ea728f4f9a84bd2e1ef29f1ba555e560940fe279954de"
[[package]]
-name = "arrayref"
-version = "0.3.6"
+name = "array-bytes"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949"
[[package]]
-name = "arrayvec"
-version = "0.4.12"
+name = "arrayref"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-dependencies = [
- "nodrop",
-]
+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
[[package]]
name = "arrayvec"
@@ -267,7 +273,7 @@ checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6"
dependencies = [
"async-io",
"blocking",
- "cfg-if 1.0.0",
+ "cfg-if",
"event-listener",
"futures-lite",
"libc",
@@ -287,7 +293,6 @@ dependencies = [
"async-global-executor",
"async-io",
"async-lock",
- "async-process",
"crossbeam-utils",
"futures-channel",
"futures-core",
@@ -304,21 +309,6 @@ dependencies = [
"wasm-bindgen-futures",
]
-[[package]]
-name = "async-std-resolver"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8"
-dependencies = [
- "async-std",
- "async-trait",
- "futures-io",
- "futures-util",
- "pin-utils",
- "socket2",
- "trust-dns-resolver",
-]
-
[[package]]
name = "async-task"
version = "4.0.3"
@@ -327,9 +317,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
[[package]]
name = "async-trait"
-version = "0.1.57"
+version = "0.1.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
+checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c"
dependencies = [
"proc-macro2",
"quote",
@@ -368,22 +358,22 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.64"
+version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
dependencies = [
- "addr2line",
+ "addr2line 0.19.0",
"cc",
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
- "miniz_oxide",
- "object 0.27.1",
+ "miniz_oxide 0.6.2",
+ "object 0.30.0",
"rustc-demangle",
]
@@ -429,28 +419,26 @@ dependencies = [
[[package]]
name = "beefy-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"async-trait",
- "beefy-primitives",
"fnv",
"futures",
- "futures-timer",
- "hex",
"log",
"parity-scale-codec",
"parking_lot 0.12.1",
- "sc-chain-spec",
"sc-client-api",
"sc-consensus",
- "sc-finality-grandpa",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-network-gossip",
"sc-utils",
"sp-api",
"sp-application-crypto",
"sp-arithmetic",
+ "sp-beefy",
"sp-blockchain",
"sp-consensus",
"sp-core",
@@ -465,18 +453,17 @@ dependencies = [
[[package]]
name = "beefy-gadget-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"beefy-gadget",
- "beefy-primitives",
"futures",
"jsonrpsee",
"log",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-rpc",
- "sc-utils",
"serde",
+ "sp-beefy",
"sp-core",
"sp-runtime",
"thiserror",
@@ -485,32 +472,13 @@ dependencies = [
[[package]]
name = "beefy-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
-dependencies = [
- "beefy-primitives",
- "sp-api",
-]
-
-[[package]]
-name = "beefy-primitives"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "parity-scale-codec",
- "scale-info",
"sp-api",
- "sp-application-crypto",
- "sp-core",
+ "sp-beefy",
"sp-runtime",
- "sp-std",
]
-[[package]]
-name = "bimap"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50ae17cabbc8a38a1e3e4c1a6a664e9a09672dc14d0896fa8d865d3a5a446b07"
-
[[package]]
name = "bincode"
version = "1.3.3"
@@ -522,9 +490,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",
@@ -547,9 +515,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitvec"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
dependencies = [
"funty",
"radium",
@@ -566,16 +534,6 @@ dependencies = [
"digest 0.10.3",
]
-[[package]]
-name = "blake2-rfc"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
-dependencies = [
- "arrayvec 0.4.12",
- "constant_time_eq",
-]
-
[[package]]
name = "blake2b_simd"
version = "1.0.0"
@@ -607,7 +565,7 @@ dependencies = [
"arrayref",
"arrayvec 0.7.2",
"cc",
- "cfg-if 1.0.0",
+ "cfg-if",
"constant_time_eq",
"digest 0.10.3",
]
@@ -618,7 +576,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",
@@ -630,7 +588,6 @@ 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.4",
]
@@ -652,12 +609,6 @@ 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.1.0"
@@ -733,9 +684,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.1.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
[[package]]
name = "bzip2-sys"
@@ -787,9 +738,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.72"
+version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
dependencies = [
"jobserver",
]
@@ -812,12 +763,6 @@ dependencies = [
"smallvec",
]
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -832,11 +777,11 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
[[package]]
name = "chacha20"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91"
+checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"cipher",
"cpufeatures",
"zeroize",
@@ -844,9 +789,9 @@ dependencies = [
[[package]]
name = "chacha20poly1305"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a"
+checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
dependencies = [
"aead",
"chacha20",
@@ -892,11 +837,11 @@ dependencies = [
[[package]]
name = "ckb-merkle-mountain-range"
-version = "0.3.2"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f061f97d64fd1822664bdfb722f7ae5469a97b77567390f7442be5b5dc82a5b"
+checksum = "56ccb671c5921be8a84686e6212ca184cb1d7c51cadcdbfcbd1cc3f042f5dfb8"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
]
[[package]]
@@ -907,31 +852,29 @@ checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90"
dependencies = [
"glob",
"libc",
- "libloading 0.7.2",
+ "libloading",
]
[[package]]
name = "clap"
-version = "3.1.18"
+version = "4.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
+checksum = "6bf8832993da70a4c6d13c581f4463c2bdda27b9bf1c5498dc4365543abe6d6f"
dependencies = [
"atty",
"bitflags",
"clap_derive",
"clap_lex",
- "indexmap",
- "lazy_static",
+ "once_cell",
"strsim",
"termcolor",
- "textwrap",
]
[[package]]
name = "clap_derive"
-version = "3.1.18"
+version = "4.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c"
+checksum = "c42f169caba89a7d512b5418b09864543eeb4d497416c917d7137863bd2076ad"
dependencies = [
"heck",
"proc-macro-error",
@@ -942,22 +885,13 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
+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"
@@ -970,6 +904,16 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
[[package]]
name = "color-eyre"
version = "0.6.1"
@@ -1005,9 +949,9 @@ dependencies = [
[[package]]
name = "const-oid"
-version = "0.7.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
+checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661"
[[package]]
name = "constant_time_eq"
@@ -1052,7 +996,17 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "931ab2a3e6330a07900b8e7ca4e106cdcbb93f2b9a52df55e54ee53d8305b55d"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
+]
+
+[[package]]
+name = "cpu-time"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded"
+dependencies = [
+ "libc",
+ "winapi",
]
[[package]]
@@ -1066,25 +1020,27 @@ dependencies = [
[[package]]
name = "cranelift-bforest"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f91425bea5a5ac6d76b788477064944a7e21f0e240fd93f6f368a774a3efdd1"
+checksum = "b27bbd3e6c422cf6282b047bcdd51ecd9ca9f3497a3be0132ffa08e509b824b0"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b83b4bbf7bc96db77b7b5b5e41fafc4001536e9f0cbfd702ed7d4d8f848dc06"
+checksum = "872f5d4557a411b087bd731df6347c142ae1004e6467a144a7e33662e5715a01"
dependencies = [
+ "arrayvec 0.7.2",
+ "bumpalo",
"cranelift-bforest",
"cranelift-codegen-meta",
"cranelift-codegen-shared",
"cranelift-entity",
"cranelift-isle",
- "gimli",
+ "gimli 0.26.1",
"log",
"regalloc2",
"smallvec",
@@ -1093,33 +1049,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da02e8fff048c381b313a3dfef4deb2343976fb6d7acc8e7d9c86d4c93e3fa06"
+checksum = "21b49fdebb29c62c1fc4da1eeebd609e9d530ecde24a9876def546275f73a244"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9abc2a06e8fc29e36660ebbc9e2503e18a051057072acbb1e75e7f7cf19cb95e"
+checksum = "5fc0c091e2db055d4d7f6b7cec2d2ead286bcfaea3357c6a52c2a2613a8cb5ac"
[[package]]
name = "cranelift-entity"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeced7874890fc25d85cacc5e626c4d67931c7c25aad1c2ad521684744c1ff5c"
+checksum = "354a9597be87996c9b278655e68b8447f65dd907256855ad773864edee8d985c"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1d301ccad6fce05d9c9793d433d225fafdd57661b98d268d8d162e9291ff2e"
+checksum = "0cd8dd3fb8b82c772f4172e87ae1677b971676fffa7c4e3398e3047e650a266b"
dependencies = [
"cranelift-codegen",
"log",
@@ -1129,15 +1085,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7b100db19320848986b4df1da19501dbddeb706a799f502222f72f889b0fab"
+checksum = "b82527802b1f7d8da288adc28f1dc97ea52943f5871c041213f7b5035ac698a7"
[[package]]
name = "cranelift-native"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be18d8b976cddc822e52343f328b7593d26dd2f1aeadd90da071596a210d524"
+checksum = "c30ba8b910f1be023af0c39109cb28a8809734942a6b3eecbf2de8993052ea5e"
dependencies = [
"cranelift-codegen",
"libc",
@@ -1146,9 +1102,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.87.1"
+version = "0.88.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f9e48bb632a2e189b38a9fa89fa5a6eea687a5a4c613bbef7c2b7522c3ad0e0"
+checksum = "776a8916d201894aca9637a20814f1e11abc62acd5cfbe0b4eb2e63922756971"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -1166,7 +1122,7 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
]
[[package]]
@@ -1175,7 +1131,7 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"crossbeam-utils",
]
@@ -1185,7 +1141,7 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"crossbeam-epoch",
"crossbeam-utils",
]
@@ -1196,7 +1152,7 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"crossbeam-utils",
"lazy_static",
"memoffset",
@@ -1209,7 +1165,7 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"crossbeam-utils",
]
@@ -1219,7 +1175,7 @@ version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"once_cell",
]
@@ -1231,9 +1187,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-bigint"
-version = "0.3.2"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
+checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
dependencies = [
"generic-array 0.14.4",
"rand_core 0.6.3",
@@ -1290,17 +1246,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"
@@ -1340,6 +1285,50 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "cxx"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "scratch",
+ "syn",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "data-encoding"
version = "2.3.2"
@@ -1377,11 +1366,12 @@ dependencies = [
[[package]]
name = "der"
-version = "0.5.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
+checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f"
dependencies = [
"const-oid",
+ "zeroize",
]
[[package]]
@@ -1464,7 +1454,7 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"dirs-sys-next",
]
@@ -1521,6 +1511,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"
@@ -1562,9 +1558,9 @@ checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
[[package]]
name = "ecdsa"
-version = "0.13.4"
+version = "0.14.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
+checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
dependencies = [
"der",
"elliptic-curve",
@@ -1574,9 +1570,9 @@ dependencies = [
[[package]]
name = "ed25519"
-version = "1.3.0"
+version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e1069e39f1454367eb2de793ed062fac4c35c2934b76a81d90dd9abcd28816"
+checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
dependencies = [
"signature",
]
@@ -1597,15 +1593,15 @@ dependencies = [
[[package]]
name = "ed25519-zebra"
-version = "3.0.0"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
+checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
dependencies = [
"curve25519-dalek 3.2.0",
+ "hashbrown",
"hex",
"rand_core 0.6.3",
"sha2 0.9.8",
- "thiserror",
"zeroize",
]
@@ -1617,13 +1613,14 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "elliptic-curve"
-version = "0.11.12"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
+checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
dependencies = [
"base16ct",
"crypto-bigint",
"der",
+ "digest 0.10.3",
"ff",
"generic-array 0.14.4",
"group",
@@ -1639,14 +1636,14 @@ version = "0.8.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
]
[[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",
@@ -1864,7 +1861,7 @@ version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc04871e5ae3aa2952d552dae6b291b3099723bf779a8054281c1366a54613ef"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"js-sys",
"log",
"serde",
@@ -1876,9 +1873,9 @@ dependencies = [
[[package]]
name = "ff"
-version = "0.11.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
dependencies = [
"rand_core 0.6.3",
"subtle",
@@ -1900,7 +1897,7 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"redox_syscall",
"windows-sys 0.36.1",
@@ -1936,9 +1933,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",
@@ -1958,11 +1955,20 @@ version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"crc32fast",
"libc",
"libz-sys",
- "miniz_oxide",
+ "miniz_oxide 0.4.4",
+]
+
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+dependencies = [
+ "num-traits",
]
[[package]]
@@ -1989,7 +1995,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
]
@@ -2004,10 +2010,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=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -2030,9 +2042,10 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"Inflector",
+ "array-bytes",
"chrono",
"clap",
"comfy-table",
@@ -2041,17 +2054,13 @@ dependencies = [
"frame-system",
"gethostname",
"handlebars",
- "hash-db",
- "hex",
"itertools",
- "kvdb",
"lazy_static",
"linked-hash-map",
"log",
- "memory-db",
"parity-scale-codec",
"rand 0.8.5",
- "rand_pcg 0.3.1",
+ "rand_pcg",
"sc-block-builder",
"sc-cli",
"sc-client-api",
@@ -2061,7 +2070,6 @@ dependencies = [
"sc-sysinfo",
"serde",
"serde_json",
- "serde_nanos",
"sp-api",
"sp-blockchain",
"sp-core",
@@ -2071,9 +2079,9 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"sp-state-machine",
+ "sp-std",
"sp-storage",
"sp-trie",
- "tempfile",
"thiserror",
"thousands",
]
@@ -2081,7 +2089,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2092,7 +2100,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2100,6 +2108,7 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-arithmetic",
+ "sp-core",
"sp-npos-elections",
"sp-runtime",
"sp-std",
@@ -2108,7 +2117,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -2128,16 +2137,32 @@ version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"parity-scale-codec",
"scale-info",
"serde",
]
+[[package]]
+name = "frame-remote-externalities"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+dependencies = [
+ "futures",
+ "log",
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "substrate-rpc-client",
+ "tokio",
+]
+
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"bitflags",
"frame-metadata",
@@ -2169,7 +2194,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"Inflector",
"cfg-expr",
@@ -2183,7 +2208,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -2195,7 +2220,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"proc-macro2",
"quote",
@@ -2205,7 +2230,7 @@ dependencies = [
[[package]]
name = "frame-support-test"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-support-test-pallet",
@@ -2228,7 +2253,7 @@ dependencies = [
[[package]]
name = "frame-support-test-pallet"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -2239,7 +2264,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"log",
@@ -2257,7 +2282,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2272,7 +2297,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2281,7 +2306,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2296,18 +2321,6 @@ version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0"
-[[package]]
-name = "fs-swap"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5"
-dependencies = [
- "lazy_static",
- "libc",
- "libloading 0.5.2",
- "winapi",
-]
-
[[package]]
name = "fs2"
version = "0.4.3"
@@ -2464,7 +2477,7 @@ dependencies = [
[[package]]
name = "generate-bags"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"chrono",
"frame-election-provider-support",
@@ -2473,7 +2486,6 @@ dependencies = [
"git2",
"num-format",
"pallet-staking",
- "sp-io",
]
[[package]]
@@ -2511,11 +2523,9 @@ version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
+ "cfg-if",
"libc",
"wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
]
[[package]]
@@ -2524,7 +2534,7 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
]
@@ -2550,6 +2560,12 @@ dependencies = [
"stable_deref_trait",
]
+[[package]]
+name = "gimli"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+
[[package]]
name = "git2"
version = "0.14.2"
@@ -2597,9 +2613,9 @@ dependencies = [
[[package]]
name = "group"
-version = "0.11.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
+checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
dependencies = [
"ff",
"rand_core 0.6.3",
@@ -2690,12 +2706,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"
@@ -2716,6 +2726,15 @@ dependencies = [
"digest 0.9.0",
]
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.3",
+]
+
[[package]]
name = "hmac-drbg"
version = "0.3.0"
@@ -2729,13 +2748,14 @@ dependencies = [
[[package]]
name = "honggfuzz"
-version = "0.5.54"
+version = "0.5.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea09577d948a98a5f59b7c891e274c4fb35ad52f67782b3d0cb53b9c05301f1"
+checksum = "848e9c511092e0daa0a35a63e8e6e475a3e8f870741448b9f6028d69b142f18e"
dependencies = [
"arbitrary",
"lazy_static",
- "memmap",
+ "memmap2",
+ "rustc_version",
]
[[package]]
@@ -2757,20 +2777,26 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes",
"fnv",
- "itoa 1.0.1",
+ "itoa",
]
[[package]]
name = "http-body"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
"bytes",
"http",
"pin-project-lite 0.2.7",
]
+[[package]]
+name = "http-range-header"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+
[[package]]
name = "httparse"
version = "1.6.0"
@@ -2813,7 +2839,7 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
- "itoa 1.0.1",
+ "itoa",
"pin-project-lite 0.2.7",
"socket2",
"tokio",
@@ -2873,9 +2899,9 @@ dependencies = [
[[package]]
name = "if-watch"
-version = "1.0.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8f4a3c3d4c89351ca83e120c1c00b27df945d38e05695668c9d4b4f7bc52f3"
+checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd"
dependencies = [
"async-io",
"core-foundation",
@@ -2900,9 +2926,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",
]
@@ -2941,7 +2967,7 @@ version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
]
[[package]]
@@ -3000,15 +3026,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.1"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
[[package]]
name = "jobserver"
@@ -3030,24 +3050,23 @@ dependencies = [
[[package]]
name = "jsonrpsee"
-version = "0.15.1"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a"
+checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e"
dependencies = [
"jsonrpsee-core",
- "jsonrpsee-http-server",
"jsonrpsee-proc-macros",
+ "jsonrpsee-server",
"jsonrpsee-types",
"jsonrpsee-ws-client",
- "jsonrpsee-ws-server",
"tracing",
]
[[package]]
name = "jsonrpsee-client-transport"
-version = "0.15.1"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74"
+checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb"
dependencies = [
"futures-util",
"http",
@@ -3066,9 +3085,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-core"
-version = "0.15.1"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca"
+checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b"
dependencies = [
"anyhow",
"arrayvec 0.7.2",
@@ -3079,10 +3098,8 @@ dependencies = [
"futures-timer",
"futures-util",
"globset",
- "http",
"hyper",
"jsonrpsee-types",
- "lazy_static",
"parking_lot 0.12.1",
"rand 0.8.5",
"rustc-hash",
@@ -3092,45 +3109,48 @@ dependencies = [
"thiserror",
"tokio",
"tracing",
- "tracing-futures",
- "unicase",
]
[[package]]
-name = "jsonrpsee-http-server"
-version = "0.15.1"
+name = "jsonrpsee-proc-macros"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117"
+checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c"
+dependencies = [
+ "heck",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jsonrpsee-server"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc"
dependencies = [
"futures-channel",
"futures-util",
+ "http",
"hyper",
"jsonrpsee-core",
"jsonrpsee-types",
"serde",
"serde_json",
+ "soketto",
"tokio",
+ "tokio-stream",
+ "tokio-util 0.7.1",
+ "tower",
"tracing",
- "tracing-futures",
-]
-
-[[package]]
-name = "jsonrpsee-proc-macros"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
]
[[package]]
name = "jsonrpsee-types"
-version = "0.15.1"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d"
+checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c"
dependencies = [
"anyhow",
"beef",
@@ -3142,9 +3162,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-ws-client"
-version = "0.15.1"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff"
+checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9"
dependencies = [
"http",
"jsonrpsee-client-transport",
@@ -3152,36 +3172,16 @@ dependencies = [
"jsonrpsee-types",
]
-[[package]]
-name = "jsonrpsee-ws-server"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325"
-dependencies = [
- "futures-channel",
- "futures-util",
- "http",
- "jsonrpsee-core",
- "jsonrpsee-types",
- "serde_json",
- "soketto",
- "tokio",
- "tokio-stream",
- "tokio-util 0.7.1",
- "tracing",
- "tracing-futures",
-]
-
[[package]]
name = "k256"
-version = "0.10.4"
+version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"ecdsa",
"elliptic-curve",
- "sec1",
+ "sha2 0.10.2",
]
[[package]]
@@ -3192,13 +3192,13 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
[[package]]
name = "kusama-runtime"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
- "beefy-primitives",
"bitvec",
"frame-benchmarking",
"frame-election-provider-support",
"frame-executive",
+ "frame-remote-externalities",
"frame-support",
"frame-system",
"frame-system-benchmarking",
@@ -3215,17 +3215,19 @@ 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-gilt",
+ "pallet-fast-unstake",
"pallet-grandpa",
"pallet-identity",
"pallet-im-online",
"pallet-indices",
"pallet-membership",
"pallet-multisig",
+ "pallet-nis",
"pallet-nomination-pools",
"pallet-nomination-pools-benchmarking",
"pallet-nomination-pools-runtime-api",
@@ -3233,13 +3235,14 @@ dependencies = [
"pallet-offences-benchmarking",
"pallet-preimage",
"pallet-proxy",
+ "pallet-ranked-collective",
"pallet-recovery",
+ "pallet-referenda",
"pallet-scheduler",
"pallet-session",
"pallet-session-benchmarking",
"pallet-society",
"pallet-staking",
- "pallet-staking-reward-fn",
"pallet-timestamp",
"pallet-tips",
"pallet-transaction-payment",
@@ -3247,13 +3250,13 @@ dependencies = [
"pallet-treasury",
"pallet-utility",
"pallet-vesting",
+ "pallet-whitelist",
"pallet-xcm",
"pallet-xcm-benchmarks",
"parity-scale-codec",
"polkadot-primitives",
"polkadot-runtime-common",
"polkadot-runtime-parachains",
- "remote-externalities",
"rustc-hex",
"scale-info",
"separator",
@@ -3264,6 +3267,7 @@ dependencies = [
"sp-api",
"sp-arithmetic",
"sp-authority-discovery",
+ "sp-beefy",
"sp-block-builder",
"sp-consensus-babe",
"sp-core",
@@ -3292,13 +3296,15 @@ dependencies = [
[[package]]
name = "kusama-runtime-constants"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
@@ -3312,37 +3318,31 @@ dependencies = [
[[package]]
name = "kvdb"
-version = "0.11.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86"
+checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9"
dependencies = [
- "parity-util-mem",
"smallvec",
]
[[package]]
name = "kvdb-memorydb"
-version = "0.11.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357"
+checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2"
dependencies = [
"kvdb",
- "parity-util-mem",
"parking_lot 0.12.1",
]
[[package]]
name = "kvdb-rocksdb"
-version = "0.15.2"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1"
+checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844"
dependencies = [
- "fs-swap",
"kvdb",
- "log",
"num_cpus",
- "owning_ref",
- "parity-util-mem",
"parking_lot 0.12.1",
"regex",
"rocksdb",
@@ -3351,9 +3351,9 @@ dependencies = [
[[package]]
name = "kvdb-shared-tests"
-version = "0.9.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9001edd3459aa1503ea84215cf4618a6e2e020f51682494cc6f5ab1150e68e"
+checksum = "64d3b4e3e80c369f1b5364b6acdeba9b8a02285e91a5570f7c0404b7f9024541"
dependencies = [
"kvdb",
]
@@ -3388,23 +3388,13 @@ dependencies = [
"pkg-config",
]
-[[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.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"winapi",
]
@@ -3416,9 +3406,9 @@ 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",
@@ -3426,12 +3416,8 @@ dependencies = [
"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",
@@ -3439,49 +3425,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 0.10.3",
- "prost-build 0.10.4",
- "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",
@@ -3492,17 +3453,15 @@ dependencies = [
"futures-timer",
"instant",
"lazy_static",
- "libsecp256k1",
"log",
"multiaddr",
"multihash",
"multistream-select",
"parking_lot 0.12.1",
"pin-project",
- "prost 0.10.3",
- "prost-build 0.10.4",
+ "prost",
+ "prost-build",
"rand 0.8.5",
- "ring",
"rw-stream-sink",
"sha2 0.10.2",
"smallvec",
@@ -3512,24 +3471,12 @@ 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",
"libp2p-core",
"log",
@@ -3538,57 +3485,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 0.10.3",
- "prost-build 0.10.4",
- "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 0.10.3",
- "prost-build 0.10.4",
- "rand 0.7.3",
- "regex",
- "sha2 0.10.2",
- "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",
@@ -3596,9 +3497,9 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "lru 0.7.8",
- "prost 0.10.3",
- "prost-build 0.10.4",
+ "lru",
+ "prost",
+ "prost-build",
"prost-codec",
"smallvec",
"thiserror",
@@ -3607,9 +3508,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",
@@ -3622,9 +3523,9 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "rand 0.7.3",
+ "prost",
+ "prost-build",
+ "rand 0.8.5",
"sha2 0.10.2",
"smallvec",
"thiserror",
@@ -3635,46 +3536,43 @@ 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",
"rand 0.8.5",
"smallvec",
"socket2",
+ "tokio",
"void",
]
[[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",
@@ -3683,16 +3581,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",
@@ -3700,8 +3598,8 @@ dependencies = [
"lazy_static",
"libp2p-core",
"log",
- "prost 0.10.3",
- "prost-build 0.10.4",
+ "prost",
+ "prost-build",
"rand 0.8.5",
"sha2 0.10.2",
"snow",
@@ -3712,105 +3610,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 0.10.3",
- "prost-build 0.10.4",
- "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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "either",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "pin-project",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "prost-codec",
- "rand 0.8.5",
- "smallvec",
- "static_assertions",
- "thiserror",
- "void",
-]
-
-[[package]]
-name = "libp2p-rendezvous"
-version = "0.7.0"
+version = "0.40.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e"
+checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91"
dependencies = [
- "asynchronous-codec",
- "bimap",
"futures",
"futures-timer",
"instant",
"libp2p-core",
"libp2p-swarm",
"log",
- "prost 0.10.3",
- "prost-build 0.10.4",
"rand 0.8.5",
- "sha2 0.10.2",
- "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",
@@ -3819,16 +3637,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",
@@ -3838,7 +3656,7 @@ dependencies = [
"libp2p-core",
"log",
"pin-project",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"thiserror",
"void",
@@ -3846,48 +3664,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",
+ "tokio",
]
[[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",
@@ -3899,9 +3705,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",
@@ -3918,12 +3724,13 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
-version = "0.38.0"
+version = "0.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c"
+checksum = "0d6874d66543c4f7e26e3b8ca9a6bead351563a13ab4fafd43c7927f7c0d6c12"
dependencies = [
"futures",
"libp2p-core",
+ "log",
"parking_lot 0.12.1",
"thiserror",
"yamux",
@@ -3931,9 +3738,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",
@@ -4004,6 +3811,15 @@ dependencies = [
"vcpkg",
]
+[[package]]
+name = "link-cplusplus"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "linked-hash-map"
version = "0.5.4"
@@ -4050,25 +3866,16 @@ version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"serde",
"value-bag",
]
[[package]]
name = "lru"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
-dependencies = [
- "hashbrown",
-]
-
-[[package]]
-name = "lru"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936d98d2ddd79c18641c6709e7bb09981449694e402d1a0f0f657ea8d61f4a51"
+checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909"
dependencies = [
"hashbrown",
]
@@ -4084,9 +3891,9 @@ dependencies = [
[[package]]
name = "lz4"
-version = "1.23.2"
+version = "1.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
+checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
dependencies = [
"libc",
"lz4-sys",
@@ -4094,9 +3901,9 @@ dependencies = [
[[package]]
name = "lz4-sys"
-version = "1.9.2"
+version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
dependencies = [
"cc",
"libc",
@@ -4171,25 +3978,6 @@ dependencies = [
"rustix",
]
-[[package]]
-name = "memmap"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "memmap2"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "memmap2"
version = "0.5.0"
@@ -4210,22 +3998,12 @@ dependencies = [
[[package]]
name = "memory-db"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a"
+checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66"
dependencies = [
"hash-db",
"hashbrown",
- "parity-util-mem",
-]
-
-[[package]]
-name = "memory-lru"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce95ae042940bad7e312857b929ee3d11b8f799a80cb7b9c7ec5125516906395"
-dependencies = [
- "lru 0.8.0",
]
[[package]]
@@ -4279,27 +4057,87 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
[[package]]
name = "mio"
-version = "0.8.2"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
dependencies = [
"libc",
"log",
- "miow",
- "ntapi",
"wasi 0.11.0+wasi-snapshot-preview1",
- "winapi",
+ "windows-sys 0.42.0",
]
[[package]]
-name = "miow"
-version = "0.3.7"
+name = "mmr-gadget"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+dependencies = [
+ "futures",
+ "log",
+ "parity-scale-codec",
+ "sc-client-api",
+ "sc-offchain",
+ "sp-api",
+ "sp-beefy",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-mmr-primitives",
+ "sp-runtime",
+]
+
+[[package]]
+name = "mmr-rpc"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+dependencies = [
+ "anyhow",
+ "jsonrpsee",
+ "parity-scale-codec",
+ "serde",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-mmr-primitives",
+ "sp-runtime",
+]
+
+[[package]]
+name = "mockall"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+checksum = "e2be9a9090bc1cac2930688fa9478092a64c6a92ddc6ae0692d46b37d9cab709"
dependencies = [
- "winapi",
+ "cfg-if",
+ "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",
+ "proc-macro2",
+ "quote",
+ "syn",
]
[[package]]
@@ -4344,7 +4182,7 @@ dependencies = [
"digest 0.10.3",
"multihash-derive",
"sha2 0.10.2",
- "sha3 0.10.0",
+ "sha3",
"unsigned-varint",
]
@@ -4370,9 +4208,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",
@@ -4392,7 +4230,7 @@ dependencies = [
"matrixmultiply",
"nalgebra-macros",
"num-complex",
- "num-rational 0.4.0",
+ "num-rational",
"num-traits",
"rand 0.8.5",
"rand_distr",
@@ -4458,9 +4296,9 @@ dependencies = [
[[package]]
name = "netlink-packet-route"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733ea73609acfd7fa7ddadfb7bf709b0471668c456ad9513685af543a06342b2"
+checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
dependencies = [
"anyhow",
"bitflags",
@@ -4484,23 +4322,24 @@ dependencies = [
[[package]]
name = "netlink-proto"
-version = "0.9.2"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8785b8141e8432aa45fceb922a7e876d7da3fad37fa7e7ec702ace3aa0826b"
+checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6"
dependencies = [
"bytes",
"futures",
"log",
"netlink-packet-core",
"netlink-sys",
+ "thiserror",
"tokio",
]
[[package]]
name = "netlink-sys"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c9f9547a08241bee7b6558b9b98e1f290d187de8b7cfca2bbb4937bcaa8f8"
+checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027"
dependencies = [
"async-io",
"bytes",
@@ -4509,19 +4348,6 @@ dependencies = [
"log",
]
-[[package]]
-name = "nix"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset",
-]
-
[[package]]
name = "nix"
version = "0.23.1"
@@ -4530,7 +4356,7 @@ checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
dependencies = [
"bitflags",
"cc",
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"memoffset",
]
@@ -4542,17 +4368,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
dependencies = [
"bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"memoffset",
]
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
[[package]]
name = "nohash-hasher"
version = "0.2.0"
@@ -4571,24 +4391,10 @@ dependencies = [
]
[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.2.6"
+name = "normalize-line-endings"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "num-bigint"
@@ -4612,44 +4418,32 @@ dependencies = [
[[package]]
name = "num-format"
-version = "0.4.0"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465"
+checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b"
dependencies = [
- "arrayvec 0.4.12",
- "itoa 0.4.8",
+ "arrayvec 0.7.2",
+ "itoa",
]
[[package]]
name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.2.4"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
dependencies = [
"autocfg",
- "num-bigint 0.2.6",
- "num-integer",
"num-traits",
]
[[package]]
name = "num-rational"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
dependencies = [
"autocfg",
- "num-bigint 0.4.3",
+ "num-bigint",
"num-integer",
"num-traits",
]
@@ -4676,22 +4470,22 @@ dependencies = [
[[package]]
name = "object"
-version = "0.27.1"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
dependencies = [
+ "crc32fast",
+ "hashbrown",
+ "indexmap",
"memchr",
]
[[package]]
name = "object"
-version = "0.29.0"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb"
dependencies = [
- "crc32fast",
- "hashbrown",
- "indexmap",
"memchr",
]
@@ -4720,7 +4514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
dependencies = [
"bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
"foreign-types",
"libc",
"once_cell",
@@ -4748,7 +4542,9 @@ dependencies = [
[[package]]
name = "orchestra"
-version = "0.0.1"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17e7d5b6bb115db09390bed8842c94180893dd83df3dfce7354f2a2aa090a4ee"
dependencies = [
"async-trait",
"dyn-clonable",
@@ -4757,27 +4553,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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2af4dabb2286b0be0e9711d2d24e25f6217048b71210cffd3daddc3b5c84e1f"
dependencies = [
- "assert_matches",
"expander 0.0.6",
"itertools",
- "orchestra",
"petgraph",
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
- "thiserror",
- "tracing",
]
[[package]]
@@ -4804,15 +4596,6 @@ 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.2.0"
@@ -4822,13 +4605,14 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
+ "sp-core",
"sp-runtime",
"sp-std",
]
@@ -4836,7 +4620,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -4852,7 +4636,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -4867,7 +4651,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4891,7 +4675,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -4911,15 +4695,15 @@ dependencies = [
[[package]]
name = "pallet-bags-list-remote-tests"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-election-provider-support",
+ "frame-remote-externalities",
"frame-support",
"frame-system",
"log",
"pallet-bags-list",
"pallet-staking",
- "remote-externalities",
"sp-core",
"sp-runtime",
"sp-std",
@@ -4930,7 +4714,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4945,15 +4729,15 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "beefy-primitives",
"frame-support",
"frame-system",
"pallet-session",
"parity-scale-codec",
"scale-info",
"serde",
+ "sp-beefy",
"sp-runtime",
"sp-std",
]
@@ -4961,13 +4745,12 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"beefy-merkle-tree",
- "beefy-primitives",
"frame-support",
"frame-system",
- "hex",
"log",
"pallet-beefy",
"pallet-mmr",
@@ -4975,6 +4758,7 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
+ "sp-beefy",
"sp-core",
"sp-io",
"sp-runtime",
@@ -4984,7 +4768,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5002,7 +4786,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5021,7 +4805,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5035,17 +4819,36 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-conviction-voting"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+dependencies = [
+ "assert_matches",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
"serde",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-std",
@@ -5054,7 +4857,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5063,7 +4866,7 @@ dependencies = [
"log",
"pallet-election-provider-support-benchmarking",
"parity-scale-codec",
- "rand 0.7.3",
+ "rand 0.8.5",
"scale-info",
"sp-arithmetic",
"sp-core",
@@ -5071,14 +4874,13 @@ dependencies = [
"sp-npos-elections",
"sp-runtime",
"sp-std",
- "static_assertions",
"strum",
]
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5091,7 +4893,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5107,24 +4909,27 @@ dependencies = [
]
[[package]]
-name = "pallet-gilt"
+name = "pallet-fast-unstake"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
+ "frame-election-provider-support",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
- "sp-arithmetic",
+ "sp-io",
"sp-runtime",
+ "sp-staking",
"sp-std",
]
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5147,7 +4952,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5163,7 +4968,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5183,7 +4988,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5200,7 +5005,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5217,9 +5022,8 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "ckb-merkle-mountain-range",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -5233,31 +5037,33 @@ dependencies = [
]
[[package]]
-name = "pallet-mmr-rpc"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+name = "pallet-multisig"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "jsonrpsee",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
"parity-scale-codec",
- "serde",
- "sp-api",
- "sp-blockchain",
- "sp-core",
- "sp-mmr-primitives",
+ "scale-info",
+ "sp-io",
"sp-runtime",
+ "sp-std",
]
[[package]]
-name = "pallet-multisig"
+name = "pallet-nis"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
- "sp-io",
+ "sp-arithmetic",
+ "sp-core",
"sp-runtime",
"sp-std",
]
@@ -5265,7 +5071,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -5282,7 +5088,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5302,7 +5108,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-runtime-api"
version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -5312,7 +5118,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -5329,7 +5135,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5352,11 +5158,12 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -5368,13 +5175,31 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+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=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
+ "sp-arithmetic",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-std",
@@ -5383,13 +5208,32 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+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=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "assert_matches",
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
+ "serde",
+ "sp-arithmetic",
"sp-io",
"sp-runtime",
"sp-std",
@@ -5398,7 +5242,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5409,12 +5253,13 @@ dependencies = [
"sp-io",
"sp-runtime",
"sp-std",
+ "sp-weights",
]
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -5435,14 +5280,14 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"pallet-session",
"pallet-staking",
- "rand 0.7.3",
+ "rand 0.8.5",
"sp-runtime",
"sp-session",
"sp-std",
@@ -5451,7 +5296,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -5465,7 +5310,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5488,7 +5333,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5499,16 +5344,33 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"log",
"sp-arithmetic",
]
+[[package]]
+name = "pallet-state-trie-migration"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -5522,7 +5384,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5540,7 +5402,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5559,7 +5421,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-support",
"frame-system",
@@ -5575,7 +5437,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -5585,23 +5447,25 @@ dependencies = [
"sp-core",
"sp-rpc",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
"sp-api",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5618,7 +5482,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5634,7 +5498,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5646,9 +5510,24 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-whitelist"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+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.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"frame-system",
@@ -5670,7 +5549,7 @@ dependencies = [
[[package]]
name = "pallet-xcm-benchmarks"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5695,19 +5574,19 @@ dependencies = [
[[package]]
name = "parity-db"
-version = "0.3.16"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb474d0ed0836e185cb998a6b140ed1073d1fbf27d690ecf9ede8030289382c"
+checksum = "3a7511a0bec4a336b5929999d02b560d2439c993cccf98c26481484e811adc43"
dependencies = [
- "blake2-rfc",
+ "blake2",
"crc32fast",
"fs2",
"hex",
"libc",
"log",
"lz4",
- "memmap2 0.2.3",
- "parking_lot 0.11.2",
+ "memmap2",
+ "parking_lot 0.12.1",
"rand 0.8.5",
"snap",
]
@@ -5745,44 +5624,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
-[[package]]
-name = "parity-util-mem"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f"
-dependencies = [
- "cfg-if 1.0.0",
- "hashbrown",
- "impl-trait-for-tuples",
- "parity-util-mem-derive",
- "parking_lot 0.12.1",
- "primitive-types",
- "smallvec",
- "tikv-jemalloc-ctl",
- "tikv-jemallocator",
- "winapi",
-]
-
-[[package]]
-name = "parity-util-mem-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
-dependencies = [
- "proc-macro2",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "parity-wasm"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ad52817c4d343339b3bc2e26861bd21478eda0b7509acf83505727000512ac"
-dependencies = [
- "byteorder",
-]
-
[[package]]
name = "parity-wasm"
version = "0.45.0"
@@ -5822,7 +5663,7 @@ version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"instant",
"libc",
"redox_syscall",
@@ -5836,7 +5677,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"redox_syscall",
"smallvec",
@@ -5851,20 +5692,20 @@ checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
[[package]]
name = "pbkdf2"
-version = "0.4.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
+checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
dependencies = [
- "crypto-mac 0.8.0",
+ "crypto-mac 0.11.1",
]
[[package]]
name = "pbkdf2"
-version = "0.8.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
dependencies = [
- "crypto-mac 0.11.1",
+ "digest 0.10.3",
]
[[package]]
@@ -5934,18 +5775,18 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.10"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.10"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
@@ -5972,13 +5813,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkcs8"
-version = "0.8.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
dependencies = [
"der",
"spki",
- "zeroize",
]
[[package]]
@@ -5995,22 +5835,22 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
[[package]]
name = "polkadot"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_cmd",
"color-eyre",
"nix 0.24.1",
- "parity-util-mem",
"polkadot-cli",
"polkadot-core-primitives",
- "remote-externalities",
+ "substrate-rpc-client",
"tempfile",
+ "tikv-jemallocator",
"tokio",
]
[[package]]
name = "polkadot-approval-distribution"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"env_logger 0.9.0",
@@ -6034,7 +5874,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"bitvec",
@@ -6050,6 +5890,7 @@ dependencies = [
"rand 0.8.5",
"rand_chacha 0.3.1",
"sp-application-crypto",
+ "sp-authority-discovery",
"sp-core",
"sp-keyring",
"sp-keystore",
@@ -6058,14 +5899,14 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"derive_more",
"fatality",
"futures",
"futures-timer",
- "lru 0.7.8",
+ "lru",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6087,7 +5928,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"env_logger 0.9.0",
@@ -6095,7 +5936,7 @@ dependencies = [
"futures",
"futures-timer",
"log",
- "lru 0.7.8",
+ "lru",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6116,7 +5957,7 @@ dependencies = [
[[package]]
name = "polkadot-cli"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"clap",
"frame-benchmarking-cli",
@@ -6129,12 +5970,13 @@ dependencies = [
"polkadot-service",
"pyroscope",
"sc-cli",
+ "sc-executor",
"sc-service",
"sc-sysinfo",
"sc-tracing",
"sp-core",
+ "sp-io",
"sp-keyring",
- "sp-trie",
"substrate-build-script-utils",
"thiserror",
"try-runtime-cli",
@@ -6142,13 +5984,14 @@ dependencies = [
[[package]]
name = "polkadot-client"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
- "beefy-primitives",
+ "async-trait",
"frame-benchmarking",
"frame-benchmarking-cli",
"frame-system",
"frame-system-rpc-runtime-api",
+ "futures",
"kusama-runtime",
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
@@ -6164,6 +6007,7 @@ dependencies = [
"sc-service",
"sp-api",
"sp-authority-discovery",
+ "sp-beefy",
"sp-block-builder",
"sp-blockchain",
"sp-consensus",
@@ -6184,10 +6028,11 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"always-assert",
"assert_matches",
+ "bitvec",
"env_logger 0.9.0",
"fatality",
"futures",
@@ -6212,10 +6057,9 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"parity-scale-codec",
- "parity-util-mem",
"scale-info",
"sp-core",
"sp-runtime",
@@ -6224,7 +6068,7 @@ dependencies = [
[[package]]
name = "polkadot-dispute-distribution"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"async-trait",
@@ -6232,8 +6076,9 @@ dependencies = [
"fatality",
"futures",
"futures-timer",
+ "indexmap",
"lazy_static",
- "lru 0.7.8",
+ "lru",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6255,7 +6100,7 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"parity-scale-codec",
"polkadot-node-primitives",
@@ -6268,7 +6113,7 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"async-trait",
@@ -6295,7 +6140,7 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"always-assert",
"assert_matches",
@@ -6324,7 +6169,7 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"futures",
"parity-scale-codec",
@@ -6343,7 +6188,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"async-trait",
@@ -6353,7 +6198,7 @@ dependencies = [
"futures-timer",
"kvdb",
"kvdb-memorydb",
- "lru 0.7.8",
+ "lru",
"merlin",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -6382,7 +6227,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"bitvec",
@@ -6410,7 +6255,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"bitvec",
@@ -6436,7 +6281,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"futures",
"polkadot-node-subsystem",
@@ -6452,11 +6297,12 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"async-trait",
"futures",
+ "futures-timer",
"parity-scale-codec",
"polkadot-node-core-pvf",
"polkadot-node-primitives",
@@ -6474,7 +6320,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"futures",
"maplit",
@@ -6493,7 +6339,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-selection"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"futures",
@@ -6514,7 +6360,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"fatality",
@@ -6522,7 +6368,7 @@ dependencies = [
"futures-timer",
"kvdb",
"kvdb-memorydb",
- "lru 0.7.8",
+ "lru",
"parity-scale-codec",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -6541,23 +6387,23 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"async-trait",
"futures",
"futures-timer",
"polkadot-node-subsystem",
+ "polkadot-overseer",
"polkadot-primitives",
"sp-blockchain",
"sp-inherents",
- "sp-runtime",
"thiserror",
"tracing-gum",
]
[[package]]
name = "polkadot-node-core-provisioner"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"bitvec",
"fatality",
@@ -6578,12 +6424,13 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"always-assert",
"assert_matches",
"async-process",
"async-std",
+ "cpu-time",
"futures",
"futures-timer",
"hex-literal",
@@ -6612,7 +6459,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf-checker"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"futures",
"futures-timer",
@@ -6635,11 +6482,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"futures",
- "memory-lru",
- "parity-util-mem",
+ "lru",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-node-subsystem-test-helpers",
@@ -6657,9 +6503,8 @@ dependencies = [
[[package]]
name = "polkadot-node-jaeger"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
- "async-std",
"lazy_static",
"log",
"mick-jaeger",
@@ -6670,11 +6515,12 @@ dependencies = [
"sc-network",
"sp-core",
"thiserror",
+ "tokio",
]
[[package]]
name = "polkadot-node-metrics"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_cmd",
"bs58",
@@ -6702,7 +6548,7 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"async-trait",
"derive_more",
@@ -6717,6 +6563,7 @@ dependencies = [
"rand_chacha 0.3.1",
"sc-authority-discovery",
"sc-network",
+ "sc-network-common",
"strum",
"thiserror",
"tracing-gum",
@@ -6724,7 +6571,7 @@ dependencies = [
[[package]]
name = "polkadot-node-primitives"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"bounded-vec",
"futures",
@@ -6746,7 +6593,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -6755,7 +6602,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-test-helpers"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"async-trait",
"futures",
@@ -6773,7 +6620,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-types"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"async-trait",
"derive_more",
@@ -6795,7 +6642,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-util"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"async-trait",
@@ -6805,13 +6652,13 @@ dependencies = [
"futures",
"itertools",
"kvdb",
+ "kvdb-memorydb",
"kvdb-shared-tests",
"lazy_static",
"log",
- "lru 0.7.8",
+ "lru",
"parity-db",
"parity-scale-codec",
- "parity-util-mem",
"parking_lot 0.11.2",
"pin-project",
"polkadot-node-jaeger",
@@ -6835,16 +6682,15 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"async-trait",
"femme",
"futures",
"futures-timer",
- "lru 0.7.8",
+ "lru",
"orchestra",
- "parity-util-mem",
"parking_lot 0.12.1",
"polkadot-node-metrics",
"polkadot-node-network-protocol",
@@ -6856,17 +6702,17 @@ dependencies = [
"sc-client-api",
"sp-api",
"sp-core",
+ "tikv-jemalloc-ctl",
"tracing-gum",
]
[[package]]
name = "polkadot-parachain"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"derive_more",
"frame-support",
"parity-scale-codec",
- "parity-util-mem",
"polkadot-core-primitives",
"scale-info",
"serde",
@@ -6877,7 +6723,7 @@ dependencies = [
[[package]]
name = "polkadot-performance-test"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"env_logger 0.9.0",
"kusama-runtime",
@@ -6891,13 +6737,11 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"bitvec",
- "frame-system",
"hex-literal",
"parity-scale-codec",
- "parity-util-mem",
"polkadot-core-primitives",
"polkadot-parachain",
"scale-info",
@@ -6914,13 +6758,11 @@ dependencies = [
"sp-runtime",
"sp-staking",
"sp-std",
- "sp-trie",
- "sp-version",
]
[[package]]
name = "polkadot-primitives-test-helpers"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"polkadot-primitives",
"rand 0.8.5",
@@ -6932,12 +6774,12 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"beefy-gadget",
"beefy-gadget-rpc",
"jsonrpsee",
- "pallet-mmr-rpc",
+ "mmr-rpc",
"pallet-transaction-payment-rpc",
"polkadot-primitives",
"sc-chain-spec",
@@ -6963,13 +6805,13 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
- "beefy-primitives",
"bitvec",
"frame-benchmarking",
"frame-election-provider-support",
"frame-executive",
+ "frame-remote-externalities",
"frame-support",
"frame-system",
"frame-system-benchmarking",
@@ -6989,6 +6831,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",
@@ -7020,7 +6863,6 @@ dependencies = [
"polkadot-runtime-common",
"polkadot-runtime-constants",
"polkadot-runtime-parachains",
- "remote-externalities",
"rustc-hex",
"scale-info",
"separator",
@@ -7030,6 +6872,7 @@ dependencies = [
"smallvec",
"sp-api",
"sp-authority-discovery",
+ "sp-beefy",
"sp-block-builder",
"sp-consensus-babe",
"sp-core",
@@ -7058,9 +6901,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
- "beefy-primitives",
"bitvec",
"frame-benchmarking",
"frame-election-provider-support",
@@ -7079,6 +6921,7 @@ dependencies = [
"pallet-election-provider-multi-phase",
"pallet-session",
"pallet-staking",
+ "pallet-staking-reward-fn",
"pallet-timestamp",
"pallet-transaction-payment",
"pallet-treasury",
@@ -7094,6 +6937,7 @@ dependencies = [
"serde_json",
"slot-range-helper",
"sp-api",
+ "sp-beefy",
"sp-core",
"sp-inherents",
"sp-io",
@@ -7109,18 +6953,20 @@ dependencies = [
[[package]]
name = "polkadot-runtime-constants"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "polkadot-runtime-metrics"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"bs58",
"parity-scale-codec",
@@ -7131,7 +6977,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"bitflags",
@@ -7162,6 +7008,7 @@ dependencies = [
"sc-keystore",
"scale-info",
"serde",
+ "serde_json",
"sp-api",
"sp-application-crypto",
"sp-core",
@@ -7182,12 +7029,11 @@ dependencies = [
[[package]]
name = "polkadot-service"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"async-trait",
"beefy-gadget",
- "beefy-primitives",
"env_logger 0.9.0",
"frame-support",
"frame-system-rpc-runtime-api",
@@ -7198,7 +7044,8 @@ dependencies = [
"kvdb",
"kvdb-rocksdb",
"log",
- "lru 0.7.8",
+ "lru",
+ "mmr-gadget",
"pallet-babe",
"pallet-im-online",
"pallet-staking",
@@ -7267,6 +7114,7 @@ dependencies = [
"serde_json",
"sp-api",
"sp-authority-discovery",
+ "sp-beefy",
"sp-block-builder",
"sp-blockchain",
"sp-consensus",
@@ -7276,6 +7124,7 @@ dependencies = [
"sp-inherents",
"sp-io",
"sp-keystore",
+ "sp-mmr-primitives",
"sp-offchain",
"sp-runtime",
"sp-session",
@@ -7294,7 +7143,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"arrayvec 0.5.2",
"assert_matches",
@@ -7325,7 +7174,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -7334,7 +7183,7 @@ dependencies = [
[[package]]
name = "polkadot-test-client"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"futures",
"parity-scale-codec",
@@ -7360,7 +7209,7 @@ dependencies = [
[[package]]
name = "polkadot-test-malus"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"async-trait",
@@ -7368,7 +7217,6 @@ dependencies = [
"color-eyre",
"futures",
"futures-timer",
- "parity-util-mem",
"polkadot-cli",
"polkadot-erasure-coding",
"polkadot-node-core-backing",
@@ -7381,6 +7229,7 @@ dependencies = [
"polkadot-node-subsystem-types",
"polkadot-node-subsystem-util",
"polkadot-primitives",
+ "rand 0.8.5",
"sp-core",
"sp-keystore",
"tracing-gum",
@@ -7388,9 +7237,8 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
- "beefy-primitives",
"bitvec",
"frame-election-provider-support",
"frame-executive",
@@ -7428,6 +7276,7 @@ dependencies = [
"smallvec",
"sp-api",
"sp-authority-discovery",
+ "sp-beefy",
"sp-block-builder",
"sp-consensus-babe",
"sp-core",
@@ -7453,7 +7302,7 @@ dependencies = [
[[package]]
name = "polkadot-test-service"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-benchmarking",
"frame-system",
@@ -7508,7 +7357,7 @@ dependencies = [
[[package]]
name = "polkadot-voter-bags"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"clap",
"generate-bags",
@@ -7524,7 +7373,7 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"log",
"wepoll-ffi",
@@ -7548,7 +7397,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"cpufeatures",
"opaque-debug 0.3.0",
"universal-hash",
@@ -7561,7 +7410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55f35f865aa964be21fcde114cbd1cfbd9bf8a471460ed965b0f84f96c711401"
dependencies = [
"backtrace",
- "cfg-if 1.0.0",
+ "cfg-if",
"findshlibs",
"lazy_static",
"libc",
@@ -7587,8 +7436,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95e5a7689e456ab905c22c2b48225bb921aba7c8dfa58440d68ba13f6222a715"
dependencies = [
"difflib",
+ "float-cmp",
"itertools",
+ "normalize-line-endings",
"predicates-core",
+ "regex",
]
[[package]]
@@ -7621,9 +7473,9 @@ dependencies = [
[[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",
@@ -7635,15 +7487,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 0.9.0",
"futures",
"futures-timer",
- "log",
"nanorand",
"thiserror",
"tracing",
@@ -7685,9 +7536,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
dependencies = [
"unicode-ident",
]
@@ -7698,7 +7549,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"fnv",
"lazy_static",
"memchr",
@@ -7708,21 +7559,21 @@ dependencies = [
[[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.1",
- "owning_ref",
+ "itoa",
+ "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",
@@ -7740,46 +7591,14 @@ dependencies = [
"regex",
]
-[[package]]
-name = "prost"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc03e116981ff7d8da8e5c220e374587b98d294af7ba7dd7fda761158f00086f"
-dependencies = [
- "bytes",
- "prost-derive 0.10.1",
-]
-
-[[package]]
-name = "prost"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
-dependencies = [
- "bytes",
- "prost-derive 0.11.0",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.10.4"
+[[package]]
+name = "prost"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
+checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
dependencies = [
"bytes",
- "cfg-if 1.0.0",
- "cmake",
- "heck",
- "itertools",
- "lazy_static",
- "log",
- "multimap",
- "petgraph",
- "prost 0.10.3",
- "prost-types 0.10.1",
- "regex",
- "tempfile",
- "which",
+ "prost-derive",
]
[[package]]
@@ -7795,8 +7614,8 @@ dependencies = [
"log",
"multimap",
"petgraph",
- "prost 0.11.0",
- "prost-types 0.11.1",
+ "prost",
+ "prost-types",
"regex",
"tempfile",
"which",
@@ -7804,30 +7623,17 @@ 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",
- "prost 0.10.3",
+ "prost",
"thiserror",
"unsigned-varint",
]
-[[package]]
-name = "prost-derive"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "prost-derive"
version = "0.11.0"
@@ -7841,16 +7647,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "prost-types"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
-dependencies = [
- "bytes",
- "prost 0.10.3",
-]
-
[[package]]
name = "prost-types"
version = "0.11.1"
@@ -7858,7 +7654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
dependencies = [
"bytes",
- "prost 0.11.0",
+ "prost",
]
[[package]]
@@ -7932,7 +7728,6 @@ dependencies = [
"rand_chacha 0.2.2",
"rand_core 0.5.1",
"rand_hc",
- "rand_pcg 0.2.1",
]
[[package]]
@@ -8003,15 +7798,6 @@ dependencies = [
"rand_core 0.5.1",
]
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
[[package]]
name = "rand_pcg"
version = "0.3.1"
@@ -8118,9 +7904,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.5.5"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
dependencies = [
"aho-corasick",
"memchr",
@@ -8138,13 +7924,13 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.25"
+version = "0.6.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
[[package]]
name = "remote-ext-tests-bags-list"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"clap",
"frame-system",
@@ -8161,23 +7947,6 @@ dependencies = [
"westend-runtime-constants",
]
-[[package]]
-name = "remote-externalities"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
-dependencies = [
- "env_logger 0.9.0",
- "jsonrpsee",
- "log",
- "parity-scale-codec",
- "serde",
- "serde_json",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-version",
-]
-
[[package]]
name = "remove_dir_all"
version = "0.5.3"
@@ -8236,12 +8005,12 @@ dependencies = [
[[package]]
name = "rfc6979"
-version = "0.1.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
+checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
dependencies = [
"crypto-bigint",
- "hmac 0.11.0",
+ "hmac 0.12.1",
"zeroize",
]
@@ -8262,9 +8031,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",
@@ -8272,16 +8041,17 @@ dependencies = [
[[package]]
name = "rococo-runtime"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"beefy-merkle-tree",
- "beefy-primitives",
"frame-benchmarking",
"frame-executive",
+ "frame-remote-externalities",
"frame-support",
"frame-system",
"frame-system-benchmarking",
"frame-system-rpc-runtime-api",
+ "frame-try-runtime",
"hex-literal",
"log",
"pallet-authority-discovery",
@@ -8295,7 +8065,6 @@ dependencies = [
"pallet-collective",
"pallet-democracy",
"pallet-elections-phragmen",
- "pallet-gilt",
"pallet-grandpa",
"pallet-identity",
"pallet-im-online",
@@ -8303,6 +8072,7 @@ dependencies = [
"pallet-membership",
"pallet-mmr",
"pallet-multisig",
+ "pallet-nis",
"pallet-offences",
"pallet-preimage",
"pallet-proxy",
@@ -8311,6 +8081,7 @@ dependencies = [
"pallet-session",
"pallet-society",
"pallet-staking",
+ "pallet-state-trie-migration",
"pallet-sudo",
"pallet-timestamp",
"pallet-tips",
@@ -8335,6 +8106,7 @@ dependencies = [
"smallvec",
"sp-api",
"sp-authority-discovery",
+ "sp-beefy",
"sp-block-builder",
"sp-consensus-babe",
"sp-core",
@@ -8347,12 +8119,14 @@ dependencies = [
"sp-session",
"sp-staking",
"sp-std",
+ "sp-tracing",
"sp-transaction-pool",
"sp-trie",
"sp-version",
"static_assertions",
"substrate-wasm-builder",
"tiny-keccak",
+ "tokio",
"xcm",
"xcm-builder",
"xcm-executor",
@@ -8360,13 +8134,15 @@ dependencies = [
[[package]]
name = "rococo-runtime-constants"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
@@ -8381,16 +8157,16 @@ dependencies = [
[[package]]
name = "rtnetlink"
-version = "0.9.1"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f54290e54521dac3de4149d83ddf9f62a359b3cc93bcb494a794a41e6f4744b"
+checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0"
dependencies = [
"async-global-executor",
"futures",
"log",
"netlink-packet-route",
"netlink-proto",
- "nix 0.22.3",
+ "nix 0.24.1",
"thiserror",
]
@@ -8491,15 +8267,6 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
-[[package]]
-name = "salsa20"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686"
-dependencies = [
- "cipher",
-]
-
[[package]]
name = "same-file"
version = "1.0.6"
@@ -8512,7 +8279,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"log",
"sp-core",
@@ -8523,7 +8290,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"futures",
@@ -8532,9 +8299,9 @@ dependencies = [
"libp2p",
"log",
"parity-scale-codec",
- "prost 0.10.3",
- "prost-build 0.10.4",
- "rand 0.7.3",
+ "prost",
+ "prost-build",
+ "rand 0.8.5",
"sc-client-api",
"sc-network-common",
"sp-api",
@@ -8550,7 +8317,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"futures",
"futures-timer",
@@ -8573,7 +8340,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -8589,11 +8356,9 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "impl-trait-for-tuples",
- "memmap2 0.5.0",
- "parity-scale-codec",
+ "memmap2",
"sc-chain-spec-derive",
"sc-network-common",
"sc-telemetry",
@@ -8606,7 +8371,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -8617,24 +8382,25 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"chrono",
"clap",
"fdlimit",
"futures",
- "hex",
"libp2p",
"log",
"names",
"parity-scale-codec",
- "rand 0.7.3",
+ "rand 0.8.5",
"regex",
"rpassword",
"sc-client-api",
"sc-client-db",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-service",
"sc-telemetry",
"sc-tracing",
@@ -8656,11 +8422,10 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"fnv",
"futures",
- "hash-db",
"log",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -8677,14 +8442,13 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"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=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"hash-db",
"kvdb",
@@ -8709,13 +8473,14 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"futures",
"futures-timer",
"libp2p",
"log",
+ "mockall",
"parking_lot 0.12.1",
"sc-client-api",
"sc-utils",
@@ -8733,19 +8498,18 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"fork-tree",
"futures",
"log",
"merlin",
- "num-bigint 0.2.6",
- "num-rational 0.2.4",
+ "num-bigint",
+ "num-rational",
"num-traits",
"parity-scale-codec",
"parking_lot 0.12.1",
- "rand 0.7.3",
"sc-client-api",
"sc-consensus",
"sc-consensus-epochs",
@@ -8753,7 +8517,6 @@ dependencies = [
"sc-keystore",
"sc-telemetry",
"schnorrkel",
- "serde",
"sp-api",
"sp-application-crypto",
"sp-block-builder",
@@ -8764,10 +8527,8 @@ dependencies = [
"sp-consensus-vrf",
"sp-core",
"sp-inherents",
- "sp-io",
"sp-keystore",
"sp-runtime",
- "sp-version",
"substrate-prometheus-endpoint",
"thiserror",
]
@@ -8775,7 +8536,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"futures",
"jsonrpsee",
@@ -8797,7 +8558,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -8810,7 +8571,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"futures",
@@ -8828,17 +8589,14 @@ dependencies = [
"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=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "lazy_static",
- "lru 0.7.8",
+ "lru",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-executor-common",
@@ -8846,12 +8604,10 @@ dependencies = [
"sc-executor-wasmtime",
"sp-api",
"sp-core",
- "sp-core-hashing-proc-macro",
"sp-externalities",
"sp-io",
"sp-panic-handler",
"sp-runtime-interface",
- "sp-tasks",
"sp-trie",
"sp-version",
"sp-wasm-interface",
@@ -8862,13 +8618,10 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "environmental",
- "parity-scale-codec",
"sc-allocator",
"sp-maybe-compressed-blob",
- "sp-sandbox",
"sp-wasm-interface",
"thiserror",
"wasm-instrument",
@@ -8878,14 +8631,12 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"log",
- "parity-scale-codec",
"sc-allocator",
"sc-executor-common",
"sp-runtime-interface",
- "sp-sandbox",
"sp-wasm-interface",
"wasmi",
]
@@ -8893,19 +8644,16 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"log",
"once_cell",
- "parity-scale-codec",
- "parity-wasm 0.45.0",
"rustix",
"sc-allocator",
"sc-executor-common",
"sp-runtime-interface",
- "sp-sandbox",
"sp-wasm-interface",
"wasmtime",
]
@@ -8913,16 +8661,16 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
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",
@@ -8931,7 +8679,6 @@ dependencies = [
"sc-chain-spec",
"sc-client-api",
"sc-consensus",
- "sc-keystore",
"sc-network",
"sc-network-common",
"sc-network-gossip",
@@ -8954,7 +8701,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"finality-grandpa",
"futures",
@@ -8965,7 +8712,6 @@ dependencies = [
"sc-finality-grandpa",
"sc-rpc",
"serde",
- "serde_json",
"sp-blockchain",
"sp-core",
"sp-runtime",
@@ -8975,16 +8721,14 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"ansi_term",
"futures",
"futures-timer",
"log",
- "parity-util-mem",
"sc-client-api",
"sc-network-common",
- "sc-transaction-pool-api",
"sp-blockchain",
"sp-runtime",
]
@@ -8992,10 +8736,10 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"async-trait",
- "hex",
"parking_lot 0.12.1",
"serde_json",
"sp-application-crypto",
@@ -9007,30 +8751,25 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"async-trait",
"asynchronous-codec",
- "bitflags",
+ "backtrace",
"bytes",
- "cid",
"either",
"fnv",
- "fork-tree",
"futures",
"futures-timer",
- "hex",
"ip_network",
"libp2p",
- "linked-hash-map",
- "linked_hash_set",
"log",
- "lru 0.7.8",
+ "lru",
"parity-scale-codec",
"parking_lot 0.12.1",
"pin-project",
- "prost 0.10.3",
- "rand 0.7.3",
+ "rand 0.8.5",
"sc-block-builder",
"sc-client-api",
"sc-consensus",
@@ -9054,35 +8793,36 @@ dependencies = [
[[package]]
name = "sc-network-bitswap"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"cid",
"futures",
"libp2p",
"log",
- "prost 0.11.0",
- "prost-build 0.11.1",
+ "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=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"bitflags",
"bytes",
"futures",
+ "futures-timer",
"libp2p",
+ "linked_hash_set",
"parity-scale-codec",
- "prost-build 0.10.4",
+ "prost-build",
"sc-consensus",
"sc-peerset",
"serde",
@@ -9091,20 +8831,21 @@ dependencies = [
"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=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"ahash",
"futures",
"futures-timer",
"libp2p",
"log",
- "lru 0.7.8",
+ "lru",
"sc-network-common",
"sc-peerset",
"sp-runtime",
@@ -9115,15 +8856,15 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"futures",
- "hex",
"libp2p",
"log",
"parity-scale-codec",
- "prost 0.10.3",
- "prost-build 0.10.4",
+ "prost",
+ "prost-build",
"sc-client-api",
"sc-network-common",
"sc-peerset",
@@ -9136,21 +8877,24 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
+ "async-trait",
"fork-tree",
"futures",
- "hex",
"libp2p",
"log",
- "lru 0.7.8",
+ "lru",
+ "mockall",
"parity-scale-codec",
- "prost 0.10.3",
- "prost-build 0.10.4",
+ "prost",
+ "prost-build",
"sc-client-api",
"sc-consensus",
"sc-network-common",
"sc-peerset",
+ "sc-utils",
"smallvec",
"sp-arithmetic",
"sp-blockchain",
@@ -9158,19 +8902,39 @@ dependencies = [
"sp-core",
"sp-finality-grandpa",
"sp-runtime",
+ "substrate-prometheus-endpoint",
"thiserror",
]
+[[package]]
+name = "sc-network-transactions"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+dependencies = [
+ "array-bytes",
+ "futures",
+ "libp2p",
+ "log",
+ "parity-scale-codec",
+ "pin-project",
+ "sc-network-common",
+ "sc-peerset",
+ "sc-utils",
+ "sp-consensus",
+ "sp-runtime",
+ "substrate-prometheus-endpoint",
+]
+
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"bytes",
"fnv",
"futures",
"futures-timer",
- "hex",
"hyper",
"hyper-rustls",
"libp2p",
@@ -9178,7 +8942,7 @@ dependencies = [
"once_cell",
"parity-scale-codec",
"parking_lot 0.12.1",
- "rand 0.7.3",
+ "rand 0.8.5",
"sc-client-api",
"sc-network-common",
"sc-peerset",
@@ -9194,7 +8958,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"futures",
"libp2p",
@@ -9207,7 +8971,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9216,10 +8980,9 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"futures",
- "hash-db",
"jsonrpsee",
"log",
"parity-scale-codec",
@@ -9246,13 +9009,10 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "futures",
"jsonrpsee",
- "log",
"parity-scale-codec",
- "parking_lot 0.12.1",
"sc-chain-spec",
"sc-transaction-pool-api",
"scale-info",
@@ -9261,7 +9021,6 @@ dependencies = [
"sp-core",
"sp-rpc",
"sp-runtime",
- "sp-tracing",
"sp-version",
"thiserror",
]
@@ -9269,34 +9028,60 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "futures",
+ "http",
"jsonrpsee",
"log",
"serde_json",
"substrate-prometheus-endpoint",
"tokio",
+ "tower",
+ "tower-http",
+]
+
+[[package]]
+name = "sc-rpc-spec-v2"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+dependencies = [
+ "array-bytes",
+ "futures",
+ "futures-util",
+ "hex",
+ "jsonrpsee",
+ "log",
+ "parity-scale-codec",
+ "parking_lot 0.12.1",
+ "sc-chain-spec",
+ "sc-client-api",
+ "sc-transaction-pool-api",
+ "serde",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-runtime",
+ "sp-version",
+ "thiserror",
+ "tokio-stream",
]
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"directories",
"exit-future",
"futures",
"futures-timer",
- "hash-db",
"jsonrpsee",
"log",
"parity-scale-codec",
- "parity-util-mem",
"parking_lot 0.12.1",
"pin-project",
- "rand 0.7.3",
+ "rand 0.8.5",
"sc-block-builder",
"sc-chain-spec",
"sc-client-api",
@@ -9310,9 +9095,11 @@ dependencies = [
"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",
@@ -9322,19 +9109,15 @@ dependencies = [
"serde",
"serde_json",
"sp-api",
- "sp-application-crypto",
- "sp-block-builder",
"sp-blockchain",
"sp-consensus",
"sp-core",
"sp-externalities",
- "sp-inherents",
"sp-keystore",
"sp-runtime",
"sp-session",
"sp-state-machine",
"sp-storage",
- "sp-tracing",
"sp-transaction-pool",
"sp-transaction-storage-proof",
"sp-trie",
@@ -9351,21 +9134,18 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"log",
"parity-scale-codec",
- "parity-util-mem",
- "parity-util-mem-derive",
"parking_lot 0.12.1",
- "sc-client-api",
"sp-core",
]
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -9384,13 +9164,13 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"futures",
"libc",
"log",
- "rand 0.7.3",
- "rand_pcg 0.2.1",
+ "rand 0.8.5",
+ "rand_pcg",
"regex",
"sc-telemetry",
"serde",
@@ -9403,7 +9183,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"chrono",
"futures",
@@ -9411,7 +9191,8 @@ dependencies = [
"log",
"parking_lot 0.12.1",
"pin-project",
- "rand 0.7.3",
+ "rand 0.8.5",
+ "sc-utils",
"serde",
"serde_json",
"thiserror",
@@ -9421,7 +9202,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"ansi_term",
"atty",
@@ -9452,7 +9233,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9463,14 +9244,14 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "async-trait",
"futures",
"futures-timer",
"linked-hash-map",
"log",
"parity-scale-codec",
- "parity-util-mem",
"parking_lot 0.12.1",
"sc-client-api",
"sc-transaction-pool-api",
@@ -9489,8 +9270,9 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "async-trait",
"futures",
"log",
"serde",
@@ -9502,8 +9284,9 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "backtrace",
"futures",
"futures-timer",
"lazy_static",
@@ -9519,7 +9302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a"
dependencies = [
"bitvec",
- "cfg-if 1.0.0",
+ "cfg-if",
"derive_more",
"parity-scale-codec",
"scale-info-derive",
@@ -9572,6 +9355,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+[[package]]
+name = "scratch"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+
[[package]]
name = "sct"
version = "0.7.0"
@@ -9584,10 +9373,11 @@ dependencies = [
[[package]]
name = "sec1"
-version = "0.2.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
dependencies = [
+ "base16ct",
"der",
"generic-array 0.14.4",
"pkcs8",
@@ -9597,9 +9387,9 @@ dependencies = [
[[package]]
name = "secp256k1"
-version = "0.24.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7649a0b3ffb32636e60c7ce0d70511eda9c52c658cd0634e194d5a19943aeff"
+checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3"
dependencies = [
"secp256k1-sys",
]
@@ -9710,20 +9500,11 @@ version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
dependencies = [
- "itoa 1.0.1",
+ "itoa",
"ryu",
"serde",
]
-[[package]]
-name = "serde_nanos"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "serde_urlencoded"
version = "0.7.1"
@@ -9731,7 +9512,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 1.0.1",
+ "itoa",
"ryu",
"serde",
]
@@ -9755,7 +9536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
dependencies = [
"block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
"cpufeatures",
"digest 0.9.0",
"opaque-debug 0.3.0",
@@ -9767,7 +9548,7 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"cpufeatures",
"digest 0.10.3",
]
@@ -9791,7 +9572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
dependencies = [
"block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
"cpufeatures",
"digest 0.9.0",
"opaque-debug 0.3.0",
@@ -9803,23 +9584,11 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"cpufeatures",
"digest 0.10.3",
]
-[[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.0"
@@ -9878,11 +9647,11 @@ dependencies = [
[[package]]
name = "signature"
-version = "1.4.0"
+version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
dependencies = [
- "digest 0.9.0",
+ "digest 0.10.3",
"rand_core 0.6.3",
]
@@ -9912,7 +9681,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
[[package]]
name = "slot-range-helper"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -9979,6 +9748,7 @@ dependencies = [
"bytes",
"flate2",
"futures",
+ "http",
"httparse",
"log",
"rand 0.8.5",
@@ -9988,7 +9758,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"hash-db",
"log",
@@ -10006,7 +9776,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"blake2",
"proc-macro-crate",
@@ -10017,8 +9787,8 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10030,15 +9800,14 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"integer-sqrt",
"num-traits",
"parity-scale-codec",
"scale-info",
"serde",
- "sp-debug-derive",
"sp-std",
"static_assertions",
]
@@ -10046,7 +9815,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10059,7 +9828,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10068,10 +9837,27 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "sp-beefy"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-io",
+ "sp-mmr-primitives",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10083,11 +9869,11 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"futures",
"log",
- "lru 0.7.8",
+ "lru",
"parity-scale-codec",
"parking_lot 0.12.1",
"sp-api",
@@ -10101,11 +9887,10 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"futures",
- "futures-timer",
"log",
"parity-scale-codec",
"sp-core",
@@ -10120,7 +9905,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"merlin",
@@ -10143,13 +9928,11 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
- "sp-arithmetic",
- "sp-runtime",
"sp-std",
"sp-timestamp",
]
@@ -10157,7 +9940,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10169,30 +9952,27 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"base58",
"bitflags",
"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",
+ "rand 0.8.5",
"regex",
"scale-info",
"schnorrkel",
@@ -10209,20 +9989,19 @@ dependencies = [
"substrate-bip39",
"thiserror",
"tiny-bip39",
- "wasmi",
"zeroize",
]
[[package]]
name = "sp-core-hashing"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"blake2",
"byteorder",
"digest 0.10.3",
"sha2 0.10.2",
- "sha3 0.10.0",
+ "sha3",
"sp-std",
"twox-hash",
]
@@ -10230,7 +10009,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"proc-macro2",
"quote",
@@ -10241,7 +10020,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -10249,8 +10028,8 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"proc-macro2",
"quote",
@@ -10259,8 +10038,8 @@ dependencies = [
[[package]]
name = "sp-externalities"
-version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "0.13.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -10271,7 +10050,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"finality-grandpa",
"log",
@@ -10289,7 +10068,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -10302,16 +10081,16 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"bytes",
+ "ed25519",
+ "ed25519-dalek",
"futures",
- "hash-db",
"libsecp256k1",
"log",
"parity-scale-codec",
- "parking_lot 0.12.1",
"secp256k1",
"sp-core",
"sp-externalities",
@@ -10321,15 +10100,14 @@ dependencies = [
"sp-std",
"sp-tracing",
"sp-trie",
- "sp-wasm-interface",
"tracing",
"tracing-core",
]
[[package]]
name = "sp-keyring"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"lazy_static",
"sp-core",
@@ -10339,8 +10117,8 @@ dependencies = [
[[package]]
name = "sp-keystore"
-version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "0.13.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"futures",
@@ -10357,7 +10135,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"thiserror",
"zstd",
@@ -10366,22 +10144,25 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "ckb-merkle-mountain-range",
"log",
"parity-scale-codec",
+ "scale-info",
"serde",
"sp-api",
"sp-core",
"sp-debug-derive",
"sp-runtime",
"sp-std",
+ "thiserror",
]
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10395,7 +10176,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"sp-api",
"sp-core",
@@ -10404,8 +10185,8 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"backtrace",
"lazy_static",
@@ -10415,7 +10196,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"rustc-hash",
"serde",
@@ -10424,17 +10205,16 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"either",
"hash256-std-hasher",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
- "parity-util-mem",
"paste",
- "rand 0.7.3",
+ "rand 0.8.5",
"scale-info",
"serde",
"sp-application-crypto",
@@ -10447,8 +10227,8 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -10465,8 +10245,8 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -10475,24 +10255,10 @@ dependencies = [
"syn",
]
-[[package]]
-name = "sp-sandbox"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
-dependencies = [
- "log",
- "parity-scale-codec",
- "sp-core",
- "sp-io",
- "sp-std",
- "sp-wasm-interface",
- "wasmi",
-]
-
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10506,25 +10272,25 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"scale-info",
+ "sp-core",
"sp-runtime",
"sp-std",
]
[[package]]
name = "sp-state-machine"
-version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "0.13.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"hash-db",
"log",
- "num-traits",
"parity-scale-codec",
"parking_lot 0.12.1",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"sp-core",
"sp-externalities",
@@ -10533,18 +10299,17 @@ dependencies = [
"sp-trie",
"thiserror",
"tracing",
- "trie-root",
]
[[package]]
name = "sp-std"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
[[package]]
name = "sp-storage"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10554,29 +10319,15 @@ dependencies = [
"sp-std",
]
-[[package]]
-name = "sp-tasks"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
-dependencies = [
- "log",
- "sp-core",
- "sp-externalities",
- "sp-io",
- "sp-runtime-interface",
- "sp-std",
-]
-
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"futures-timer",
"log",
"parity-scale-codec",
- "sp-api",
"sp-inherents",
"sp-runtime",
"sp-std",
@@ -10585,8 +10336,8 @@ dependencies = [
[[package]]
name = "sp-tracing"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -10598,7 +10349,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"sp-api",
"sp-runtime",
@@ -10607,7 +10358,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"async-trait",
"log",
@@ -10622,14 +10373,14 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"ahash",
"hash-db",
"hashbrown",
"lazy_static",
- "lru 0.7.8",
+ "lru",
"memory-db",
"nohash-hasher",
"parity-scale-codec",
@@ -10646,11 +10397,11 @@ dependencies = [
[[package]]
name = "sp-version"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"impl-serde",
"parity-scale-codec",
- "parity-wasm 0.45.0",
+ "parity-wasm",
"scale-info",
"serde",
"sp-core-hashing-proc-macro",
@@ -10663,7 +10414,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -10673,8 +10424,8 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"impl-trait-for-tuples",
"log",
@@ -10687,9 +10438,8 @@ dependencies = [
[[package]]
name = "sp-weights"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "impl-trait-for-tuples",
"parity-scale-codec",
"scale-info",
"serde",
@@ -10708,9 +10458,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spki"
-version = "0.5.4"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
dependencies = [
"base64ct",
"der",
@@ -10718,9 +10468,9 @@ dependencies = [
[[package]]
name = "ss58-registry"
-version = "1.29.0"
+version = "1.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0837b5d62f42082c9d56cd946495ae273a3c68083b637b9153341d5e465146d"
+checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284"
dependencies = [
"Inflector",
"num-format",
@@ -10739,12 +10489,13 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "staking-miner"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_cmd",
"clap",
"exitcode",
"frame-election-provider-support",
+ "frame-remote-externalities",
"frame-support",
"frame-system",
"futures-util",
@@ -10760,7 +10511,6 @@ dependencies = [
"polkadot-core-primitives",
"polkadot-runtime",
"polkadot-runtime-common",
- "remote-externalities",
"sc-transaction-pool-api",
"serde",
"serde_json",
@@ -10902,7 +10652,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"platforms",
]
@@ -10910,17 +10660,15 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
"jsonrpsee",
"log",
"parity-scale-codec",
- "sc-client-api",
"sc-rpc-api",
"sc-transaction-pool-api",
- "serde_json",
"sp-api",
"sp-block-builder",
"sp-blockchain",
@@ -10931,9 +10679,8 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
- "futures-util",
"hyper",
"log",
"prometheus",
@@ -10941,10 +10688,23 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "substrate-rpc-client"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
+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=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"jsonrpsee",
"log",
@@ -10954,10 +10714,8 @@ dependencies = [
"scale-info",
"serde",
"sp-core",
- "sp-io",
"sp-runtime",
"sp-state-machine",
- "sp-std",
"sp-trie",
"trie-db",
]
@@ -10965,11 +10723,11 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
+ "array-bytes",
"async-trait",
"futures",
- "hex",
"parity-scale-codec",
"sc-client-api",
"sc-client-db",
@@ -10991,7 +10749,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -11001,7 +10759,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -11012,7 +10770,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"ansi_term",
"build-helper",
@@ -11023,7 +10781,7 @@ dependencies = [
"tempfile",
"toml",
"walkdir",
- "wasm-gc-api",
+ "wasm-opt",
]
[[package]]
@@ -11048,7 +10806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e92a52f07eed9afba3d6f883652cde7cd75fcf327dd44e84f210958379158737"
dependencies = [
"debugid",
- "memmap2 0.5.0",
+ "memmap2",
"stable_deref_trait",
"uuid",
]
@@ -11066,9 +10824,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.98"
+version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
dependencies = [
"proc-macro2",
"quote",
@@ -11126,7 +10884,7 @@ version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"fastrand",
"libc",
"redox_syscall",
@@ -11151,7 +10909,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
[[package]]
name = "test-parachain-adder"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"dlmalloc",
"parity-scale-codec",
@@ -11164,7 +10922,7 @@ dependencies = [
[[package]]
name = "test-parachain-adder-collator"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"clap",
"futures",
@@ -11190,14 +10948,14 @@ dependencies = [
[[package]]
name = "test-parachain-halt"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"substrate-wasm-builder",
]
[[package]]
name = "test-parachain-undying"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"dlmalloc",
"log",
@@ -11211,7 +10969,7 @@ dependencies = [
[[package]]
name = "test-parachain-undying-collator"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"clap",
"futures",
@@ -11237,7 +10995,7 @@ dependencies = [
[[package]]
name = "test-parachains"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"parity-scale-codec",
"sp-core",
@@ -11248,35 +11006,31 @@ dependencies = [
[[package]]
name = "test-runtime-constants"
-version = "0.9.29"
+version = "0.9.33"
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.31"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
dependencies = [
"proc-macro2",
"quote",
@@ -11322,9 +11076,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",
@@ -11333,9 +11087,9 @@ dependencies = [
[[package]]
name = "tikv-jemalloc-sys"
-version = "0.4.2+5.2.1-patched.2"
+version = "0.5.2+5.3.0-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5844e429d797c62945a566f8da4e24c7fe3fbd5d6617fd8bf7a0b7dc1ee0f22e"
+checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3"
dependencies = [
"cc",
"fs_extra",
@@ -11344,9 +11098,9 @@ dependencies = [
[[package]]
name = "tikv-jemallocator"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf"
+checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979"
dependencies = [
"libc",
"tikv-jemalloc-sys",
@@ -11365,17 +11119,17 @@ dependencies = [
[[package]]
name = "tiny-bip39"
-version = "0.8.2"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d"
+checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
dependencies = [
"anyhow",
- "hmac 0.8.1",
+ "hmac 0.12.1",
"once_cell",
- "pbkdf2 0.4.0",
- "rand 0.7.3",
+ "pbkdf2 0.11.0",
+ "rand 0.8.5",
"rustc-hash",
- "sha2 0.9.8",
+ "sha2 0.10.2",
"thiserror",
"unicode-normalization",
"wasm-bindgen",
@@ -11408,16 +11162,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.19.2"
+version = "1.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
+checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
dependencies = [
+ "autocfg",
"bytes",
"libc",
"memchr",
"mio",
"num_cpus",
- "once_cell",
"parking_lot 0.12.1",
"pin-project-lite 0.2.7",
"signal-hook-registry",
@@ -11467,6 +11221,7 @@ dependencies = [
"futures-core",
"pin-project-lite 0.2.7",
"tokio",
+ "tokio-util 0.7.1",
]
[[package]]
@@ -11518,6 +11273,41 @@ dependencies = [
"serde",
]
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-range-header",
+ "pin-project-lite 0.2.7",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
[[package]]
name = "tower-service"
version = "0.3.1"
@@ -11530,7 +11320,7 @@ version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"log",
"pin-project-lite 0.2.7",
"tracing-attributes",
@@ -11570,7 +11360,7 @@ dependencies = [
[[package]]
name = "tracing-gum"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"polkadot-node-jaeger",
"polkadot-primitives",
@@ -11580,7 +11370,7 @@ dependencies = [
[[package]]
name = "tracing-gum-proc-macro"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"assert_matches",
"expander 0.0.6",
@@ -11676,12 +11466,12 @@ 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",
+ "cfg-if",
"data-encoding",
"enum-as-inner",
"futures-channel",
@@ -11690,30 +11480,32 @@ dependencies = [
"idna",
"ipnet",
"lazy_static",
- "log",
"rand 0.8.5",
"smallvec",
"thiserror",
"tinyvec",
+ "tokio",
+ "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",
+ "cfg-if",
"futures-util",
"ipconfig",
"lazy_static",
- "log",
"lru-cache",
"parking_lot 0.12.1",
"resolv-conf",
"smallvec",
"thiserror",
+ "tokio",
+ "tracing",
"trust-dns-proto",
]
@@ -11726,26 +11518,31 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#91b97b016618fcc515f55a15b1f008b68e13f5a2"
+source = "git+https://github.com/paritytech/substrate?branch=master#a052224682994e6b54c94c17572e061f690149e5"
dependencies = [
"clap",
+ "frame-remote-externalities",
"frame-try-runtime",
- "jsonrpsee",
+ "hex",
"log",
"parity-scale-codec",
- "remote-externalities",
- "sc-chain-spec",
"sc-cli",
"sc-executor",
"sc-service",
"serde",
+ "serde_json",
+ "sp-api",
"sp-core",
+ "sp-debug-derive",
"sp-externalities",
"sp-io",
"sp-keystore",
+ "sp-rpc",
"sp-runtime",
"sp-state-machine",
"sp-version",
+ "sp-weights",
+ "substrate-rpc-client",
"zstd",
]
@@ -11796,7 +11593,7 @@ version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"digest 0.10.3",
"rand 0.8.5",
"static_assertions",
@@ -11826,15 +11623,6 @@ dependencies = [
"static_assertions",
]
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
[[package]]
name = "unicode-bidi"
version = "0.3.7"
@@ -12018,7 +11806,7 @@ version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"serde",
"serde_json",
"wasm-bindgen-macro",
@@ -12045,7 +11833,7 @@ version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"js-sys",
"wasm-bindgen",
"web-sys",
@@ -12081,23 +11869,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
[[package]]
-name = "wasm-gc-api"
-version = "0.1.11"
+name = "wasm-instrument"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c32691b6c7e6c14e7f8fd55361a9088b507aa49620fcd06c09b3a1082186b9"
+checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd"
dependencies = [
- "log",
- "parity-wasm 0.32.0",
- "rustc-demangle",
+ "parity-wasm",
]
[[package]]
-name = "wasm-instrument"
-version = "0.3.0"
+name = "wasm-opt"
+version = "0.110.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd"
+checksum = "b68e8037b4daf711393f4be2056246d12d975651b14d581520ad5d1f19219cec"
dependencies = [
- "parity-wasm 0.45.0",
+ "anyhow",
+ "libc",
+ "strum",
+ "strum_macros",
+ "tempfile",
+ "thiserror",
+ "wasm-opt-cxx-sys",
+ "wasm-opt-sys",
+]
+
+[[package]]
+name = "wasm-opt-cxx-sys"
+version = "0.110.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91adbad477e97bba3fbd21dd7bfb594e7ad5ceb9169ab1c93ab9cb0ada636b6f"
+dependencies = [
+ "anyhow",
+ "cxx",
+ "cxx-build",
+ "wasm-opt-sys",
+]
+
+[[package]]
+name = "wasm-opt-sys"
+version = "0.110.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec4fa5a322a4e6ac22fd141f498d56afbdbf9df5debeac32380d2dcaa3e06941"
+dependencies = [
+ "anyhow",
+ "cc",
+ "cxx",
+ "cxx-build",
+ "regex",
]
[[package]]
@@ -12121,7 +11939,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc13b3c219ca9aafeec59150d80d89851df02e0061bc357b4d66fc55a8d38787"
dependencies = [
- "parity-wasm 0.45.0",
+ "parity-wasm",
"wasmi-validation",
"wasmi_core",
]
@@ -12132,7 +11950,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
dependencies = [
- "parity-wasm 0.45.0",
+ "parity-wasm",
]
[[package]]
@@ -12144,28 +11962,28 @@ dependencies = [
"downcast-rs",
"libm",
"memory_units",
- "num-rational 0.4.0",
+ "num-rational",
"num-traits",
]
[[package]]
name = "wasmparser"
-version = "0.88.0"
+version = "0.89.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb8cf7dd82407fe68161bedcd57fde15596f32ebf6e9b3bdbf3ae1da20e38e5e"
+checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef"
dependencies = [
"indexmap",
]
[[package]]
name = "wasmtime"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a020a3f6587fa7a7d98a021156177735ebb07212a6239a85ab5f14b2f728508f"
+checksum = "8a10dc9784d8c3a33c970e3939180424955f08af2e7f20368ec02685a0e8f065"
dependencies = [
"anyhow",
"bincode",
- "cfg-if 1.0.0",
+ "cfg-if",
"indexmap",
"libc",
"log",
@@ -12187,18 +12005,18 @@ dependencies = [
[[package]]
name = "wasmtime-asm-macros"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed4ada1fdd4d9a2aa37be652abcc31ae3188ad0efcefb4571ef4f785be2d777"
+checksum = "ee4dbdc6daf68528cad1275ac91e3f51848ce9824385facc94c759f529decdf8"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
]
[[package]]
name = "wasmtime-cache"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96a03a5732ef39b83943d9d72de8ac2d58623d3bfaaea4d9a92aea5fcd9acf5"
+checksum = "9f507f3fa1ee1b2f9a83644e2514242b1dfe580782c0eb042f1ef70255bc4ffe"
dependencies = [
"anyhow",
"base64",
@@ -12216,9 +12034,9 @@ dependencies = [
[[package]]
name = "wasmtime-cranelift"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc59c28fe895112db09e262fb9c483f9e7b82c78a82a6ded69567ccc0e9795b"
+checksum = "8f03cf79d982fc68e94ba0bea6a300a3b94621c4eb9705eece0a4f06b235a3b5"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -12226,7 +12044,7 @@ dependencies = [
"cranelift-frontend",
"cranelift-native",
"cranelift-wasm",
- "gimli",
+ "gimli 0.26.1",
"log",
"object 0.29.0",
"target-lexicon",
@@ -12237,13 +12055,13 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11086e573d2635a45ac0d44697a8e4586e058cf1b190f76bea466ca2ec36c30a"
+checksum = "5c587c62e91c5499df62012b87b88890d0eb470b2ffecc5964e9da967b70c77c"
dependencies = [
"anyhow",
"cranelift-entity",
- "gimli",
+ "gimli 0.26.1",
"indexmap",
"log",
"object 0.29.0",
@@ -12256,16 +12074,16 @@ dependencies = [
[[package]]
name = "wasmtime-jit"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5444a78b74144718633f8642eccd7c4858f4c6f0c98ae6a3668998adf177ba2"
+checksum = "047839b5dabeae5424a078c19b8cc897e5943a7fadc69e3d888b9c9a897666b3"
dependencies = [
- "addr2line",
+ "addr2line 0.17.0",
"anyhow",
"bincode",
- "cfg-if 1.0.0",
+ "cfg-if",
"cpp_demangle",
- "gimli",
+ "gimli 0.26.1",
"log",
"object 0.29.0",
"rustc-demangle",
@@ -12281,9 +12099,9 @@ dependencies = [
[[package]]
name = "wasmtime-jit-debug"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2bf6a667d2a29b2b0ed42bcf7564f00c595d92c24acb4d241c7c4d950b1910c"
+checksum = "b299569abf6f99b7b8e020afaf84a700e8636c6a42e242069267322cd5818235"
dependencies = [
"object 0.29.0",
"once_cell",
@@ -12292,13 +12110,13 @@ dependencies = [
[[package]]
name = "wasmtime-runtime"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee064ce7b563cc201cdf3bb1cc4b233f386d8c57a96e55f4c4afe6103f4bd6a1"
+checksum = "ae79e0515160bd5abee5df50a16c4eb8db9f71b530fc988ae1d9ce34dcb8dd01"
dependencies = [
"anyhow",
"cc",
- "cfg-if 1.0.0",
+ "cfg-if",
"indexmap",
"libc",
"log",
@@ -12317,9 +12135,9 @@ dependencies = [
[[package]]
name = "wasmtime-types"
-version = "0.40.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e104bd9e625181d53ead85910bbc0863aa5f0c6ef96836fe9a5cc65da11b69"
+checksum = "790cf43ee8e2d5dad1780af30f00d7a972b74725fb1e4f90c28d62733819b185"
dependencies = [
"cranelift-entity",
"serde",
@@ -12367,13 +12185,13 @@ dependencies = [
[[package]]
name = "westend-runtime"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
- "beefy-primitives",
"bitvec",
"frame-benchmarking",
"frame-election-provider-support",
"frame-executive",
+ "frame-remote-externalities",
"frame-support",
"frame-system",
"frame-system-benchmarking",
@@ -12391,6 +12209,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",
@@ -12425,7 +12244,6 @@ dependencies = [
"polkadot-primitives",
"polkadot-runtime-common",
"polkadot-runtime-parachains",
- "remote-externalities",
"rustc-hex",
"scale-info",
"serde",
@@ -12434,6 +12252,7 @@ dependencies = [
"smallvec",
"sp-api",
"sp-authority-discovery",
+ "sp-beefy",
"sp-block-builder",
"sp-consensus-babe",
"sp-core",
@@ -12462,13 +12281,15 @@ dependencies = [
[[package]]
name = "westend-runtime-constants"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
@@ -12521,15 +12342,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.29.0"
+version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3"
+checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f"
dependencies = [
- "windows_aarch64_msvc 0.29.0",
- "windows_i686_gnu 0.29.0",
- "windows_i686_msvc 0.29.0",
- "windows_x86_64_gnu 0.29.0",
- "windows_x86_64_msvc 0.29.0",
+ "windows_aarch64_msvc 0.34.0",
+ "windows_i686_gnu 0.34.0",
+ "windows_i686_msvc 0.34.0",
+ "windows_x86_64_gnu 0.34.0",
+ "windows_x86_64_msvc 0.34.0",
]
[[package]]
@@ -12559,10 +12380,25 @@ dependencies = [
]
[[package]]
-name = "windows_aarch64_msvc"
-version = "0.29.0"
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
[[package]]
name = "windows_aarch64_msvc"
@@ -12570,6 +12406,12 @@ 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.36.1"
@@ -12577,10 +12419,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
[[package]]
-name = "windows_i686_gnu"
-version = "0.29.0"
+name = "windows_aarch64_msvc"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
[[package]]
name = "windows_i686_gnu"
@@ -12588,6 +12430,12 @@ 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
+
[[package]]
name = "windows_i686_gnu"
version = "0.36.1"
@@ -12595,10 +12443,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
[[package]]
-name = "windows_i686_msvc"
-version = "0.29.0"
+name = "windows_i686_gnu"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
[[package]]
name = "windows_i686_msvc"
@@ -12606,6 +12454,12 @@ 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
+
[[package]]
name = "windows_i686_msvc"
version = "0.36.1"
@@ -12613,10 +12467,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
[[package]]
-name = "windows_x86_64_gnu"
-version = "0.29.0"
+name = "windows_i686_msvc"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
[[package]]
name = "windows_x86_64_gnu"
@@ -12624,6 +12478,12 @@ 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.36.1"
@@ -12631,10 +12491,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
[[package]]
-name = "windows_x86_64_msvc"
-version = "0.29.0"
+name = "windows_x86_64_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
[[package]]
name = "windows_x86_64_msvc"
@@ -12642,12 +12508,24 @@ 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+
[[package]]
name = "winreg"
version = "0.7.0"
@@ -12688,7 +12566,7 @@ dependencies = [
[[package]]
name = "xcm"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"derivative",
"impl-trait-for-tuples",
@@ -12701,7 +12579,7 @@ dependencies = [
[[package]]
name = "xcm-builder"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"frame-system",
@@ -12724,7 +12602,7 @@ dependencies = [
[[package]]
name = "xcm-executor"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -12741,7 +12619,7 @@ dependencies = [
[[package]]
name = "xcm-executor-integration-tests"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"frame-system",
@@ -12761,7 +12639,7 @@ dependencies = [
[[package]]
name = "xcm-procedural"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"Inflector",
"proc-macro2",
@@ -12771,7 +12649,7 @@ dependencies = [
[[package]]
name = "xcm-simulator"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -12787,7 +12665,7 @@ dependencies = [
[[package]]
name = "xcm-simulator-example"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"frame-system",
@@ -12810,7 +12688,7 @@ dependencies = [
[[package]]
name = "xcm-simulator-fuzzer"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"frame-support",
"frame-system",
@@ -12848,9 +12726,9 @@ dependencies = [
[[package]]
name = "zeroize"
-version = "1.4.3"
+version = "1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
+checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
dependencies = [
"zeroize_derive",
]
@@ -12869,7 +12747,7 @@ dependencies = [
[[package]]
name = "zombienet-backchannel"
-version = "0.9.29"
+version = "0.9.33"
dependencies = [
"futures-util",
"lazy_static",
diff --git a/Cargo.toml b/Cargo.toml
index be2e04291370..6d01e2b25553 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,25 +6,31 @@ 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.29"
+rust-version = "1.64.0" # workspace properties
+readme = "README.md"
+authors.workspace = true
+edition.workspace = true
+version.workspace = true
+
+[workspace.package]
authors = ["Parity Technologies "]
edition = "2021"
-rust-version = "1.57.0" # custom profiles
-readme = "README.md"
+repository = "https://github.com/paritytech/polkadot.git"
+version = "0.9.33"
[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"] }
+tikv-jemallocator = "0.5.0"
[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 = "master" }
+tokio = "1.22.0"
+substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-core-primitives = { path = "core-primitives" }
-
+
[workspace]
members = [
"cli",
@@ -83,8 +89,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 +100,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 +131,8 @@ 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 +143,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 +156,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 +167,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 }
diff --git a/README.md b/README.md
index 7679ebec5984..319e1714fd7b 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
@@ -200,7 +200,7 @@ cargo build # Builds all native code
You can run the tests if you like:
```bash
-cargo test --all --release
+cargo test --workspace --release
```
You can start a development chain with:
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 1e770cd8715b..0d1c55187400 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,9 +1,9 @@
[package]
name = "polkadot-cli"
-version = "0.9.29"
-authors = ["Parity Technologies "]
description = "Polkadot Relay-chain Client Node"
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[package.metadata.wasm-pack.profile.release]
# `wasm-opt` has some problems on Linux, see
@@ -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"
@@ -26,6 +26,7 @@ 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 = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
@@ -34,17 +35,13 @@ sc-service = { git = "https://github.com/paritytech/substrate", branch = "master
polkadot-node-metrics = { path = "../node/metrics" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "master" }
-
-# 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", branch = "master", default-features = false }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
[features]
-default = ["wasmtime", "db", "cli", "hostperfcheck", "full-node", "trie-memory-tracker", "polkadot-native"]
-wasmtime = ["sc-cli/wasmtime"]
+default = ["db", "cli", "hostperfcheck", "full-node", "polkadot-native"]
db = ["service/db"]
cli = [
"clap",
@@ -56,10 +53,13 @@ cli = [
"polkadot-client",
"polkadot-node-core-pvf",
]
-runtime-benchmarks = ["service/runtime-benchmarks", "polkadot-node-metrics/runtime-benchmarks"]
-trie-memory-tracker = ["sp-trie/memory-tracker"]
+runtime-benchmarks = [
+ "service/runtime-benchmarks",
+ "polkadot-node-metrics/runtime-benchmarks",
+ "polkadot-performance-test?/runtime-benchmarks"
+]
full-node = ["service/full-node"]
-try-runtime = ["service/try-runtime"]
+try-runtime = ["service/try-runtime", "try-runtime-cli/try-runtime"]
fast-runtime = ["service/fast-runtime"]
pyroscope = ["pyro"]
hostperfcheck = ["polkadot-performance-test"]
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 5ce7c05162c1..d7a66bb9d711 100644
--- a/cli/src/command.rs
+++ b/cli/src/command.rs
@@ -541,7 +541,7 @@ pub fn run() -> Result<()> {
ensure_dev(chain_spec).map_err(Error::Other)?;
runner.sync_run(|mut config| {
let (client, _, _, _) = service::new_chain_ops(&mut config, None)?;
- let header = client.header(BlockId::Number(0_u32.into())).unwrap().unwrap();
+ let header = client.header(client.info().genesis_hash).unwrap().unwrap();
let inherent_data = benchmark_inherent_data(header)
.map_err(|e| format!("generating inherent data: {:?}", e))?;
let remark_builder = RemarkBuilder::new(client.clone());
@@ -591,27 +591,27 @@ pub fn run() -> Result<()> {
#[cfg(feature = "kusama-native")]
if chain_spec.is_kusama() {
- return Ok(runner.sync_run(|config| {
+ return runner.sync_run(|config| {
cmd.run::(config)
.map_err(|e| Error::SubstrateCli(e))
- })?)
+ })
}
#[cfg(feature = "westend-native")]
if chain_spec.is_westend() {
- return Ok(runner.sync_run(|config| {
+ return runner.sync_run(|config| {
cmd.run::(config)
.map_err(|e| Error::SubstrateCli(e))
- })?)
+ })
}
// else we assume it is polkadot.
#[cfg(feature = "polkadot-native")]
{
- return Ok(runner.sync_run(|config| {
+ return runner.sync_run(|config| {
cmd.run::(config)
.map_err(|e| Error::SubstrateCli(e))
- })?)
+ })
}
#[cfg(not(feature = "polkadot-native"))]
@@ -638,9 +638,14 @@ pub fn run() -> Result<()> {
Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?),
#[cfg(feature = "try-runtime")]
Some(Subcommand::TryRuntime(cmd)) => {
+ use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
let runner = cli.create_runner(cmd)?;
let chain_spec = &runner.config().chain_spec;
set_default_ss58_version(chain_spec);
+ type HostFunctionsOf = ExtendedHostFunctions<
+ sp_io::SubstrateHostFunctions,
+ ::ExtendHostFunctions,
+ >;
use sc_service::TaskManager;
let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
@@ -651,10 +656,9 @@ pub fn run() -> Result<()> {
#[cfg(feature = "kusama-native")]
if chain_spec.is_kusama() {
- return runner.async_run(|config| {
+ return runner.async_run(|_| {
Ok((
- cmd.run::(
- config,
+ cmd.run::>(
)
.map_err(Error::SubstrateCli),
task_manager,
@@ -664,10 +668,9 @@ pub fn run() -> Result<()> {
#[cfg(feature = "westend-native")]
if chain_spec.is_westend() {
- return runner.async_run(|config| {
+ return runner.async_run(|_| {
Ok((
- cmd.run::(
- config,
+ cmd.run::>(
)
.map_err(Error::SubstrateCli),
task_manager,
@@ -677,10 +680,9 @@ pub fn run() -> Result<()> {
// else we assume it is polkadot.
#[cfg(feature = "polkadot-native")]
{
- return runner.async_run(|config| {
+ return runner.async_run(|_| {
Ok((
- cmd.run::(
- config,
+ cmd.run::>(
)
.map_err(Error::SubstrateCli),
task_manager,
diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
index 9bbe8f516afb..bad5533f9d1d 100644
--- a/core-primitives/Cargo.toml
+++ b/core-primitives/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "polkadot-core-primitives"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -10,7 +10,6 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
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 }
[features]
default = [ "std" ]
@@ -21,5 +20,4 @@ std = [
"sp-std/std",
"scale-info/std",
"parity-scale-codec/std",
- "parity-util-mem",
]
diff --git a/core-primitives/src/lib.rs b/core-primitives/src/lib.rs
index bd0256dc7c9e..ca4d2372db38 100644
--- a/core-primitives/src/lib.rs
+++ b/core-primitives/src/lib.rs
@@ -21,8 +21,6 @@
//! These core Polkadot types are used by the relay chain and the Parachains.
use parity_scale_codec::{Decode, Encode};
-#[cfg(feature = "std")]
-use parity_util_mem::MallocSizeOf;
use scale_info::TypeInfo;
use sp_runtime::{
generic,
@@ -66,7 +64,6 @@ pub type Hash = sp_core::H256;
///
/// This type makes it easy to enforce that a hash is a candidate hash on the type level.
#[derive(Clone, Copy, Encode, Decode, Hash, Eq, PartialEq, Default, PartialOrd, Ord, TypeInfo)]
-#[cfg_attr(feature = "std", derive(MallocSizeOf))]
pub struct CandidateHash(pub Hash);
#[cfg(feature = "std")]
@@ -127,7 +124,6 @@ pub type DownwardMessage = sp_std::vec::Vec;
/// A wrapped version of `DownwardMessage`. The difference is that it has attached the block number when
/// the message was sent.
#[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(MallocSizeOf))]
pub struct InboundDownwardMessage {
/// The block number at which these messages were put into the downward message queue.
pub sent_at: BlockNumber,
@@ -137,7 +133,6 @@ pub struct InboundDownwardMessage {
/// An HRMP message seen from the perspective of a recipient.
#[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(MallocSizeOf))]
pub struct InboundHrmpMessage {
/// The block number at which this message was sent.
/// Specifically, it is the block number at which the candidate that sends this message was
@@ -149,7 +144,6 @@ pub struct InboundHrmpMessage {
/// An HRMP message seen from the perspective of a sender.
#[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, Eq, Hash, TypeInfo)]
-#[cfg_attr(feature = "std", derive(MallocSizeOf))]
pub struct OutboundHrmpMessage {
/// The para that will get this message in its downward message queue.
pub recipient: Id,
diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
index f259470ad418..6d59b6a4b01d 100644
--- a/erasure-coding/Cargo.toml
+++ b/erasure-coding/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "polkadot-erasure-coding"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
polkadot-primitives = { path = "../primitives" }
diff --git a/erasure-coding/fuzzer/Cargo.toml b/erasure-coding/fuzzer/Cargo.toml
index 06a85e63d2e5..bd8632a185f5 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.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[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/erasure-coding/src/lib.rs b/erasure-coding/src/lib.rs
index 5e85809f4117..6abd7dce4dd3 100644
--- a/erasure-coding/src/lib.rs
+++ b/erasure-coding/src/lib.rs
@@ -216,7 +216,7 @@ pub struct Branches<'a, I> {
impl<'a, I: AsRef<[u8]>> Branches<'a, I> {
/// Get the trie root.
pub fn root(&self) -> H256 {
- self.root.clone()
+ self.root
}
}
diff --git a/node/client/Cargo.toml b/node/client/Cargo.toml
index f252ade32892..b07447ef3396 100644
--- a/node/client/Cargo.toml
+++ b/node/client/Cargo.toml
@@ -1,10 +1,12 @@
[package]
name = "polkadot-client"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
+async-trait = "0.1.57"
+futures = "0.3.21"
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -35,7 +37,7 @@ sc-executor = { git = "https://github.com/paritytech/substrate", branch = "maste
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", package = "sp-beefy" }
# Polkadot Runtimes
polkadot-runtime = { path = "../../runtime/polkadot", optional = true }
diff --git a/node/client/src/benchmarking.rs b/node/client/src/benchmarking.rs
index 7990bc88d218..17ef63f4ba6e 100644
--- a/node/client/src/benchmarking.rs
+++ b/node/client/src/benchmarking.rs
@@ -165,7 +165,7 @@ impl BenchmarkCallSigner
(),
runtime::VERSION.spec_version,
runtime::VERSION.transaction_version,
- genesis.clone(),
+ genesis,
genesis,
(),
(),
@@ -220,7 +220,7 @@ impl BenchmarkCallSigner
(),
runtime::VERSION.spec_version,
runtime::VERSION.transaction_version,
- genesis.clone(),
+ genesis,
genesis,
(),
(),
@@ -274,7 +274,7 @@ impl BenchmarkCallSigner
(),
runtime::VERSION.spec_version,
runtime::VERSION.transaction_version,
- genesis.clone(),
+ genesis,
genesis,
(),
(),
@@ -328,7 +328,7 @@ impl BenchmarkCallSigner
(),
runtime::VERSION.spec_version,
runtime::VERSION.transaction_version,
- genesis.clone(),
+ genesis,
genesis,
(),
(),
@@ -359,7 +359,7 @@ pub fn benchmark_inherent_data(
// Assume that all runtimes have the `timestamp` pallet.
let d = std::time::Duration::from_millis(0);
let timestamp = sp_timestamp::InherentDataProvider::new(d.into());
- timestamp.provide_inherent_data(&mut inherent_data)?;
+ futures::executor::block_on(timestamp.provide_inherent_data(&mut inherent_data))?;
let para_data = polkadot_primitives::v2::InherentData {
bitfields: Vec::new(),
@@ -368,8 +368,7 @@ pub fn benchmark_inherent_data(
parent_header: header,
};
- polkadot_node_core_parachains_inherent::ParachainsInherentDataProvider::from_data(para_data)
- .provide_inherent_data(&mut inherent_data)?;
+ inherent_data.put_data(polkadot_primitives::v2::PARACHAINS_INHERENT_IDENTIFIER, ¶_data)?;
Ok(inherent_data)
}
diff --git a/node/client/src/lib.rs b/node/client/src/lib.rs
index 41b0048f0e46..648d1d63155d 100644
--- a/node/client/src/lib.rs
+++ b/node/client/src/lib.rs
@@ -29,7 +29,7 @@ use sp_api::{CallApiAt, Encode, NumberFor, ProvideRuntimeApi};
use sp_blockchain::{HeaderBackend, HeaderMetadata};
use sp_consensus::BlockStatus;
use sp_runtime::{
- generic::{BlockId, SignedBlock},
+ generic::SignedBlock,
traits::{BlakeTwo256, Block as BlockT},
Justifications,
};
@@ -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
@@ -327,43 +327,49 @@ impl UsageProvider for Client {
impl sc_client_api::BlockBackend for Client {
fn block_body(
&self,
- id: &BlockId,
+ hash: ::Hash,
) -> sp_blockchain::Result::Extrinsic>>> {
with_client! {
self,
client,
{
- client.block_body(id)
+ client.block_body(hash)
}
}
}
- fn block(&self, id: &BlockId) -> sp_blockchain::Result>> {
+ fn block(
+ &self,
+ hash: ::Hash,
+ ) -> sp_blockchain::Result>> {
with_client! {
self,
client,
{
- client.block(id)
+ client.block(hash)
}
}
}
- fn block_status(&self, id: &BlockId) -> sp_blockchain::Result {
+ fn block_status(&self, hash: ::Hash) -> sp_blockchain::Result {
with_client! {
self,
client,
{
- client.block_status(id)
+ client.block_status(hash)
}
}
}
- fn justifications(&self, id: &BlockId) -> sp_blockchain::Result> {
+ fn justifications(
+ &self,
+ hash: ::Hash,
+ ) -> sp_blockchain::Result> {
with_client! {
self,
client,
{
- client.justifications(id)
+ client.justifications(hash)
}
}
}
@@ -383,7 +389,7 @@ impl sc_client_api::BlockBackend for Client {
fn indexed_transaction(
&self,
- id: &::Hash,
+ id: ::Hash,
) -> sp_blockchain::Result>> {
with_client! {
self,
@@ -396,7 +402,7 @@ impl sc_client_api::BlockBackend for Client {
fn block_indexed_body(
&self,
- id: &BlockId,
+ id: ::Hash,
) -> sp_blockchain::Result>>> {
with_client! {
self,
@@ -421,63 +427,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 +493,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 +508,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 +523,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 +541,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,19 +556,19 @@ 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)
}
}
}
}
impl sp_blockchain::HeaderBackend for Client {
- fn header(&self, id: BlockId) -> sp_blockchain::Result> {
+ fn header(&self, hash: Hash) -> sp_blockchain::Result> {
with_client! {
self,
client,
{
- client.header(&id)
+ client.header(hash)
}
}
}
@@ -577,12 +583,12 @@ impl sp_blockchain::HeaderBackend for Client {
}
}
- fn status(&self, id: BlockId) -> sp_blockchain::Result {
+ fn status(&self, hash: Hash) -> sp_blockchain::Result {
with_client! {
self,
client,
{
- client.status(id)
+ client.status(hash)
}
}
}
diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
index fdffe1922a64..93b06f315b5f 100644
--- a/node/collation-generation/Cargo.toml
+++ b/node/collation-generation/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "polkadot-node-collation-generation"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
index f2572cac8232..b73c4b97eb1b 100644
--- a/node/core/approval-voting/Cargo.toml
+++ b/node/core/approval-voting/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "polkadot-node-core-approval-voting"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
futures = "0.3.21"
@@ -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.13.0"
derive_more = "0.99.17"
thiserror = "1.0.31"
@@ -40,5 +40,5 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.4.0"
-kvdb-memorydb = "0.11.0"
+kvdb-memorydb = "0.13.0"
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
diff --git a/node/core/approval-voting/src/approval_checking.rs b/node/core/approval-voting/src/approval_checking.rs
index b513c18895b3..82a9a8c89bf5 100644
--- a/node/core/approval-voting/src/approval_checking.rs
+++ b/node/core/approval-voting/src/approval_checking.rs
@@ -282,8 +282,8 @@ impl State {
/// Constructs an infinite iterator from an array of `TrancheEntry` values. Any missing tranches
/// are filled with empty assignments, as they are needed to compute the approved tranches.
-fn filled_tranche_iterator<'a>(
- tranches: &'a [TrancheEntry],
+fn filled_tranche_iterator(
+ tranches: &[TrancheEntry],
) -> impl Iterator- {
let mut gap_end = None;
diff --git a/node/core/approval-voting/src/approval_db/v1/mod.rs b/node/core/approval-voting/src/approval_db/v1/mod.rs
index 03b7aa68f134..858bcb8c36fe 100644
--- a/node/core/approval-voting/src/approval_db/v1/mod.rs
+++ b/node/core/approval-voting/src/approval_db/v1/mod.rs
@@ -90,41 +90,45 @@ impl Backend for DbBackend {
match op {
BackendWriteOp::WriteStoredBlockRange(stored_block_range) => {
tx.put_vec(
- self.config.col_data,
+ self.config.col_approval_data,
&STORED_BLOCKS_KEY,
stored_block_range.encode(),
);
},
BackendWriteOp::DeleteStoredBlockRange => {
- tx.delete(self.config.col_data, &STORED_BLOCKS_KEY);
+ tx.delete(self.config.col_approval_data, &STORED_BLOCKS_KEY);
},
BackendWriteOp::WriteBlocksAtHeight(h, blocks) => {
- tx.put_vec(self.config.col_data, &blocks_at_height_key(h), blocks.encode());
+ tx.put_vec(
+ self.config.col_approval_data,
+ &blocks_at_height_key(h),
+ blocks.encode(),
+ );
},
BackendWriteOp::DeleteBlocksAtHeight(h) => {
- tx.delete(self.config.col_data, &blocks_at_height_key(h));
+ tx.delete(self.config.col_approval_data, &blocks_at_height_key(h));
},
BackendWriteOp::WriteBlockEntry(block_entry) => {
let block_entry: BlockEntry = block_entry.into();
tx.put_vec(
- self.config.col_data,
+ self.config.col_approval_data,
&block_entry_key(&block_entry.block_hash),
block_entry.encode(),
);
},
BackendWriteOp::DeleteBlockEntry(hash) => {
- tx.delete(self.config.col_data, &block_entry_key(&hash));
+ tx.delete(self.config.col_approval_data, &block_entry_key(&hash));
},
BackendWriteOp::WriteCandidateEntry(candidate_entry) => {
let candidate_entry: CandidateEntry = candidate_entry.into();
tx.put_vec(
- self.config.col_data,
+ self.config.col_approval_data,
&candidate_entry_key(&candidate_entry.candidate.hash()),
candidate_entry.encode(),
);
},
BackendWriteOp::DeleteCandidateEntry(candidate_hash) => {
- tx.delete(self.config.col_data, &candidate_entry_key(&candidate_hash));
+ tx.delete(self.config.col_approval_data, &candidate_entry_key(&candidate_hash));
},
}
}
@@ -149,7 +153,9 @@ pub type Bitfield = BitVec;
#[derive(Debug, Clone, Copy)]
pub struct Config {
/// The column family in the database where data is stored.
- pub col_data: u32,
+ pub col_approval_data: u32,
+ /// The column of the database where rolling session window data is stored.
+ pub col_session_data: u32,
}
/// Details pertaining to our assignment on a block.
@@ -243,10 +249,10 @@ pub type Result = std::result::Result;
pub(crate) fn load_decode(
store: &dyn Database,
- col_data: u32,
+ col_approval_data: u32,
key: &[u8],
) -> Result> {
- match store.get(col_data, key)? {
+ match store.get(col_approval_data, key)? {
None => Ok(None),
Some(raw) => D::decode(&mut &raw[..]).map(Some).map_err(Into::into),
}
@@ -303,7 +309,7 @@ pub fn load_stored_blocks(
store: &dyn Database,
config: &Config,
) -> SubsystemResult> {
- load_decode(store, config.col_data, STORED_BLOCKS_KEY)
+ load_decode(store, config.col_approval_data, STORED_BLOCKS_KEY)
.map_err(|e| SubsystemError::with_origin("approval-voting", e))
}
@@ -313,7 +319,7 @@ pub fn load_blocks_at_height(
config: &Config,
block_number: &BlockNumber,
) -> SubsystemResult> {
- load_decode(store, config.col_data, &blocks_at_height_key(*block_number))
+ load_decode(store, config.col_approval_data, &blocks_at_height_key(*block_number))
.map(|x| x.unwrap_or_default())
.map_err(|e| SubsystemError::with_origin("approval-voting", e))
}
@@ -324,7 +330,7 @@ pub fn load_block_entry(
config: &Config,
block_hash: &Hash,
) -> SubsystemResult> {
- load_decode(store, config.col_data, &block_entry_key(block_hash))
+ load_decode(store, config.col_approval_data, &block_entry_key(block_hash))
.map(|u: Option| u.map(|v| v.into()))
.map_err(|e| SubsystemError::with_origin("approval-voting", e))
}
@@ -335,7 +341,7 @@ pub fn load_candidate_entry(
config: &Config,
candidate_hash: &CandidateHash,
) -> SubsystemResult> {
- load_decode(store, config.col_data, &candidate_entry_key(candidate_hash))
+ load_decode(store, config.col_approval_data, &candidate_entry_key(candidate_hash))
.map(|u: Option| u.map(|v| v.into()))
.map_err(|e| SubsystemError::with_origin("approval-voting", e))
}
diff --git a/node/core/approval-voting/src/approval_db/v1/tests.rs b/node/core/approval-voting/src/approval_db/v1/tests.rs
index 548c64bcef03..06923c6a539f 100644
--- a/node/core/approval-voting/src/approval_db/v1/tests.rs
+++ b/node/core/approval-voting/src/approval_db/v1/tests.rs
@@ -28,9 +28,12 @@ use std::{collections::HashMap, sync::Arc};
use ::test_helpers::{dummy_candidate_receipt, dummy_candidate_receipt_bad_sig, dummy_hash};
const DATA_COL: u32 = 0;
-const NUM_COLUMNS: u32 = 1;
+const SESSION_DATA_COL: u32 = 1;
-const TEST_CONFIG: Config = Config { col_data: DATA_COL };
+const NUM_COLUMNS: u32 = 2;
+
+const TEST_CONFIG: Config =
+ Config { col_approval_data: DATA_COL, col_session_data: SESSION_DATA_COL };
fn make_db() -> (DbBackend, Arc) {
let db = kvdb_memorydb::create(NUM_COLUMNS);
diff --git a/node/core/approval-voting/src/criteria.rs b/node/core/approval-voting/src/criteria.rs
index d7bedc9b0a7f..520a1a745056 100644
--- a/node/core/approval-voting/src/criteria.rs
+++ b/node/core/approval-voting/src/criteria.rs
@@ -21,7 +21,8 @@ use polkadot_node_primitives::approval::{
self as approval_types, AssignmentCert, AssignmentCertKind, DelayTranche, RelayVRFStory,
};
use polkadot_primitives::v2::{
- AssignmentId, AssignmentPair, CandidateHash, CoreIndex, GroupIndex, SessionInfo, ValidatorIndex,
+ AssignmentId, AssignmentPair, CandidateHash, CoreIndex, GroupIndex, IndexedVec, SessionInfo,
+ ValidatorIndex,
};
use sc_keystore::LocalKeystore;
use sp_application_crypto::ByteArray;
@@ -138,7 +139,7 @@ pub(crate) struct Config {
/// The assignment public keys for validators.
assignment_keys: Vec,
/// The groups of validators assigned to each core.
- validator_groups: Vec>,
+ validator_groups: IndexedVec>,
/// The number of availability cores used by the protocol during this session.
n_cores: u32,
/// The zeroth delay tranche width.
@@ -154,10 +155,10 @@ impl<'a> From<&'a SessionInfo> for Config {
Config {
assignment_keys: s.assignment_keys.clone(),
validator_groups: s.validator_groups.clone(),
- n_cores: s.n_cores.clone(),
- zeroth_delay_tranche_width: s.zeroth_delay_tranche_width.clone(),
- relay_vrf_modulo_samples: s.relay_vrf_modulo_samples.clone(),
- n_delay_tranches: s.n_delay_tranches.clone(),
+ n_cores: s.n_cores,
+ zeroth_delay_tranche_width: s.zeroth_delay_tranche_width,
+ relay_vrf_modulo_samples: s.relay_vrf_modulo_samples,
+ n_delay_tranches: s.n_delay_tranches,
}
}
}
@@ -541,11 +542,11 @@ pub(crate) fn check_assignment_cert(
}
fn is_in_backing_group(
- validator_groups: &[Vec],
+ validator_groups: &IndexedVec>,
validator: ValidatorIndex,
group: GroupIndex,
) -> bool {
- validator_groups.get(group.0 as usize).map_or(false, |g| g.contains(&validator))
+ validator_groups.get(group).map_or(false, |g| g.contains(&validator))
}
#[cfg(test)]
@@ -590,7 +591,10 @@ mod tests {
.collect()
}
- fn basic_groups(n_validators: usize, n_groups: usize) -> Vec> {
+ fn basic_groups(
+ n_validators: usize,
+ n_groups: usize,
+ ) -> IndexedVec> {
let size = n_validators / n_groups;
let big_groups = n_validators % n_groups;
let scraps = n_groups * size;
@@ -631,10 +635,10 @@ mod tests {
Sr25519Keyring::Bob,
Sr25519Keyring::Charlie,
]),
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0)],
vec![ValidatorIndex(1), ValidatorIndex(2)],
- ],
+ ]),
n_cores: 2,
zeroth_delay_tranche_width: 10,
relay_vrf_modulo_samples: 3,
@@ -666,10 +670,10 @@ mod tests {
Sr25519Keyring::Bob,
Sr25519Keyring::Charlie,
]),
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0)],
vec![ValidatorIndex(1), ValidatorIndex(2)],
- ],
+ ]),
n_cores: 2,
zeroth_delay_tranche_width: 10,
relay_vrf_modulo_samples: 3,
@@ -696,7 +700,7 @@ mod tests {
Sr25519Keyring::Bob,
Sr25519Keyring::Charlie,
]),
- validator_groups: vec![],
+ validator_groups: Default::default(),
n_cores: 0,
zeroth_delay_tranche_width: 10,
relay_vrf_modulo_samples: 3,
diff --git a/node/core/approval-voting/src/import.rs b/node/core/approval-voting/src/import.rs
index d43bf40546ae..2331b50b6bb1 100644
--- a/node/core/approval-voting/src/import.rs
+++ b/node/core/approval-voting/src/import.rs
@@ -415,11 +415,8 @@ pub(crate) async fn handle_new_head(
Err(error) => {
// It's possible that we've lost a race with finality.
let (tx, rx) = oneshot::channel();
- ctx.send_message(ChainApiMessage::FinalizedBlockHash(
- block_header.number.clone(),
- tx,
- ))
- .await;
+ ctx.send_message(ChainApiMessage::FinalizedBlockHash(block_header.number, tx))
+ .await;
let lost_to_finality = match rx.await {
Ok(Ok(Some(h))) if h != block_hash => true,
@@ -620,7 +617,9 @@ pub(crate) mod tests {
use polkadot_node_subsystem::messages::{AllMessages, ApprovalVotingMessage};
use polkadot_node_subsystem_test_helpers::make_subsystem_context;
use polkadot_node_subsystem_util::database::Database;
- use polkadot_primitives::v2::{Id as ParaId, SessionInfo, ValidatorIndex};
+ use polkadot_primitives::v2::{
+ Id as ParaId, IndexedVec, SessionInfo, ValidatorId, ValidatorIndex,
+ };
pub(crate) use sp_consensus_babe::{
digests::{CompatibleDigestItem, PreDigest, SecondaryVRFPreDigest},
AllowedSlots, BabeEpochConfiguration, Epoch as BabeEpoch,
@@ -630,14 +629,15 @@ pub(crate) mod tests {
pub(crate) use sp_runtime::{Digest, DigestItem};
use std::{pin::Pin, sync::Arc};
- use crate::{
- approval_db::v1::Config as DatabaseConfig, criteria, BlockEntry, APPROVAL_SESSIONS,
- };
+ use crate::{approval_db::v1::Config as DatabaseConfig, criteria, BlockEntry};
const DATA_COL: u32 = 0;
- const NUM_COLUMNS: u32 = 1;
+ const SESSION_DATA_COL: u32 = 1;
+
+ const NUM_COLUMNS: u32 = 2;
- const TEST_CONFIG: DatabaseConfig = DatabaseConfig { col_data: DATA_COL };
+ const TEST_CONFIG: DatabaseConfig =
+ DatabaseConfig { col_approval_data: DATA_COL, col_session_data: SESSION_DATA_COL };
#[derive(Default)]
struct MockClock;
@@ -652,22 +652,23 @@ pub(crate) mod tests {
}
fn blank_state() -> State {
+ let db = kvdb_memorydb::create(NUM_COLUMNS);
+ let db = polkadot_node_subsystem_util::database::kvdb_impl::DbAdapter::new(db, &[]);
+ let db: Arc = Arc::new(db);
State {
session_window: None,
keystore: Arc::new(LocalKeystore::in_memory()),
slot_duration_millis: 6_000,
clock: Box::new(MockClock::default()),
assignment_criteria: Box::new(MockAssignmentCriteria),
+ db,
+ db_config: TEST_CONFIG,
}
}
fn single_session_state(index: SessionIndex, info: SessionInfo) -> State {
State {
- session_window: Some(RollingSessionWindow::with_session_info(
- APPROVAL_SESSIONS,
- index,
- vec![info],
- )),
+ session_window: Some(RollingSessionWindow::with_session_info(index, vec![info])),
..blank_state()
}
}
@@ -713,10 +714,10 @@ pub(crate) mod tests {
fn dummy_session_info(index: SessionIndex) -> SessionInfo {
SessionInfo {
- validators: Vec::new(),
+ validators: Default::default(),
discovery_keys: Vec::new(),
assignment_keys: Vec::new(),
- validator_groups: Vec::new(),
+ validator_groups: Default::default(),
n_cores: index as _,
zeroth_delay_tranche_width: index as _,
relay_vrf_modulo_samples: index as _,
@@ -780,11 +781,8 @@ pub(crate) mod tests {
.map(|(r, c, g)| (r.hash(), r.clone(), *c, *g))
.collect::>();
- let session_window = RollingSessionWindow::with_session_info(
- APPROVAL_SESSIONS,
- session,
- vec![session_info],
- );
+ let session_window =
+ RollingSessionWindow::with_session_info(session, vec![session_info]);
let header = header.clone();
Box::pin(async move {
@@ -889,11 +887,8 @@ pub(crate) mod tests {
.collect::>();
let test_fut = {
- let session_window = RollingSessionWindow::with_session_info(
- APPROVAL_SESSIONS,
- session,
- vec![session_info],
- );
+ let session_window =
+ RollingSessionWindow::with_session_info(session, vec![session_info]);
let header = header.clone();
Box::pin(async move {
@@ -1087,11 +1082,8 @@ pub(crate) mod tests {
.map(|(r, c, g)| (r.hash(), r.clone(), *c, *g))
.collect::>();
- let session_window = Some(RollingSessionWindow::with_session_info(
- APPROVAL_SESSIONS,
- session,
- vec![session_info],
- ));
+ let session_window =
+ Some(RollingSessionWindow::with_session_info(session, vec![session_info]));
let header = header.clone();
Box::pin(async move {
@@ -1174,21 +1166,27 @@ pub(crate) mod tests {
let session = 5;
let irrelevant = 666;
- let session_info = SessionInfo {
- validators: vec![Sr25519Keyring::Alice.public().into(); 6],
- discovery_keys: Vec::new(),
- assignment_keys: Vec::new(),
- validator_groups: vec![vec![ValidatorIndex(0); 5], vec![ValidatorIndex(0); 2]],
- n_cores: 6,
- needed_approvals: 2,
- zeroth_delay_tranche_width: irrelevant,
- relay_vrf_modulo_samples: irrelevant,
- n_delay_tranches: irrelevant,
- no_show_slots: irrelevant,
- active_validator_indices: Vec::new(),
- dispute_period: 6,
- random_seed: [0u8; 32],
- };
+ let session_info =
+ SessionInfo {
+ validators: IndexedVec::::from(
+ vec![Sr25519Keyring::Alice.public().into(); 6],
+ ),
+ discovery_keys: Vec::new(),
+ assignment_keys: Vec::new(),
+ validator_groups: IndexedVec::>::from(vec![
+ vec![ValidatorIndex(0); 5],
+ vec![ValidatorIndex(0); 2],
+ ]),
+ n_cores: 6,
+ needed_approvals: 2,
+ zeroth_delay_tranche_width: irrelevant,
+ relay_vrf_modulo_samples: irrelevant,
+ n_delay_tranches: irrelevant,
+ no_show_slots: irrelevant,
+ active_validator_indices: Vec::new(),
+ dispute_period: 6,
+ random_seed: [0u8; 32],
+ };
let slot = Slot::from(10);
diff --git a/node/core/approval-voting/src/lib.rs b/node/core/approval-voting/src/lib.rs
index ac025f366ab7..14fc87761c42 100644
--- a/node/core/approval-voting/src/lib.rs
+++ b/node/core/approval-voting/src/lib.rs
@@ -44,8 +44,7 @@ use polkadot_node_subsystem_util::{
database::Database,
metrics::{self, prometheus},
rolling_session_window::{
- new_session_window_size, RollingSessionWindow, SessionWindowSize, SessionWindowUpdate,
- SessionsUnavailable,
+ DatabaseParams, RollingSessionWindow, SessionWindowUpdate, SessionsUnavailable,
},
TimeoutExt,
};
@@ -70,6 +69,7 @@ use std::{
collections::{
btree_map::Entry as BTMEntry, hash_map::Entry as HMEntry, BTreeMap, HashMap, HashSet,
},
+ num::NonZeroUsize,
sync::Arc,
time::Duration,
};
@@ -96,15 +96,17 @@ use crate::{
#[cfg(test)]
mod tests;
-pub const APPROVAL_SESSIONS: SessionWindowSize = new_session_window_size!(6);
-
const APPROVAL_CHECKING_TIMEOUT: Duration = Duration::from_secs(120);
/// How long are we willing to wait for approval signatures?
///
/// 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";
@@ -113,7 +115,9 @@ const LOG_TARGET: &str = "parachain::approval-voting";
#[derive(Debug, Clone)]
pub struct Config {
/// The column family in the DB where approval-voting data is stored.
- pub col_data: u32,
+ pub col_approval_data: u32,
+ /// The of the DB where rolling session info is stored.
+ pub col_session_data: u32,
/// The slot duration of the consensus algorithm, in milliseconds. Should be evenly
/// divisible by 500.
pub slot_duration_millis: u64,
@@ -353,7 +357,10 @@ impl ApprovalVotingSubsystem {
keystore,
slot_duration_millis: config.slot_duration_millis,
db,
- db_config: DatabaseConfig { col_data: config.col_data },
+ db_config: DatabaseConfig {
+ col_approval_data: config.col_approval_data,
+ col_session_data: config.col_session_data,
+ },
mode: Mode::Syncing(sync_oracle),
metrics,
}
@@ -362,7 +369,10 @@ impl ApprovalVotingSubsystem {
/// Revert to the block corresponding to the specified `hash`.
/// The operation is not allowed for blocks older than the last finalized one.
pub fn revert_to(&self, hash: Hash) -> Result<(), SubsystemError> {
- let config = approval_db::v1::Config { col_data: self.db_config.col_data };
+ let config = approval_db::v1::Config {
+ col_approval_data: self.db_config.col_approval_data,
+ col_session_data: self.db_config.col_session_data,
+ };
let mut backend = approval_db::v1::DbBackend::new(self.db.clone(), config);
let mut overlay = OverlayedBackend::new(&backend);
@@ -373,6 +383,25 @@ impl ApprovalVotingSubsystem {
}
}
+// Checks and logs approval vote db state. It is perfectly normal to start with an
+// empty approval vote DB if we changed DB type or the node will sync from scratch.
+fn db_sanity_check(db: Arc, config: DatabaseConfig) -> SubsystemResult<()> {
+ let backend = DbBackend::new(db, config);
+ let all_blocks = backend.load_all_blocks()?;
+
+ if all_blocks.is_empty() {
+ gum::info!(target: LOG_TARGET, "Starting with an empty approval vote DB.",);
+ } else {
+ gum::debug!(
+ target: LOG_TARGET,
+ "Starting with {} blocks in approval vote DB.",
+ all_blocks.len()
+ );
+ }
+
+ Ok(())
+}
+
#[overseer::subsystem(ApprovalVoting, error = SubsystemError, prefix = self::overseer)]
impl ApprovalVotingSubsystem {
fn start(self, ctx: Context) -> SpawnedSubsystem {
@@ -592,10 +621,7 @@ impl CurrentlyCheckingSet {
.candidate_hash_map
.remove(&approval_state.candidate_hash)
.unwrap_or_default();
- approvals_cache.put(
- approval_state.candidate_hash.clone(),
- approval_state.approval_outcome.clone(),
- );
+ approvals_cache.put(approval_state.candidate_hash, approval_state.approval_outcome);
return (out, approval_state)
}
}
@@ -610,6 +636,9 @@ struct State {
slot_duration_millis: u64,
clock: Box,
assignment_criteria: Box,
+ // Require for `RollingSessionWindow`.
+ db_config: DatabaseConfig,
+ db: Arc,
}
#[overseer::contextbounds(ApprovalVoting, prefix = self::overseer)]
@@ -631,8 +660,17 @@ impl State {
match session_window {
None => {
let sender = ctx.sender().clone();
- self.session_window =
- Some(RollingSessionWindow::new(sender, APPROVAL_SESSIONS, head).await?);
+ self.session_window = Some(
+ RollingSessionWindow::new(
+ sender,
+ head,
+ DatabaseParams {
+ db: self.db.clone(),
+ db_column: self.db_config.col_session_data,
+ },
+ )
+ .await?,
+ );
Ok(None)
},
Some(mut session_window) => {
@@ -727,12 +765,18 @@ async fn run(
where
B: Backend,
{
+ if let Err(err) = db_sanity_check(subsystem.db.clone(), subsystem.db_config) {
+ gum::warn!(target: LOG_TARGET, ?err, "Could not run approval vote DB sanity check");
+ }
+
let mut state = State {
session_window: None,
keystore: subsystem.keystore,
slot_duration_millis: subsystem.slot_duration_millis,
clock,
assignment_criteria,
+ db_config: subsystem.db_config,
+ db: subsystem.db,
};
let mut wakeups = Wakeups::default();
@@ -1097,7 +1141,7 @@ async fn handle_from_overseer(
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
let mut actions = Vec::new();
- for activated in update.activated {
+ if let Some(activated) = update.activated {
let head = activated.hash;
match import::handle_new_head(ctx, state, db, head, &*last_finalized_height).await {
Err(e) => return Err(SubsystemError::with_origin("db", e)),
@@ -1231,7 +1275,7 @@ async fn get_approval_signatures_for_candidate(
Some(e) => e,
};
- let relay_hashes = entry.block_assignments.iter().map(|(relay_hash, _)| relay_hash);
+ let relay_hashes = entry.block_assignments.keys();
let mut candidate_indices = HashSet::new();
// Retrieve `CoreIndices`/`CandidateIndices` as required by approval-distribution:
@@ -1283,6 +1327,11 @@ async fn get_approval_signatures_for_candidate(
// No need to block subsystem on this (also required to break cycle).
// We should not be sending this message frequently - caller must make sure this is bounded.
+ gum::trace!(
+ target: LOG_TARGET,
+ ?candidate_hash,
+ "Spawning task for fetching sinatures from approval-distribution"
+ );
ctx.spawn("get-approval-signatures", Box::pin(get_approvals))
}
@@ -1798,7 +1847,7 @@ fn check_and_import_approval(
)),
};
- let pubkey = match session_info.validators.get(approval.validator.0 as usize) {
+ let pubkey = match session_info.validators.get(approval.validator) {
Some(k) => k,
None => respond_early!(ApprovalCheckResult::Bad(
ApprovalCheckError::InvalidValidatorIndex(approval.validator),
@@ -2357,28 +2406,14 @@ async fn launch_approval(
match val_rx.await {
Err(_) => return ApprovalState::failed(validator_index, candidate_hash),
- Ok(Ok(ValidationResult::Valid(commitments, _))) => {
+ Ok(Ok(ValidationResult::Valid(_, _))) => {
// Validation checked out. Issue an approval command. If the underlying service is unreachable,
// then there isn't anything we can do.
gum::trace!(target: LOG_TARGET, ?candidate_hash, ?para_id, "Candidate Valid");
- let expected_commitments_hash = candidate.commitments_hash;
- if commitments.hash() == expected_commitments_hash {
- let _ = metrics_guard.take();
- return ApprovalState::approved(validator_index, candidate_hash)
- } else {
- // Commitments mismatch - issue a dispute.
- issue_local_invalid_statement(
- &mut sender,
- session_index,
- candidate_hash,
- candidate.clone(),
- );
-
- metrics_guard.take().on_approval_invalid();
- return ApprovalState::failed(validator_index, candidate_hash)
- }
+ let _ = metrics_guard.take();
+ return ApprovalState::approved(validator_index, candidate_hash)
},
Ok(Ok(ValidationResult::Invalid(reason))) => {
gum::warn!(
@@ -2469,7 +2504,7 @@ async fn issue_approval(
};
let candidate_hash = match block_entry.candidate(candidate_index as usize) {
- Some((_, h)) => h.clone(),
+ Some((_, h)) => *h,
None => {
gum::warn!(
target: LOG_TARGET,
@@ -2498,7 +2533,7 @@ async fn issue_approval(
},
};
- let validator_pubkey = match session_info.validators.get(validator_index.0 as usize) {
+ let validator_pubkey = match session_info.validators.get(validator_index) {
Some(p) => p,
None => {
gum::warn!(
diff --git a/node/core/approval-voting/src/tests.rs b/node/core/approval-voting/src/tests.rs
index 66d1402ed6dc..b9063c8ade25 100644
--- a/node/core/approval-voting/src/tests.rs
+++ b/node/core/approval-voting/src/tests.rs
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see .
+use crate::tests::test_constants::TEST_CONFIG;
+
use super::*;
use polkadot_node_primitives::{
approval::{
@@ -32,7 +34,7 @@ use polkadot_node_subsystem_test_helpers as test_helpers;
use polkadot_node_subsystem_util::TimeoutExt;
use polkadot_overseer::HeadSupportsParachains;
use polkadot_primitives::v2::{
- CandidateCommitments, CandidateEvent, CoreIndex, GroupIndex, Header, Id as ParaId,
+ CandidateCommitments, CandidateEvent, CoreIndex, GroupIndex, Header, Id as ParaId, IndexedVec,
ValidationCode, ValidatorSignature,
};
use std::time::Duration;
@@ -111,9 +113,12 @@ fn make_sync_oracle(val: bool) -> (Box, TestSyncOracleHan
pub mod test_constants {
use crate::approval_db::v1::Config as DatabaseConfig;
const DATA_COL: u32 = 0;
- pub(crate) const NUM_COLUMNS: u32 = 1;
+ const SESSION_DATA_COL: u32 = 1;
+
+ pub(crate) const NUM_COLUMNS: u32 = 2;
- pub(crate) const TEST_CONFIG: DatabaseConfig = DatabaseConfig { col_data: DATA_COL };
+ pub(crate) const TEST_CONFIG: DatabaseConfig =
+ DatabaseConfig { col_approval_data: DATA_COL, col_session_data: SESSION_DATA_COL };
}
struct MockSupportsParachains;
@@ -487,8 +492,9 @@ fn test_harness>(
context,
ApprovalVotingSubsystem::with_config(
Config {
- col_data: test_constants::TEST_CONFIG.col_data,
+ col_approval_data: test_constants::TEST_CONFIG.col_approval_data,
slot_duration_millis: SLOT_DURATION_MILLIS,
+ col_session_data: TEST_CONFIG.col_session_data,
},
Arc::new(db),
Arc::new(keystore),
@@ -739,7 +745,10 @@ fn session_info(keys: &[Sr25519Keyring]) -> SessionInfo {
validators: keys.iter().map(|v| v.public().into()).collect(),
discovery_keys: keys.iter().map(|v| v.public().into()).collect(),
assignment_keys: keys.iter().map(|v| v.public().into()).collect(),
- validator_groups: vec![vec![ValidatorIndex(0)], vec![ValidatorIndex(1)]],
+ validator_groups: IndexedVec::>::from(vec![
+ vec![ValidatorIndex(0)],
+ vec![ValidatorIndex(1)],
+ ]),
n_cores: keys.len() as _,
needed_approvals: 2,
zeroth_delay_tranche_width: 5,
@@ -808,6 +817,37 @@ async fn import_block(
);
if !fork {
+ 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()));
+ }
+ );
+
assert_matches!(
overseer_recv(overseer).await,
AllMessages::RuntimeApi(
@@ -1521,11 +1561,11 @@ fn subsystem_second_approval_import_only_schedules_wakeups() {
Sr25519Keyring::Eve,
];
let session_info = SessionInfo {
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0), ValidatorIndex(1)],
vec![ValidatorIndex(2)],
vec![ValidatorIndex(3), ValidatorIndex(4)],
- ],
+ ]),
needed_approvals: 1,
..session_info(&validators)
};
@@ -1858,11 +1898,11 @@ fn import_checked_approval_updates_entries_and_schedules() {
Sr25519Keyring::Eve,
];
let session_info = SessionInfo {
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0), ValidatorIndex(1)],
vec![ValidatorIndex(2)],
vec![ValidatorIndex(3), ValidatorIndex(4)],
- ],
+ ]),
..session_info(&validators)
};
@@ -2015,11 +2055,11 @@ fn subsystem_import_checked_approval_sets_one_block_bit_at_a_time() {
Sr25519Keyring::Eve,
];
let session_info = SessionInfo {
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0), ValidatorIndex(1)],
vec![ValidatorIndex(2)],
vec![ValidatorIndex(3), ValidatorIndex(4)],
- ],
+ ]),
..session_info(&validators)
};
@@ -2305,11 +2345,11 @@ fn subsystem_validate_approvals_cache() {
Sr25519Keyring::Eve,
];
let session_info = SessionInfo {
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0), ValidatorIndex(1)],
vec![ValidatorIndex(2)],
vec![ValidatorIndex(3), ValidatorIndex(4)],
- ],
+ ]),
..session_info(&validators)
};
@@ -2517,11 +2557,11 @@ where
Sr25519Keyring::Ferdie,
];
let session_info = SessionInfo {
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0), ValidatorIndex(1)],
vec![ValidatorIndex(2), ValidatorIndex(3)],
vec![ValidatorIndex(4), ValidatorIndex(5)],
- ],
+ ]),
relay_vrf_modulo_samples: 2,
no_show_slots,
..session_info(&validators)
@@ -2837,11 +2877,11 @@ fn pre_covers_dont_stall_approval() {
Sr25519Keyring::One,
];
let session_info = SessionInfo {
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0), ValidatorIndex(1)],
vec![ValidatorIndex(2), ValidatorIndex(5)],
vec![ValidatorIndex(3), ValidatorIndex(4)],
- ],
+ ]),
..session_info(&validators)
};
@@ -3014,11 +3054,11 @@ fn waits_until_approving_assignments_are_old_enough() {
Sr25519Keyring::One,
];
let session_info = SessionInfo {
- validator_groups: vec![
+ validator_groups: IndexedVec::>::from(vec![
vec![ValidatorIndex(0), ValidatorIndex(1)],
vec![ValidatorIndex(2), ValidatorIndex(5)],
vec![ValidatorIndex(3), ValidatorIndex(4)],
- ],
+ ]),
..session_info(&validators)
};
diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml
index 9cea9f1bdc24..73cdb72d8012 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.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
futures = "0.3.21"
futures-timer = "3.0.2"
-kvdb = "0.11.0"
+kvdb = "0.13.0"
thiserror = "1.0.31"
gum = { package = "tracing-gum", path = "../../gum" }
bitvec = "1.0.0"
@@ -24,7 +24,7 @@ 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.13.0"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
diff --git a/node/core/av-store/src/lib.rs b/node/core/av-store/src/lib.rs
index cd1685e32ea8..cbbbf2bbd7dc 100644
--- a/node/core/av-store/src/lib.rs
+++ b/node/core/av-store/src/lib.rs
@@ -61,7 +61,7 @@ const PRUNE_BY_TIME_PREFIX: &[u8; 13] = b"prune_by_time";
// We have some keys we want to map to empty values because existence of the key is enough. We use this because
// rocksdb doesn't support empty values.
-const TOMBSTONE_VALUE: &[u8] = &*b" ";
+const TOMBSTONE_VALUE: &[u8] = b" ";
/// Unavailable blocks are kept for 1 hour.
const KEEP_UNAVAILABLE_FOR: Duration = Duration::from_secs(60 * 60);
@@ -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/av-store/src/metrics.rs b/node/core/av-store/src/metrics.rs
index c50932c6173e..fedeb2b7d0e5 100644
--- a/node/core/av-store/src/metrics.rs
+++ b/node/core/av-store/src/metrics.rs
@@ -140,10 +140,16 @@ impl metrics::Metrics for Metrics {
registry,
)?,
get_chunk: prometheus::register(
- prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
- "polkadot_parachain_av_store_get_chunk",
- "Time spent fetching requested chunks.`",
- ))?,
+ prometheus::Histogram::with_opts(
+ prometheus::HistogramOpts::new(
+ "polkadot_parachain_av_store_get_chunk",
+ "Time spent fetching requested chunks.`",
+ )
+ .buckets(vec![
+ 0.000625, 0.00125, 0.0025, 0.005, 0.0075, 0.01, 0.025, 0.05, 0.1, 0.25,
+ 0.5, 1.0, 2.5, 5.0, 10.0,
+ ]),
+ )?,
registry,
)?,
};
diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
index 474cac5908b0..7428372eec62 100644
--- a/node/core/backing/Cargo.toml
+++ b/node/core/backing/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "polkadot-node-core-backing"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/backing/src/lib.rs b/node/core/backing/src/lib.rs
index dbc6e3f81903..2f8aa4490f27 100644
--- a/node/core/backing/src/lib.rs
+++ b/node/core/backing/src/lib.rs
@@ -482,9 +482,7 @@ impl TableContextTrait for TableContext {
}
fn is_member_of(&self, authority: &ValidatorIndex, group: &ParaId) -> bool {
- self.groups
- .get(group)
- .map_or(false, |g| g.iter().position(|a| a == authority).is_some())
+ self.groups.get(group).map_or(false, |g| g.iter().any(|a| a == authority))
}
fn requisite_votes(&self, group: &ParaId) -> usize {
@@ -499,7 +497,7 @@ struct InvalidErasureRoot;
fn primitive_statement_to_table(s: &SignedFullStatement) -> TableSignedStatement {
let statement = match s.payload() {
Statement::Seconded(c) => TableStatement::Seconded(c.clone()),
- Statement::Valid(h) => TableStatement::Valid(h.clone()),
+ Statement::Valid(h) => TableStatement::Valid(*h),
};
TableSignedStatement {
@@ -621,6 +619,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 +628,7 @@ async fn request_pov(
.send_message(AvailabilityDistributionMessage::FetchPoV {
relay_parent,
from_validator,
+ para_id,
candidate_hash,
pov_hash,
tx,
@@ -697,8 +697,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 c10c60518235..b94cc6708c74 100644
--- a/node/core/bitfield-signing/Cargo.toml
+++ b/node/core/bitfield-signing/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "polkadot-node-core-bitfield-signing"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/bitfield-signing/src/lib.rs b/node/core/bitfield-signing/src/lib.rs
index 13a3dd28705f..64cbb18cc44c 100644
--- a/node/core/bitfield-signing/src/lib.rs
+++ b/node/core/bitfield-signing/src/lib.rs
@@ -225,7 +225,7 @@ async fn run(
}
}
- for leaf in update.activated {
+ if let Some(leaf) = update.activated {
let sender = ctx.sender().clone();
let leaf_hash = leaf.hash;
diff --git a/node/core/bitfield-signing/src/metrics.rs b/node/core/bitfield-signing/src/metrics.rs
index ab4e73be0eeb..571a0c335bd7 100644
--- a/node/core/bitfield-signing/src/metrics.rs
+++ b/node/core/bitfield-signing/src/metrics.rs
@@ -50,10 +50,16 @@ impl metrics::Metrics for Metrics {
registry,
)?,
run: prometheus::register(
- prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
- "polkadot_parachain_bitfield_signing_run",
- "Time spent within `bitfield_signing::run`",
- ))?,
+ prometheus::Histogram::with_opts(
+ prometheus::HistogramOpts::new(
+ "polkadot_parachain_bitfield_signing_run",
+ "Time spent within `bitfield_signing::run`",
+ )
+ .buckets(vec![
+ 0.000625, 0.00125, 0.0025, 0.005, 0.0075, 0.01, 0.025, 0.05, 0.1, 0.25,
+ 0.5, 1.0, 2.5, 5.0, 10.0,
+ ]),
+ )?,
registry,
)?,
};
diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
index 29464f603340..56fa0e08115d 100644
--- a/node/core/candidate-validation/Cargo.toml
+++ b/node/core/candidate-validation/Cargo.toml
@@ -1,12 +1,13 @@
[package]
name = "polkadot-node-core-candidate-validation"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
async-trait = "0.1.57"
futures = "0.3.21"
+futures-timer = "3.0.2"
gum = { package = "tracing-gum", path = "../../gum" }
sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/node/core/candidate-validation/src/lib.rs b/node/core/candidate-validation/src/lib.rs
index c3775ba1c453..743a053f2ec7 100644
--- a/node/core/candidate-validation/src/lib.rs
+++ b/node/core/candidate-validation/src/lib.rs
@@ -60,6 +60,12 @@ mod tests;
const LOG_TARGET: &'static str = "parachain::candidate-validation";
+/// The amount of time to wait before retrying after an AmbiguousWorkerDeath validation error.
+#[cfg(not(test))]
+const PVF_EXECUTION_RETRY_DELAY: Duration = Duration::from_secs(3);
+#[cfg(test)]
+const PVF_EXECUTION_RETRY_DELAY: Duration = Duration::from_millis(200);
+
/// Configuration for the candidate validation subsystem
#[derive(Clone)]
pub struct Config {
@@ -314,12 +320,12 @@ where
match validation_backend.precheck_pvf(validation_code).await {
Ok(_) => PreCheckOutcome::Valid,
- Err(prepare_err) => match prepare_err {
- PrepareError::Prevalidation(_) |
- PrepareError::Preparation(_) |
- PrepareError::Panic(_) => PreCheckOutcome::Invalid,
- PrepareError::TimedOut | PrepareError::DidNotMakeIt => PreCheckOutcome::Failed,
- },
+ Err(prepare_err) =>
+ if prepare_err.is_deterministic() {
+ PreCheckOutcome::Invalid
+ } else {
+ PreCheckOutcome::Failed
+ },
}
}
@@ -461,11 +467,6 @@ where
.await;
if let Ok(ValidationResult::Valid(ref outputs, _)) = validation_result {
- // If validation produces new commitments we consider the candidate invalid.
- if candidate_receipt.commitments_hash != outputs.hash() {
- return Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))
- }
-
let (tx, rx) = oneshot::channel();
match runtime_api_request(
sender,
@@ -490,7 +491,7 @@ where
}
async fn validate_candidate_exhaustive(
- mut validation_backend: impl ValidationBackend,
+ mut validation_backend: impl ValidationBackend + Send,
persisted_validation_data: PersistedValidationData,
validation_code: ValidationCode,
candidate_receipt: CandidateReceipt,
@@ -501,7 +502,7 @@ 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();
+ let para_id = candidate_receipt.descriptor.para_id;
gum::debug!(
target: LOG_TARGET,
?validation_code_hash,
@@ -512,7 +513,7 @@ async fn validate_candidate_exhaustive(
if let Err(e) = perform_basic_checks(
&candidate_receipt.descriptor,
persisted_validation_data.max_pov_size,
- &*pov,
+ &pov,
&validation_code_hash,
) {
gum::info!(target: LOG_TARGET, ?para_id, "Invalid candidate (basic checks)");
@@ -551,7 +552,7 @@ async fn validate_candidate_exhaustive(
};
let result = validation_backend
- .validate_candidate(raw_validation_code.to_vec(), timeout, params)
+ .validate_candidate_with_retry(raw_validation_code.to_vec(), timeout, params)
.await;
if let Err(ref error) = result {
@@ -603,55 +604,84 @@ async fn validate_candidate_exhaustive(
#[async_trait]
trait ValidationBackend {
+ /// Tries executing a PVF a single time (no retries).
async fn validate_candidate(
+ &mut self,
+ pvf: Pvf,
+ timeout: Duration,
+ encoded_params: Vec,
+ ) -> Result;
+
+ /// Tries executing a PVF. Will retry once if an error is encountered that may have been
+ /// transient.
+ async fn validate_candidate_with_retry(
&mut self,
raw_validation_code: Vec,
timeout: Duration,
params: ValidationParams,
- ) -> Result;
+ ) -> Result {
+ // Construct the PVF a single time, since it is an expensive operation. Cloning it is cheap.
+ let pvf = Pvf::from_code(raw_validation_code);
- async fn precheck_pvf(&mut self, pvf: Pvf) -> Result<(), PrepareError>;
+ let mut validation_result =
+ self.validate_candidate(pvf.clone(), timeout, params.encode()).await;
+
+ // If we get an AmbiguousWorkerDeath error, retry once after a brief delay, on the
+ // assumption that the conditions that caused this error may have been transient.
+ if let Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)) =
+ validation_result
+ {
+ // Wait a brief delay before retrying.
+ futures_timer::Delay::new(PVF_EXECUTION_RETRY_DELAY).await;
+
+ gum::debug!(
+ target: LOG_TARGET,
+ ?pvf,
+ "Re-trying failed candidate validation due to AmbiguousWorkerDeath."
+ );
+
+ // Encode the params again when re-trying. We expect the retry case to be relatively
+ // rare, and we want to avoid unconditionally cloning data.
+ validation_result = self.validate_candidate(pvf, timeout, params.encode()).await;
+ }
+
+ validation_result
+ }
+
+ async fn precheck_pvf(&mut self, pvf: Pvf) -> Result;
}
#[async_trait]
impl ValidationBackend for ValidationHost {
+ /// Tries executing a PVF a single time (no retries).
async fn validate_candidate(
&mut self,
- raw_validation_code: Vec,
+ pvf: Pvf,
timeout: Duration,
- params: ValidationParams,
+ encoded_params: Vec,
) -> Result {
+ let priority = polkadot_node_core_pvf::Priority::Normal;
+
let (tx, rx) = oneshot::channel();
- if let Err(err) = self
- .execute_pvf(
- Pvf::from_code(raw_validation_code),
- timeout,
- params.encode(),
- polkadot_node_core_pvf::Priority::Normal,
- tx,
- )
- .await
- {
+ if let Err(err) = self.execute_pvf(pvf, timeout, encoded_params, priority, tx).await {
return Err(ValidationError::InternalError(format!(
"cannot send pvf to the validation host: {:?}",
err
)))
}
- let validation_result = rx
- .await
- .map_err(|_| ValidationError::InternalError("validation was cancelled".into()))?;
-
- validation_result
+ rx.await
+ .map_err(|_| ValidationError::InternalError("validation was cancelled".into()))?
}
- async fn precheck_pvf(&mut self, pvf: Pvf) -> Result<(), PrepareError> {
+ async fn precheck_pvf(&mut self, pvf: Pvf) -> Result {
let (tx, rx) = oneshot::channel();
if let Err(_) = self.precheck_pvf(pvf, tx).await {
- return Err(PrepareError::DidNotMakeIt)
+ // Return an IO error if there was an error communicating with the host.
+ return Err(PrepareError::IoErr)
}
- let precheck_result = rx.await.or(Err(PrepareError::DidNotMakeIt))?;
+ let precheck_result = rx.await.or(Err(PrepareError::IoErr))?;
precheck_result
}
diff --git a/node/core/candidate-validation/src/tests.rs b/node/core/candidate-validation/src/tests.rs
index ecac13d1440d..c6003c734973 100644
--- a/node/core/candidate-validation/src/tests.rs
+++ b/node/core/candidate-validation/src/tests.rs
@@ -345,12 +345,19 @@ fn check_does_not_match() {
}
struct MockValidateCandidateBackend {
- result: Result,
+ result_list: Vec>,
+ num_times_called: usize,
}
impl MockValidateCandidateBackend {
fn with_hardcoded_result(result: Result) -> Self {
- Self { result }
+ Self { result_list: vec![result], num_times_called: 0 }
+ }
+
+ fn with_hardcoded_result_list(
+ result_list: Vec>,
+ ) -> Self {
+ Self { result_list, num_times_called: 0 }
}
}
@@ -358,14 +365,19 @@ impl MockValidateCandidateBackend {
impl ValidationBackend for MockValidateCandidateBackend {
async fn validate_candidate(
&mut self,
- _raw_validation_code: Vec,
+ _pvf: Pvf,
_timeout: Duration,
- _params: ValidationParams,
+ _encoded_params: Vec,
) -> Result {
- self.result.clone()
+ // This is expected to panic if called more times than expected, indicating an error in the
+ // test.
+ let result = self.result_list[self.num_times_called].clone();
+ self.num_times_called += 1;
+
+ result
}
- async fn precheck_pvf(&mut self, _pvf: Pvf) -> Result<(), PrepareError> {
+ async fn precheck_pvf(&mut self, _pvf: Pvf) -> Result {
unreachable!()
}
}
@@ -468,7 +480,7 @@ fn candidate_validation_bad_return_is_invalid() {
let v = executor::block_on(validate_candidate_exhaustive(
MockValidateCandidateBackend::with_hardcoded_result(Err(
- ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath),
+ ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
)),
validation_data,
validation_code,
@@ -479,6 +491,122 @@ fn candidate_validation_bad_return_is_invalid() {
))
.unwrap();
+ assert_matches!(v, ValidationResult::Invalid(InvalidCandidate::Timeout));
+}
+
+#[test]
+fn candidate_validation_one_ambiguous_error_is_valid() {
+ let validation_data = PersistedValidationData { max_pov_size: 1024, ..Default::default() };
+
+ let pov = PoV { block_data: BlockData(vec![1; 32]) };
+ let head_data = HeadData(vec![1, 1, 1]);
+ let validation_code = ValidationCode(vec![2; 16]);
+
+ let descriptor = make_valid_candidate_descriptor(
+ ParaId::from(1_u32),
+ dummy_hash(),
+ validation_data.hash(),
+ pov.hash(),
+ validation_code.hash(),
+ head_data.hash(),
+ dummy_hash(),
+ Sr25519Keyring::Alice,
+ );
+
+ let check = perform_basic_checks(
+ &descriptor,
+ validation_data.max_pov_size,
+ &pov,
+ &validation_code.hash(),
+ );
+ assert!(check.is_ok());
+
+ let validation_result = WasmValidationResult {
+ head_data,
+ new_validation_code: Some(vec![2, 2, 2].into()),
+ upward_messages: Vec::new(),
+ horizontal_messages: Vec::new(),
+ processed_downward_messages: 0,
+ hrmp_watermark: 0,
+ };
+
+ let commitments = CandidateCommitments {
+ head_data: validation_result.head_data.clone(),
+ upward_messages: validation_result.upward_messages.clone(),
+ horizontal_messages: validation_result.horizontal_messages.clone(),
+ new_validation_code: validation_result.new_validation_code.clone(),
+ processed_downward_messages: validation_result.processed_downward_messages,
+ hrmp_watermark: validation_result.hrmp_watermark,
+ };
+
+ let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: commitments.hash() };
+
+ let v = executor::block_on(validate_candidate_exhaustive(
+ MockValidateCandidateBackend::with_hardcoded_result_list(vec![
+ Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+ Ok(validation_result),
+ ]),
+ validation_data.clone(),
+ validation_code,
+ candidate_receipt,
+ Arc::new(pov),
+ Duration::from_secs(0),
+ &Default::default(),
+ ))
+ .unwrap();
+
+ assert_matches!(v, ValidationResult::Valid(outputs, used_validation_data) => {
+ assert_eq!(outputs.head_data, HeadData(vec![1, 1, 1]));
+ assert_eq!(outputs.upward_messages, Vec::::new());
+ assert_eq!(outputs.horizontal_messages, Vec::new());
+ assert_eq!(outputs.new_validation_code, Some(vec![2, 2, 2].into()));
+ assert_eq!(outputs.hrmp_watermark, 0);
+ assert_eq!(used_validation_data, validation_data);
+ });
+}
+
+#[test]
+fn candidate_validation_multiple_ambiguous_errors_is_invalid() {
+ let validation_data = PersistedValidationData { max_pov_size: 1024, ..Default::default() };
+
+ let pov = PoV { block_data: BlockData(vec![1; 32]) };
+ let validation_code = ValidationCode(vec![2; 16]);
+
+ let descriptor = make_valid_candidate_descriptor(
+ ParaId::from(1_u32),
+ dummy_hash(),
+ validation_data.hash(),
+ pov.hash(),
+ validation_code.hash(),
+ dummy_hash(),
+ dummy_hash(),
+ Sr25519Keyring::Alice,
+ );
+
+ let check = perform_basic_checks(
+ &descriptor,
+ validation_data.max_pov_size,
+ &pov,
+ &validation_code.hash(),
+ );
+ assert!(check.is_ok());
+
+ let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
+
+ let v = executor::block_on(validate_candidate_exhaustive(
+ MockValidateCandidateBackend::with_hardcoded_result_list(vec![
+ Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+ Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+ ]),
+ validation_data,
+ validation_code,
+ candidate_receipt,
+ Arc::new(pov),
+ Duration::from_secs(0),
+ &Default::default(),
+ ))
+ .unwrap();
+
assert_matches!(v, ValidationResult::Invalid(InvalidCandidate::ExecutionError(_)));
}
@@ -766,11 +894,11 @@ fn pov_decompression_failure_is_invalid() {
}
struct MockPreCheckBackend {
- result: Result<(), PrepareError>,
+ result: Result,
}
impl MockPreCheckBackend {
- fn with_hardcoded_result(result: Result<(), PrepareError>) -> Self {
+ fn with_hardcoded_result(result: Result) -> Self {
Self { result }
}
}
@@ -779,14 +907,14 @@ impl MockPreCheckBackend {
impl ValidationBackend for MockPreCheckBackend {
async fn validate_candidate(
&mut self,
- _raw_validation_code: Vec,
+ _pvf: Pvf,
_timeout: Duration,
- _params: ValidationParams,
+ _encoded_params: Vec,
) -> Result {
unreachable!()
}
- async fn precheck_pvf(&mut self, _pvf: Pvf) -> Result<(), PrepareError> {
+ async fn precheck_pvf(&mut self, _pvf: Pvf) -> Result {
self.result.clone()
}
}
@@ -803,7 +931,7 @@ fn precheck_works() {
let (check_fut, check_result) = precheck_pvf(
ctx.sender(),
- MockPreCheckBackend::with_hardcoded_result(Ok(())),
+ MockPreCheckBackend::with_hardcoded_result(Ok(Duration::default())),
relay_parent,
validation_code_hash,
)
@@ -849,7 +977,7 @@ fn precheck_invalid_pvf_blob_compression() {
let (check_fut, check_result) = precheck_pvf(
ctx.sender(),
- MockPreCheckBackend::with_hardcoded_result(Ok(())),
+ MockPreCheckBackend::with_hardcoded_result(Ok(Duration::default())),
relay_parent,
validation_code_hash,
)
@@ -925,5 +1053,5 @@ fn precheck_properly_classifies_outcomes() {
inner(Err(PrepareError::Panic("baz".to_owned())), PreCheckOutcome::Invalid);
inner(Err(PrepareError::TimedOut), PreCheckOutcome::Failed);
- inner(Err(PrepareError::DidNotMakeIt), PreCheckOutcome::Failed);
+ inner(Err(PrepareError::IoErr), PreCheckOutcome::Failed);
}
diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
index 51d860ce2f0a..571b840120f7 100644
--- a/node/core/chain-api/Cargo.toml
+++ b/node/core/chain-api/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "polkadot-node-core-chain-api"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
futures = "0.3.21"
diff --git a/node/core/chain-api/src/lib.rs b/node/core/chain-api/src/lib.rs
index 7205527982c1..b218c00c57e5 100644
--- a/node/core/chain-api/src/lib.rs
+++ b/node/core/chain-api/src/lib.rs
@@ -41,7 +41,7 @@ use polkadot_node_subsystem::{
messages::ChainApiMessage, overseer, FromOrchestra, OverseerSignal, SpawnedSubsystem,
SubsystemError, SubsystemResult,
};
-use polkadot_primitives::v2::{Block, BlockId};
+use polkadot_primitives::v2::Block;
mod metrics;
use self::metrics::Metrics;
@@ -99,10 +99,7 @@ where
},
ChainApiMessage::BlockHeader(hash, response_channel) => {
let _timer = subsystem.metrics.time_block_header();
- let result = subsystem
- .client
- .header(BlockId::Hash(hash))
- .map_err(|e| e.to_string().into());
+ let result = subsystem.client.header(hash).map_err(|e| e.to_string().into());
subsystem.metrics.on_request(result.is_ok());
let _ = response_channel.send(result);
},
@@ -134,7 +131,7 @@ where
let mut hash = hash;
let next_parent = core::iter::from_fn(|| {
- let maybe_header = subsystem.client.header(BlockId::Hash(hash));
+ let maybe_header = subsystem.client.header(hash);
match maybe_header {
// propagate the error
Err(e) => {
diff --git a/node/core/chain-api/src/tests.rs b/node/core/chain-api/src/tests.rs
index aa24b3621200..654458757e70 100644
--- a/node/core/chain-api/src/tests.rs
+++ b/node/core/chain-api/src/tests.rs
@@ -6,7 +6,7 @@ use std::collections::BTreeMap;
use polkadot_node_primitives::BlockWeight;
use polkadot_node_subsystem_test_helpers::{make_subsystem_context, TestSubsystemContextHandle};
-use polkadot_primitives::v2::{BlockId, BlockNumber, Hash, Header};
+use polkadot_primitives::v2::{BlockNumber, Hash, Header};
use sp_blockchain::Info as BlockInfo;
use sp_core::testing::TaskExecutor;
@@ -117,16 +117,14 @@ impl HeaderBackend for TestClient {
fn hash(&self, number: BlockNumber) -> sp_blockchain::Result> {
Ok(self.finalized_blocks.get(&number).copied())
}
- fn header(&self, id: BlockId) -> sp_blockchain::Result> {
- match id {
- // for error path testing
- BlockId::Hash(hash) if hash.is_zero() =>
- Err(sp_blockchain::Error::Backend("Zero hashes are illegal!".into())),
- BlockId::Hash(hash) => Ok(self.headers.get(&hash).cloned()),
- _ => unreachable!(),
+ fn header(&self, hash: Hash) -> sp_blockchain::Result> {
+ if hash.is_zero() {
+ Err(sp_blockchain::Error::Backend("Zero hashes are illegal!".into()))
+ } else {
+ Ok(self.headers.get(&hash).cloned())
}
}
- fn status(&self, _id: BlockId) -> sp_blockchain::Result {
+ fn status(&self, _hash: Hash) -> sp_blockchain::Result {
unimplemented!()
}
}
@@ -203,10 +201,8 @@ fn request_block_header() {
test_harness(|client, mut sender| {
async move {
const NOT_HERE: Hash = Hash::repeat_byte(0x5);
- let test_cases = [
- (TWO, client.header(BlockId::Hash(TWO)).unwrap()),
- (NOT_HERE, client.header(BlockId::Hash(NOT_HERE)).unwrap()),
- ];
+ let test_cases =
+ [(TWO, client.header(TWO).unwrap()), (NOT_HERE, client.header(NOT_HERE).unwrap())];
for (hash, expected) in &test_cases {
let (tx, rx) = oneshot::channel();
diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml
index 8d9875b6f389..8d4145461b94 100644
--- a/node/core/chain-selection/Cargo.toml
+++ b/node/core/chain-selection/Cargo.toml
@@ -1,9 +1,9 @@
[package]
name = "polkadot-node-core-chain-selection"
description = "Chain Selection Subsystem"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
futures = "0.3.21"
@@ -13,7 +13,7 @@ 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.13.0"
thiserror = "1.0.31"
parity-scale-codec = "3.1.5"
@@ -22,4 +22,4 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
parking_lot = "0.12.0"
assert_matches = "1"
-kvdb-memorydb = "0.11.0"
+kvdb-memorydb = "0.13.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/chain-selection/src/lib.rs b/node/core/chain-selection/src/lib.rs
index eb5ceac9b768..786454fb9891 100644
--- a/node/core/chain-selection/src/lib.rs
+++ b/node/core/chain-selection/src/lib.rs
@@ -381,6 +381,7 @@ async fn run(
) where
B: Backend,
{
+ #![allow(clippy::all)]
loop {
let res = run_until_error(
&mut ctx,
@@ -430,7 +431,7 @@ where
return Ok(())
}
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
- for leaf in update.activated {
+ if let Some(leaf) = update.activated {
let write_ops = handle_active_leaf(
ctx.sender(),
&*backend,
diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml
index bc22b40c8529..2ecc4d5e331f 100644
--- a/node/core/dispute-coordinator/Cargo.toml
+++ b/node/core/dispute-coordinator/Cargo.toml
@@ -1,16 +1,16 @@
[package]
name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.29"
-authors = ["Parity Technologies "]
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
[dependencies]
futures = "0.3.21"
gum = { package = "tracing-gum", path = "../../gum" }
parity-scale-codec = "3.1.5"
-kvdb = "0.11.0"
+kvdb = "0.13.0"
thiserror = "1.0.31"
-lru = "0.7.7"
+lru = "0.8.0"
fatality = "0.0.6"
polkadot-primitives = { path = "../../../primitives" }
@@ -22,7 +22,7 @@ sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste
[dev-dependencies]
-kvdb-memorydb = "0.11.0"
+kvdb-memorydb = "0.13.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/node/core/dispute-coordinator/src/db/v1.rs b/node/core/dispute-coordinator/src/db/v1.rs
index 2c643d341de2..ab571108af37 100644
--- a/node/core/dispute-coordinator/src/db/v1.rs
+++ b/node/core/dispute-coordinator/src/db/v1.rs
@@ -32,7 +32,7 @@ use crate::{
backend::{Backend, BackendWriteOp, OverlayedBackend},
error::{FatalError, FatalResult},
metrics::Metrics,
- DISPUTE_WINDOW, LOG_TARGET,
+ LOG_TARGET,
};
const RECENT_DISPUTES_KEY: &[u8; 15] = b"recent-disputes";
@@ -99,10 +99,10 @@ impl DbBackend {
encoded = ?candidate_votes_session_prefix(index),
"Cleaning votes for session index"
);
- tx.delete_prefix(self.config.col_data, &candidate_votes_session_prefix(index));
+ tx.delete_prefix(self.config.col_dispute_data, &candidate_votes_session_prefix(index));
}
// New watermark:
- tx.put_vec(self.config.col_data, CLEANED_VOTES_WATERMARK_KEY, clean_until.encode());
+ tx.put_vec(self.config.col_dispute_data, CLEANED_VOTES_WATERMARK_KEY, clean_until.encode());
Ok(())
}
}
@@ -148,21 +148,32 @@ impl Backend for DbBackend {
self.add_vote_cleanup_tx(&mut tx, session)?;
// Actually write the earliest session.
- tx.put_vec(self.config.col_data, EARLIEST_SESSION_KEY, session.encode());
+ tx.put_vec(
+ self.config.col_dispute_data,
+ EARLIEST_SESSION_KEY,
+ session.encode(),
+ );
},
BackendWriteOp::WriteRecentDisputes(recent_disputes) => {
- tx.put_vec(self.config.col_data, RECENT_DISPUTES_KEY, recent_disputes.encode());
+ tx.put_vec(
+ self.config.col_dispute_data,
+ RECENT_DISPUTES_KEY,
+ recent_disputes.encode(),
+ );
},
BackendWriteOp::WriteCandidateVotes(session, candidate_hash, votes) => {
gum::trace!(target: LOG_TARGET, ?session, "Writing candidate votes");
tx.put_vec(
- self.config.col_data,
+ self.config.col_dispute_data,
&candidate_votes_key(session, &candidate_hash),
votes.encode(),
);
},
BackendWriteOp::DeleteCandidateVotes(session, candidate_hash) => {
- tx.delete(self.config.col_data, &candidate_votes_key(session, &candidate_hash));
+ tx.delete(
+ self.config.col_dispute_data,
+ &candidate_votes_key(session, &candidate_hash),
+ );
},
}
}
@@ -195,7 +206,9 @@ fn candidate_votes_session_prefix(session: SessionIndex) -> [u8; 15 + 4] {
#[derive(Debug, Clone)]
pub struct ColumnConfiguration {
/// The column in the key-value DB where data is stored.
- pub col_data: u32,
+ pub col_dispute_data: u32,
+ /// The column in the key-value DB where session data is stored.
+ pub col_session_data: u32,
}
/// Tracked votes on candidates, for the purposes of dispute resolution.
@@ -257,8 +270,12 @@ impl From for crate::error::Error {
/// Result alias for DB errors.
pub type Result = std::result::Result;
-fn load_decode(db: &dyn Database, col_data: u32, key: &[u8]) -> Result> {
- match db.get(col_data, key)? {
+fn load_decode(
+ db: &dyn Database,
+ col_dispute_data: u32,
+ key: &[u8],
+) -> Result> {
+ match db.get(col_dispute_data, key)? {
None => Ok(None),
Some(raw) => D::decode(&mut &raw[..]).map(Some).map_err(Into::into),
}
@@ -271,7 +288,7 @@ pub(crate) fn load_candidate_votes(
session: SessionIndex,
candidate_hash: &CandidateHash,
) -> SubsystemResult> {
- load_decode(db, config.col_data, &candidate_votes_key(session, candidate_hash))
+ load_decode(db, config.col_dispute_data, &candidate_votes_key(session, candidate_hash))
.map_err(|e| SubsystemError::with_origin("dispute-coordinator", e))
}
@@ -280,7 +297,7 @@ pub(crate) fn load_earliest_session(
db: &dyn Database,
config: &ColumnConfiguration,
) -> SubsystemResult> {
- load_decode(db, config.col_data, EARLIEST_SESSION_KEY)
+ load_decode(db, config.col_dispute_data, EARLIEST_SESSION_KEY)
.map_err(|e| SubsystemError::with_origin("dispute-coordinator", e))
}
@@ -289,7 +306,7 @@ pub(crate) fn load_recent_disputes(
db: &dyn Database,
config: &ColumnConfiguration,
) -> SubsystemResult> {
- load_decode(db, config.col_data, RECENT_DISPUTES_KEY)
+ load_decode(db, config.col_dispute_data, RECENT_DISPUTES_KEY)
.map_err(|e| SubsystemError::with_origin("dispute-coordinator", e))
}
@@ -301,25 +318,24 @@ pub(crate) fn load_recent_disputes(
///
/// If one or more ancient sessions are pruned, all metadata on candidates within the ancient
/// session will be deleted.
-pub(crate) fn note_current_session(
+pub(crate) fn note_earliest_session(
overlay_db: &mut OverlayedBackend<'_, impl Backend>,
- current_session: SessionIndex,
+ new_earliest_session: SessionIndex,
) -> SubsystemResult<()> {
- let new_earliest = current_session.saturating_sub(DISPUTE_WINDOW.get());
match overlay_db.load_earliest_session()? {
None => {
// First launch - write new-earliest.
- overlay_db.write_earliest_session(new_earliest);
+ overlay_db.write_earliest_session(new_earliest_session);
},
- Some(prev_earliest) if new_earliest > prev_earliest => {
+ Some(prev_earliest) if new_earliest_session > prev_earliest => {
// Prune all data in the outdated sessions.
- overlay_db.write_earliest_session(new_earliest);
+ overlay_db.write_earliest_session(new_earliest_session);
// Clear recent disputes metadata.
{
let mut recent_disputes = overlay_db.load_recent_disputes()?.unwrap_or_default();
- let lower_bound = (new_earliest, CandidateHash(Hash::repeat_byte(0x00)));
+ let lower_bound = (new_earliest_session, CandidateHash(Hash::repeat_byte(0x00)));
let new_recent_disputes = recent_disputes.split_off(&lower_bound);
// Any remanining disputes are considered ancient and must be pruned.
@@ -347,7 +363,7 @@ fn load_cleaned_votes_watermark(
db: &dyn Database,
config: &ColumnConfiguration,
) -> FatalResult> {
- load_decode(db, config.col_data, CLEANED_VOTES_WATERMARK_KEY)
+ load_decode(db, config.col_dispute_data, CLEANED_VOTES_WATERMARK_KEY)
.map_err(|e| FatalError::DbReadFailed(e))
}
@@ -356,13 +372,14 @@ mod tests {
use super::*;
use ::test_helpers::{dummy_candidate_receipt, dummy_hash};
+ use polkadot_node_primitives::DISPUTE_WINDOW;
use polkadot_primitives::v2::{Hash, Id as ParaId};
fn make_db() -> DbBackend {
let db = kvdb_memorydb::create(1);
let db = polkadot_node_subsystem_util::database::kvdb_impl::DbAdapter::new(db, &[0]);
let store = Arc::new(db);
- let config = ColumnConfiguration { col_data: 0 };
+ let config = ColumnConfiguration { col_dispute_data: 0, col_session_data: 1 };
DbBackend::new(store, config, Metrics::default())
}
@@ -405,7 +422,7 @@ mod tests {
let mut overlay_db = OverlayedBackend::new(&backend);
gum::trace!(target: LOG_TARGET, ?current_session, "Noting current session");
- note_current_session(&mut overlay_db, current_session).unwrap();
+ note_earliest_session(&mut overlay_db, earliest_session).unwrap();
let write_ops = overlay_db.into_write_ops();
backend.write(write_ops).unwrap();
@@ -425,7 +442,7 @@ mod tests {
let current_session = current_session + 1;
let earliest_session = earliest_session + 1;
- note_current_session(&mut overlay_db, current_session).unwrap();
+ note_earliest_session(&mut overlay_db, earliest_session).unwrap();
let write_ops = overlay_db.into_write_ops();
backend.write(write_ops).unwrap();
@@ -582,7 +599,7 @@ mod tests {
}
#[test]
- fn note_current_session_prunes_old() {
+ fn note_earliest_session_prunes_old() {
let mut backend = make_db();
let hash_a = CandidateHash(Hash::repeat_byte(0x0a));
@@ -631,7 +648,7 @@ mod tests {
backend.write(write_ops).unwrap();
let mut overlay_db = OverlayedBackend::new(&backend);
- note_current_session(&mut overlay_db, current_session).unwrap();
+ note_earliest_session(&mut overlay_db, new_earliest_session).unwrap();
assert_eq!(overlay_db.load_earliest_session().unwrap(), Some(new_earliest_session));
diff --git a/node/core/dispute-coordinator/src/import.rs b/node/core/dispute-coordinator/src/import.rs
index 020d04792191..84adae167c7a 100644
--- a/node/core/dispute-coordinator/src/import.rs
+++ b/node/core/dispute-coordinator/src/import.rs
@@ -28,11 +28,13 @@
use std::collections::{BTreeMap, HashMap, HashSet};
-use polkadot_node_primitives::{CandidateVotes, SignedDisputeStatement};
+use polkadot_node_primitives::{
+ disputes::ValidCandidateVotes, CandidateVotes, DisputeStatus, SignedDisputeStatement, Timestamp,
+};
use polkadot_node_subsystem_util::rolling_session_window::RollingSessionWindow;
use polkadot_primitives::v2::{
- CandidateReceipt, DisputeStatement, SessionIndex, SessionInfo, ValidDisputeStatementKind,
- ValidatorId, ValidatorIndex, ValidatorPair, ValidatorSignature,
+ CandidateReceipt, DisputeStatement, IndexedVec, SessionIndex, SessionInfo,
+ ValidDisputeStatementKind, ValidatorId, ValidatorIndex, ValidatorPair, ValidatorSignature,
};
use sc_keystore::LocalKeystore;
@@ -63,7 +65,7 @@ impl<'a> CandidateEnvironment<'a> {
}
/// Validators in the candidate's session.
- pub fn validators(&self) -> &Vec {
+ pub fn validators(&self) -> &IndexedVec {
&self.session.validators
}
@@ -101,7 +103,7 @@ impl OwnVoteState {
let mut our_valid_votes = env
.controlled_indices()
.iter()
- .filter_map(|i| votes.valid.get_key_value(i))
+ .filter_map(|i| votes.valid.raw().get_key_value(i))
.peekable();
let mut our_invalid_votes =
env.controlled_indices.iter().filter_map(|i| votes.invalid.get_key_value(i));
@@ -154,22 +156,8 @@ pub struct CandidateVoteState {
/// Information about own votes:
own_vote: OwnVoteState,
- /// Whether or not the dispute concluded invalid.
- concluded_invalid: bool,
-
- /// Whether or not the dispute concluded valid.
- ///
- /// Note: Due to equivocations it is technically possible for a dispute to conclude both valid
- /// and invalid. In that case the invalid result takes precedence.
- concluded_valid: bool,
-
- /// There is an ongoing dispute and we reached f+1 votes -> the dispute is confirmed
- ///
- /// as at least one honest validator cast a vote for the candidate.
- is_confirmed: bool,
-
- /// Whether or not we have an ongoing dispute.
- is_disputed: bool,
+ /// Current dispute status, if there is any.
+ dispute_status: Option,
}
impl CandidateVoteState {
@@ -177,20 +165,16 @@ impl CandidateVoteState {
///
/// in case there have not been any previous votes.
pub fn new_from_receipt(candidate_receipt: CandidateReceipt) -> Self {
- let votes =
- CandidateVotes { candidate_receipt, valid: BTreeMap::new(), invalid: BTreeMap::new() };
- Self {
- votes,
- own_vote: OwnVoteState::NoVote,
- concluded_invalid: false,
- concluded_valid: false,
- is_confirmed: false,
- is_disputed: false,
- }
+ let votes = CandidateVotes {
+ candidate_receipt,
+ valid: ValidCandidateVotes::new(),
+ invalid: BTreeMap::new(),
+ };
+ Self { votes, own_vote: OwnVoteState::NoVote, dispute_status: None }
}
/// Create a new `CandidateVoteState` from already existing votes.
- pub fn new<'a>(votes: CandidateVotes, env: &CandidateEnvironment<'a>) -> Self {
+ pub fn new(votes: CandidateVotes, env: &CandidateEnvironment, now: Timestamp) -> Self {
let own_vote = OwnVoteState::new(&votes, env);
let n_validators = env.validators().len();
@@ -198,16 +182,31 @@ impl CandidateVoteState {
let supermajority_threshold =
polkadot_primitives::v2::supermajority_threshold(n_validators);
- let concluded_invalid = votes.invalid.len() >= supermajority_threshold;
- let concluded_valid = votes.valid.len() >= supermajority_threshold;
-
// We have a dispute, if we have votes on both sides:
- let is_disputed = !votes.invalid.is_empty() && !votes.valid.is_empty();
-
- let byzantine_threshold = polkadot_primitives::v2::byzantine_threshold(n_validators);
- let is_confirmed = votes.voted_indices().len() > byzantine_threshold && is_disputed;
+ let is_disputed = !votes.invalid.is_empty() && !votes.valid.raw().is_empty();
+
+ let dispute_status = if is_disputed {
+ let mut status = DisputeStatus::active();
+ let byzantine_threshold = polkadot_primitives::v2::byzantine_threshold(n_validators);
+ let is_confirmed = votes.voted_indices().len() > byzantine_threshold;
+ if is_confirmed {
+ status = status.confirm();
+ };
+ let concluded_for = votes.valid.raw().len() >= supermajority_threshold;
+ if concluded_for {
+ status = status.conclude_for(now);
+ };
+
+ let concluded_against = votes.invalid.len() >= supermajority_threshold;
+ if concluded_against {
+ status = status.conclude_against(now);
+ };
+ Some(status)
+ } else {
+ None
+ };
- Self { votes, own_vote, concluded_invalid, concluded_valid, is_confirmed, is_disputed }
+ Self { votes, own_vote, dispute_status }
}
/// Import fresh statements.
@@ -217,6 +216,7 @@ impl CandidateVoteState {
self,
env: &CandidateEnvironment,
statements: Vec<(SignedDisputeStatement, ValidatorIndex)>,
+ now: Timestamp,
) -> ImportResult {
let (mut votes, old_state) = self.into_old_state();
@@ -229,7 +229,7 @@ impl CandidateVoteState {
for (statement, val_index) in statements {
if env
.validators()
- .get(val_index.0 as usize)
+ .get(val_index)
.map_or(true, |v| v != statement.validator_public())
{
gum::error!(
@@ -267,25 +267,20 @@ impl CandidateVoteState {
match statement.statement() {
DisputeStatement::Valid(valid_kind) => {
- let fresh = insert_into_statements(
- &mut votes.valid,
- *valid_kind,
+ let fresh = votes.valid.insert_vote(
val_index,
+ *valid_kind,
statement.into_validator_signature(),
);
-
if fresh {
imported_valid_votes += 1;
}
},
DisputeStatement::Invalid(invalid_kind) => {
- let fresh = insert_into_statements(
- &mut votes.invalid,
- *invalid_kind,
- val_index,
- statement.into_validator_signature(),
- );
-
+ let fresh = votes
+ .invalid
+ .insert(val_index, (*invalid_kind, statement.into_validator_signature()))
+ .is_none();
if fresh {
new_invalid_voters.push(val_index);
imported_invalid_votes += 1;
@@ -294,7 +289,7 @@ impl CandidateVoteState {
}
}
- let new_state = Self::new(votes, env);
+ let new_state = Self::new(votes, env, now);
ImportResult {
old_state,
@@ -313,32 +308,15 @@ impl CandidateVoteState {
/// Extract `CandidateVotes` for handling import of new statements.
fn into_old_state(self) -> (CandidateVotes, CandidateVoteState<()>) {
- let CandidateVoteState {
- votes,
- own_vote,
- concluded_invalid,
- concluded_valid,
- is_confirmed,
- is_disputed,
- } = self;
- (
- votes,
- CandidateVoteState {
- votes: (),
- own_vote,
- concluded_invalid,
- concluded_valid,
- is_confirmed,
- is_disputed,
- },
- )
+ let CandidateVoteState { votes, own_vote, dispute_status } = self;
+ (votes, CandidateVoteState { votes: (), own_vote, dispute_status })
}
}
impl CandidateVoteState {
/// Whether or not we have an ongoing dispute.
pub fn is_disputed(&self) -> bool {
- self.is_disputed
+ self.dispute_status.is_some()
}
/// Whether there is an ongoing confirmed dispute.
@@ -346,7 +324,7 @@ impl CandidateVoteState {
/// This checks whether there is a dispute ongoing and we have more than byzantine threshold
/// votes.
pub fn is_confirmed(&self) -> bool {
- self.is_confirmed
+ self.dispute_status.map_or(false, |s| s.is_confirmed_concluded())
}
/// This machine already cast some vote in that dispute/for that candidate.
@@ -359,14 +337,19 @@ impl CandidateVoteState {
self.own_vote.approval_votes()
}
- /// Whether or not this dispute has already enough valid votes to conclude.
- pub fn is_concluded_valid(&self) -> bool {
- self.concluded_valid
+ /// Whether or not there is a dispute and it has already enough valid votes to conclude.
+ pub fn has_concluded_for(&self) -> bool {
+ self.dispute_status.map_or(false, |s| s.has_concluded_for())
+ }
+
+ /// Whether or not there is a dispute and it has already enough invalid votes to conclude.
+ pub fn has_concluded_against(&self) -> bool {
+ self.dispute_status.map_or(false, |s| s.has_concluded_against())
}
- /// Whether or not this dispute has already enough invalid votes to conclude.
- pub fn is_concluded_invalid(&self) -> bool {
- self.concluded_invalid
+ /// Get access to the dispute status, in case there is one.
+ pub fn dispute_status(&self) -> &Option {
+ &self.dispute_status
}
/// Access to underlying votes.
@@ -451,18 +434,18 @@ impl ImportResult {
}
/// Whether or not any dispute just concluded valid due to the import.
- pub fn is_freshly_concluded_valid(&self) -> bool {
- !self.old_state().is_concluded_valid() && self.new_state().is_concluded_valid()
+ pub fn is_freshly_concluded_for(&self) -> bool {
+ !self.old_state().has_concluded_for() && self.new_state().has_concluded_for()
}
/// Whether or not any dispute just concluded invalid due to the import.
- pub fn is_freshly_concluded_invalid(&self) -> bool {
- !self.old_state().is_concluded_invalid() && self.new_state().is_concluded_invalid()
+ pub fn is_freshly_concluded_against(&self) -> bool {
+ !self.old_state().has_concluded_against() && self.new_state().has_concluded_against()
}
/// Whether or not any dispute just concluded either invalid or valid due to the import.
pub fn is_freshly_concluded(&self) -> bool {
- self.is_freshly_concluded_invalid() || self.is_freshly_concluded_valid()
+ self.is_freshly_concluded_against() || self.is_freshly_concluded_for()
}
/// Modify this `ImportResult`s, by importing additional approval votes.
@@ -473,6 +456,7 @@ impl ImportResult {
self,
env: &CandidateEnvironment,
approval_votes: HashMap,
+ now: Timestamp,
) -> Self {
let Self {
old_state,
@@ -488,7 +472,7 @@ impl ImportResult {
for (index, sig) in approval_votes.into_iter() {
debug_assert!(
{
- let pub_key = &env.session_info().validators[index.0 as usize];
+ let pub_key = &env.session_info().validators.get(index).expect("indices are validated by approval-voting subsystem; qed");
let candidate_hash = votes.candidate_receipt.hash();
let session_index = env.session_index();
DisputeStatement::Valid(ValidDisputeStatementKind::ApprovalChecking)
@@ -497,18 +481,13 @@ impl ImportResult {
},
"Signature check for imported approval votes failed! This is a serious bug. Session: {:?}, candidate hash: {:?}, validator index: {:?}", env.session_index(), votes.candidate_receipt.hash(), index
);
- if insert_into_statements(
- &mut votes.valid,
- ValidDisputeStatementKind::ApprovalChecking,
- index,
- sig,
- ) {
+ if votes.valid.insert_vote(index, ValidDisputeStatementKind::ApprovalChecking, sig) {
imported_valid_votes += 1;
imported_approval_votes += 1;
}
}
- let new_state = CandidateVoteState::new(votes, env);
+ let new_state = CandidateVoteState::new(votes, env, now);
Self {
old_state,
@@ -538,7 +517,7 @@ impl ImportResult {
/// That is all `ValidatorIndex`es we have private keys for. Usually this will only be one.
fn find_controlled_validator_indices(
keystore: &LocalKeystore,
- validators: &[ValidatorId],
+ validators: &IndexedVec