diff --git a/.github/workflows/release-bot.yml b/.github/workflows/release-bot.yml
index ed0a8e5435b..29979e41e49 100644
--- a/.github/workflows/release-bot.yml
+++ b/.github/workflows/release-bot.yml
@@ -1,10 +1,9 @@
-name: Pushes release updates to a pre-defined Matrix room
+name: Pushes release notes to a Matrix room
on:
release:
types:
- - edited
- - prereleased
- published
+
jobs:
ping_matrix:
runs-on: ubuntu-latest
@@ -14,5 +13,11 @@ jobs:
with:
room_id: ${{ secrets.MATRIX_ROOM_ID }}
access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
- message: "**${{github.event.repository.full_name}}:** A release has been ${{github.event.action}}
Release version [${{github.event.release.tag_name}}](${{github.event.release.html_url}})
***Description:***
${{github.event.release.body}}
"
+ message: |
+ A (pre)release has been ${{github.event.action}} in **${{github.event.repository.full_name}}:**
+ Release version: [${{github.event.release.tag_name}}](${{github.event.release.html_url}})
+
+ -----
+
+ ${{github.event.release.body}}
server: "matrix.parity.io"
diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml
index 37d1e58ede8..46072c81bfd 100644
--- a/.github/workflows/srtool.yml
+++ b/.github/workflows/srtool.yml
@@ -1,5 +1,8 @@
name: Srtool build
+env:
+ SUBWASM_VERSION: 0.13.2
+
on:
push:
tags:
@@ -54,8 +57,8 @@ jobs:
# We now get extra information thanks to subwasm
- name: Install subwasm
run: |
- wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v0.12.0.deb
- sudo dpkg -i subwasm_linux_amd64_v0.12.0.deb
+ wget https://github.com/chevdor/subwasm/releases/download/v${{ env.SUBWASM_VERSION }}/subwasm_linux_amd64_v${{ env.SUBWASM_VERSION }}.deb
+ sudo dpkg -i subwasm_linux_amd64_v${{ env.SUBWASM_VERSION }}.deb
subwasm --version
- name: Show Runtime information
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee22b3cd61a..95c1a76fdd2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,54 +7,84 @@
stages:
- test
- - build
+ - publish
variables: &default-vars
GIT_STRATEGY: fetch
- GIT_DEPTH: 3
+ GIT_DEPTH: 100
CARGO_INCREMENTAL: 0
CARGO_TARGET_DIR: "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
- CI_SERVER_NAME: "GitLab CI"
+ CI_IMAGE: "paritytech/ci-linux:production"
+ DOCKER_OS: "debian:stretch"
+ ARCH: "x86_64"
+
+.rust-info-script: &rust-info-script
+ - rustup show
+ - cargo --version
+ - rustup +nightly show
+ - cargo +nightly --version
+ - bash --version
+ - sccache -s
+
+.publish-refs: &publish-refs
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "web"
+ - if: $CI_PIPELINE_SOURCE == "schedule"
+ - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
.docker-env: &docker-env
- image: paritytech/ci-linux:production
+ image: "${CI_IMAGE}"
before_script:
- - cargo -vV
- - rustc -vV
- - rustup show
- - cargo --version
+ - *rust-info-script
+ - ./scripts/ci/pre_cache.sh
- sccache -s
- only:
- - master
- - /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
- - schedules
- - web
- - /^[0-9]+$/ # PRs
- dependencies: []
- interruptible: true
retry:
max: 2
when:
- runner_system_failure
- unknown_failure
- api_failure
+ interruptible: true
tags:
- linux-docker
-#### stage: test
+.kubernetes-env: &kubernetes-env
+ retry:
+ max: 2
+ when:
+ - runner_system_failure
+ - unknown_failure
+ - api_failure
+ interruptible: true
+ tags:
+ - kubernetes-parity-build
-cargo-audit:
- stage: test
- <<: *docker-env
- except:
- - /^[0-9]+$/
- script:
- - cargo audit
- allow_failure: true
+.collect-artifacts: &collect-artifacts
+ artifacts:
+ name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
+ when: on_success
+ expire_in: 28 days
+ paths:
+ - ./artifacts/
+
+#### stage: test
test-linux-stable:
stage: test
<<: *docker-env
+ rules:
+ - if: $CI_COMMIT_REF_NAME == "master"
+ - if: $CI_COMMIT_REF_NAME == "tags"
+ - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+ # It doesn't make sense to build on every commit, so we build on tags
+ - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
+ variables:
+ ARE_WE_RELEASING_YET: maybe!
+ # web and schedule triggers can be provided with the non-empty variable ARE_WE_RELEASING_YET
+ # to run building and publishing the binary.
+ - if: $CI_PIPELINE_SOURCE == "web"
+ - if: $CI_PIPELINE_SOURCE == "schedule"
+ <<: *collect-artifacts
variables:
<<: *default-vars
# Enable debug assertions since we are running optimized builds for testing
@@ -62,4 +92,44 @@ test-linux-stable:
RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
script:
- time cargo test --all --release --locked
+ # It's almost free to produce a binary here, please refrain from using it in production since
+ # it goes with the debug assertions.
+ - if [ "${ARE_WE_RELEASING_YET}" ]; then
+ echo "___Building a binary___";
+ time cargo build --release --locked --bin polkadot-collator;
+ echo "___Packing the artifacts___";
+ mkdir -p ./artifacts;
+ mv ${CARGO_TARGET_DIR}/release/polkadot-collator ./artifacts/.;
+ echo "___The VERSION is either a tag name or the curent branch if triggered not by a tag___";
+ echo ${CI_COMMIT_REF_NAME} | tee ./artifacts/VERSION;
+ else
+ exit 0;
+ fi
- sccache -s
+
+#### stage: publish
+
+publish-s3:
+ stage: publish
+ <<: *kubernetes-env
+ image: paritytech/awscli:latest
+ <<: *publish-refs
+ variables:
+ GIT_STRATEGY: none
+ BUCKET: "releases.parity.io"
+ PREFIX: "cumulus/${ARCH}-${DOCKER_OS}"
+ before_script:
+ # Job will fail if no artifacts were provided by test-linux-stable job. It's only possible for
+ # this test to fail if the pipeline was triggered by web or schedule trigger without supplying
+ # a nono-empty ARE_WE_RELEASING_YET variable.
+ - test -e ./artifacts/polkadot-collator ||
+ ( echo "___No artifacts were provided by the previous job, please check the build there___"; exit 1 )
+ script:
+ - echo "___Publishing a binary with debug assertions!___"
+ - echo "___VERSION = $(cat ./artifacts/VERSION) ___"
+ - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/VERSION)/
+ - echo "___Updating objects in latest path___"
+ - aws s3 sync s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/VERSION)/ s3://${BUCKET}/${PREFIX}/latest/
+ after_script:
+ - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/
+ --recursive --human-readable --summarize
diff --git a/Cargo.lock b/Cargo.lock
index 8d95a481d5f..3d2e30f7e6c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -90,12 +90,6 @@ dependencies = [
"opaque-debug 0.3.0",
]
-[[package]]
-name = "ahash"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
-
[[package]]
name = "ahash"
version = "0.7.4"
@@ -299,15 +293,16 @@ dependencies = [
[[package]]
name = "async-process"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda"
+checksum = "a8f38756dd9ac84671c428afbf7c9f7495feff9ec5b0710f17100098e5b354ac"
dependencies = [
"async-io",
"blocking",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"event-listener",
"futures-lite",
+ "libc",
"once_cell",
"signal-hook",
"winapi 0.3.9",
@@ -368,7 +363,7 @@ version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -451,6 +446,19 @@ dependencies = [
"rustc-demangle",
]
+[[package]]
+name = "bae"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf"
+dependencies = [
+ "heck",
+ "proc-macro-error 0.4.12",
+ "proc-macro2 1.0.28",
+ "quote 1.0.9",
+ "syn 1.0.73",
+]
+
[[package]]
name = "base-x"
version = "0.2.8"
@@ -487,11 +495,11 @@ dependencies = [
[[package]]
name = "beefy-gadget"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#d2c063430652a244e4cfe1eac25544172892a44d"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
dependencies = [
"beefy-primitives",
"fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
"hex",
"log",
"parity-scale-codec",
@@ -511,16 +519,17 @@ dependencies = [
"sp-utils",
"substrate-prometheus-endpoint",
"thiserror",
+ "wasm-timer",
]
[[package]]
name = "beefy-gadget-rpc"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#d2c063430652a244e4cfe1eac25544172892a44d"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
dependencies = [
"beefy-gadget",
"beefy-primitives",
- "futures 0.3.15",
+ "futures 0.3.16",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -534,10 +543,15 @@ dependencies = [
"sp-runtime",
]
+[[package]]
+name = "beefy-merkle-tree"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
+
[[package]]
name = "beefy-primitives"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#d2c063430652a244e4cfe1eac25544172892a44d"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -569,7 +583,7 @@ dependencies = [
"lazy_static",
"lazycell",
"peeking_take_while",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"regex",
"rustc-hash",
@@ -715,7 +729,7 @@ dependencies = [
[[package]]
name = "bp-header-chain"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"finality-grandpa",
"frame-support",
@@ -730,7 +744,7 @@ dependencies = [
[[package]]
name = "bp-message-dispatch"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-runtime",
"frame-support",
@@ -741,7 +755,7 @@ dependencies = [
[[package]]
name = "bp-messages"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bitvec",
"bp-runtime",
@@ -756,7 +770,7 @@ dependencies = [
[[package]]
name = "bp-polkadot-core"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-messages",
"bp-runtime",
@@ -773,7 +787,7 @@ dependencies = [
[[package]]
name = "bp-rialto"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-messages",
"bp-runtime",
@@ -788,7 +802,7 @@ dependencies = [
[[package]]
name = "bp-rococo"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-messages",
"bp-polkadot-core",
@@ -805,7 +819,7 @@ dependencies = [
[[package]]
name = "bp-runtime"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"frame-support",
"hash-db",
@@ -822,7 +836,7 @@ dependencies = [
[[package]]
name = "bp-test-utils"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-header-chain",
"ed25519-dalek",
@@ -837,7 +851,7 @@ dependencies = [
[[package]]
name = "bp-wococo"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-messages",
"bp-polkadot-core",
@@ -852,7 +866,7 @@ dependencies = [
[[package]]
name = "bridge-runtime-common"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-message-dispatch",
"bp-messages",
@@ -1469,7 +1483,7 @@ dependencies = [
"cumulus-primitives-core",
"cumulus-test-client",
"cumulus-test-runtime",
- "futures 0.3.15",
+ "futures 0.3.16",
"parity-scale-codec",
"parking_lot 0.10.2",
"polkadot-node-primitives",
@@ -1498,11 +1512,12 @@ dependencies = [
"async-trait",
"cumulus-client-consensus-common",
"cumulus-primitives-core",
- "futures 0.3.15",
+ "futures 0.3.16",
"parity-scale-codec",
"parking_lot 0.10.2",
"polkadot-client",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-aura",
"sc-consensus-slots",
"sc-telemetry",
@@ -1530,7 +1545,7 @@ dependencies = [
"cumulus-test-runtime",
"cumulus-test-service",
"dyn-clone",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"parity-scale-codec",
"polkadot-primitives",
@@ -1538,6 +1553,7 @@ dependencies = [
"polkadot-test-client",
"sc-cli",
"sc-client-api",
+ "sc-consensus",
"sc-service",
"sp-api",
"sp-block-builder",
@@ -1561,11 +1577,12 @@ dependencies = [
"async-trait",
"cumulus-client-consensus-common",
"cumulus-primitives-core",
- "futures 0.3.15",
+ "futures 0.3.16",
"parity-scale-codec",
"parking_lot 0.10.2",
"polkadot-client",
"sc-client-api",
+ "sc-consensus",
"sp-api",
"sp-block-builder",
"sp-blockchain",
@@ -1584,7 +1601,7 @@ dependencies = [
"cumulus-primitives-core",
"cumulus-test-service",
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"parity-scale-codec",
"parking_lot 0.10.2",
@@ -1615,7 +1632,7 @@ version = "0.1.0"
dependencies = [
"cumulus-primitives-core",
"cumulus-test-service",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"parity-scale-codec",
"polkadot-node-primitives",
@@ -1623,9 +1640,10 @@ dependencies = [
"polkadot-overseer",
"polkadot-primitives",
"polkadot-test-client",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-cli",
"sc-client-api",
+ "sc-consensus",
"sc-service",
"sp-api",
"sp-consensus",
@@ -1654,6 +1672,7 @@ dependencies = [
"polkadot-service",
"sc-chain-spec",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-babe",
"sc-service",
"sc-telemetry",
@@ -1692,7 +1711,7 @@ dependencies = [
"frame-system",
"log",
"parity-scale-codec",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_chacha 0.3.1",
"sp-core",
"sp-io",
@@ -1742,7 +1761,7 @@ name = "cumulus-pallet-parachain-system-proc-macro"
version = "0.1.0"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -1790,7 +1809,7 @@ dependencies = [
"log",
"pallet-balances",
"parity-scale-codec",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_chacha 0.3.1",
"sp-core",
"sp-io",
@@ -1860,7 +1879,7 @@ dependencies = [
"cumulus-primitives-core",
"cumulus-test-client",
"cumulus-test-relay-sproof-builder",
- "futures 0.3.15",
+ "futures 0.3.16",
"parity-scale-codec",
"sp-consensus",
"sp-inherents",
@@ -2018,7 +2037,7 @@ dependencies = [
"cumulus-test-runtime",
"cumulus-test-runtime-upgrade",
"frame-system",
- "futures 0.3.15",
+ "futures 0.3.16",
"jsonrpc-core",
"pallet-transaction-payment",
"parity-scale-codec",
@@ -2033,6 +2052,7 @@ dependencies = [
"sc-chain-spec",
"sc-cli",
"sc-client-api",
+ "sc-consensus",
"sc-executor",
"sc-network",
"sc-rpc",
@@ -2045,7 +2065,6 @@ dependencies = [
"sp-arithmetic",
"sp-block-builder",
"sp-blockchain",
- "sp-consensus",
"sp-core",
"sp-keyring",
"sp-maybe-compressed-blob",
@@ -2120,7 +2139,7 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2146,7 +2165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320"
dependencies = [
"convert_case",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2254,7 +2273,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2301,7 +2320,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
dependencies = [
"heck",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2321,7 +2340,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2332,7 +2351,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2460,7 +2479,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
]
[[package]]
@@ -2479,7 +2498,7 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"synstructure",
@@ -2532,7 +2551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74a1bfdcc776e63e49f741c7ce6116fa1b887e8ac2e3ccb14dd4aa113e54feb9"
dependencies = [
"either",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"log",
"num-traits",
@@ -2547,7 +2566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
dependencies = [
"byteorder",
- "rand 0.8.3",
+ "rand 0.8.4",
"rustc-hex",
"static_assertions",
]
@@ -2580,7 +2599,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
]
@@ -2597,8 +2616,8 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
-version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -2616,13 +2635,16 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"Inflector",
"chrono",
"frame-benchmarking",
+ "frame-support",
"handlebars",
+ "linked-hash-map",
+ "log",
"parity-scale-codec",
"sc-cli",
"sc-client-db",
@@ -2639,8 +2661,8 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -2652,8 +2674,8 @@ dependencies = [
[[package]]
name = "frame-executive"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -2667,8 +2689,8 @@ dependencies = [
[[package]]
name = "frame-metadata"
-version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "14.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"serde",
@@ -2678,8 +2700,8 @@ dependencies = [
[[package]]
name = "frame-support"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"bitflags",
"frame-metadata",
@@ -2704,24 +2726,24 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"Inflector",
"frame-support-procedural-tools",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "frame-support-procedural-tools"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2729,17 +2751,17 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "frame-system"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"impl-trait-for-tuples",
@@ -2755,8 +2777,8 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2769,8 +2791,8 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2778,8 +2800,8 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2852,9 +2874,9 @@ checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
[[package]]
name = "futures"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
+checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
dependencies = [
"futures-channel",
"futures-core",
@@ -2867,9 +2889,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
+checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
dependencies = [
"futures-core",
"futures-sink",
@@ -2877,9 +2899,9 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
[[package]]
name = "futures-cpupool"
@@ -2893,9 +2915,9 @@ dependencies = [
[[package]]
name = "futures-executor"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
+checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
dependencies = [
"futures-core",
"futures-task",
@@ -2905,9 +2927,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
+checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
[[package]]
name = "futures-lite"
@@ -2926,13 +2948,13 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
+checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
dependencies = [
"autocfg 1.0.1",
"proc-macro-hack",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2950,15 +2972,15 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
[[package]]
name = "futures-task"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
[[package]]
name = "futures-timer"
@@ -2974,9 +2996,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
dependencies = [
"autocfg 1.0.1",
"futures 0.1.30",
@@ -3180,22 +3202,13 @@ dependencies = [
"crunchy",
]
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash 0.4.7",
-]
-
[[package]]
name = "hashbrown"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
dependencies = [
- "ahash 0.7.4",
+ "ahash",
]
[[package]]
@@ -3234,9 +3247,9 @@ dependencies = [
[[package]]
name = "hex-literal"
-version = "0.3.1"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8"
+checksum = "21e4590e13640f19f249fe3e4eca5113bc4289f2497710378190e7f4bd96f45b"
[[package]]
name = "hex-literal-impl"
@@ -3284,6 +3297,17 @@ dependencies = [
"hmac 0.7.1",
]
+[[package]]
+name = "hmac-drbg"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
+dependencies = [
+ "digest 0.9.0",
+ "generic-array 0.14.4",
+ "hmac 0.8.1",
+]
+
[[package]]
name = "hostname"
version = "0.3.1"
@@ -3521,7 +3545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6d52908d4ea4ab2bc22474ba149bf1011c8e2c3ebc1ff593ae28ac44f494b6"
dependencies = [
"async-io",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-lite",
"if-addrs",
"ipnet",
@@ -3563,19 +3587,19 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "indexmap"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
dependencies = [
"autocfg 1.0.1",
- "hashbrown 0.9.1",
+ "hashbrown",
"serde",
]
@@ -3609,7 +3633,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 2.0.2",
]
@@ -3733,7 +3757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3"
dependencies = [
"proc-macro-crate 0.1.5",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -3812,22 +3836,23 @@ dependencies = [
[[package]]
name = "jsonrpsee-proc-macros"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b4c85cfa6767333f3e5f3b2f2f765dad2727b0033ee270ae07c599bf43ed5ae"
+checksum = "f37924e16300e249a52a22cabb5632f846dc9760b39355f5e8bc70cd23dc6300"
dependencies = [
"Inflector",
+ "bae",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "jsonrpsee-types"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172"
+checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788"
dependencies = [
"async-trait",
"beef",
@@ -3837,19 +3862,19 @@ dependencies = [
"log",
"serde",
"serde_json",
- "soketto 0.5.0",
+ "soketto 0.6.0",
"thiserror",
]
[[package]]
name = "jsonrpsee-ws-client"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32"
+checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198"
dependencies = [
"async-trait",
"fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
"jsonrpsee-types",
"log",
"pin-project 1.0.7",
@@ -3857,7 +3882,7 @@ dependencies = [
"rustls-native-certs 0.5.0",
"serde",
"serde_json",
- "soketto 0.5.0",
+ "soketto 0.6.0",
"thiserror",
"tokio 0.2.24",
"tokio-rustls 0.15.0",
@@ -3883,8 +3908,8 @@ dependencies = [
[[package]]
name = "kusama-runtime"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -3896,7 +3921,7 @@ dependencies = [
"frame-system-benchmarking",
"frame-system-rpc-runtime-api",
"frame-try-runtime",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"pallet-authority-discovery",
"pallet-authorship",
@@ -4027,9 +4052,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.96"
+version = "0.2.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5600b4e6efc5421841a2138a6b082e07fe12f9aaa12783d50e5d13325b26b4fc"
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
[[package]]
name = "libloading"
@@ -4065,7 +4090,7 @@ checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b"
dependencies = [
"atomic",
"bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
"lazy_static",
"libp2p-core",
"libp2p-deflate",
@@ -4107,10 +4132,10 @@ dependencies = [
"ed25519-dalek",
"either",
"fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"lazy_static",
- "libsecp256k1",
+ "libsecp256k1 0.3.5",
"log",
"multihash",
"multistream-select",
@@ -4137,7 +4162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
dependencies = [
"flate2",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
]
@@ -4148,7 +4173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b"
dependencies = [
"async-std-resolver",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"log",
"smallvec 1.6.1",
@@ -4163,7 +4188,7 @@ checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf"
dependencies = [
"cuckoofilter",
"fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"libp2p-swarm",
"log",
@@ -4184,7 +4209,7 @@ dependencies = [
"byteorder",
"bytes 1.0.1",
"fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
"hex_fmt",
"libp2p-core",
"libp2p-swarm",
@@ -4205,7 +4230,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"libp2p-swarm",
"log",
@@ -4226,7 +4251,7 @@ dependencies = [
"bytes 1.0.1",
"either",
"fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"libp2p-swarm",
"log",
@@ -4250,13 +4275,13 @@ dependencies = [
"async-io",
"data-encoding",
"dns-parser",
- "futures 0.3.15",
+ "futures 0.3.16",
"if-watch",
"lazy_static",
"libp2p-core",
"libp2p-swarm",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"smallvec 1.6.1",
"socket2 0.4.0",
"void",
@@ -4270,7 +4295,7 @@ checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d"
dependencies = [
"asynchronous-codec 0.6.0",
"bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"log",
"nohash-hasher",
@@ -4288,7 +4313,7 @@ checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd"
dependencies = [
"bytes 1.0.1",
"curve25519-dalek 3.0.0",
- "futures 0.3.15",
+ "futures 0.3.16",
"lazy_static",
"libp2p-core",
"log",
@@ -4308,7 +4333,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"libp2p-swarm",
"log",
@@ -4325,7 +4350,7 @@ checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11"
dependencies = [
"asynchronous-codec 0.6.0",
"bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"log",
"prost",
@@ -4340,7 +4365,7 @@ version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"log",
"pin-project 1.0.7",
"rand 0.7.3",
@@ -4356,7 +4381,7 @@ checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d"
dependencies = [
"asynchronous-codec 0.6.0",
"bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"libp2p-core",
"libp2p-swarm",
@@ -4379,7 +4404,7 @@ checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3"
dependencies = [
"async-trait",
"bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"libp2p-swarm",
"log",
@@ -4398,7 +4423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92"
dependencies = [
"either",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"log",
"rand 0.7.3",
@@ -4424,7 +4449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9"
dependencies = [
"async-io",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"if-watch",
"ipnet",
@@ -4441,7 +4466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
dependencies = [
"async-std",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"log",
]
@@ -4452,7 +4477,7 @@ version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"js-sys",
"libp2p-core",
"parity-send-wrapper",
@@ -4467,7 +4492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74"
dependencies = [
"either",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-rustls",
"libp2p-core",
"log",
@@ -4484,7 +4509,7 @@ version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p-core",
"parking_lot 0.11.1",
"thiserror",
@@ -4512,13 +4537,61 @@ dependencies = [
"arrayref",
"crunchy",
"digest 0.8.1",
- "hmac-drbg",
+ "hmac-drbg 0.2.0",
"rand 0.7.3",
"sha2 0.8.2",
"subtle 2.4.0",
"typenum",
]
+[[package]]
+name = "libsecp256k1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73"
+dependencies = [
+ "arrayref",
+ "base64 0.12.3",
+ "digest 0.9.0",
+ "hmac-drbg 0.3.0",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
+ "rand 0.7.3",
+ "serde",
+ "sha2 0.9.2",
+ "typenum",
+]
+
+[[package]]
+name = "libsecp256k1-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80"
+dependencies = [
+ "crunchy",
+ "digest 0.9.0",
+ "subtle 2.4.0",
+]
+
+[[package]]
+name = "libsecp256k1-gen-ecmult"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "libsecp256k1-gen-genmult"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d"
+dependencies = [
+ "libsecp256k1-core",
+]
+
[[package]]
name = "libz-sys"
version = "1.1.2"
@@ -4532,9 +4605,9 @@ dependencies = [
[[package]]
name = "linked-hash-map"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
[[package]]
name = "linked_hash_set"
@@ -4608,11 +4681,11 @@ dependencies = [
[[package]]
name = "lru"
-version = "0.6.5"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba"
+checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91"
dependencies = [
- "hashbrown 0.9.1",
+ "hashbrown",
]
[[package]]
@@ -4715,7 +4788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5"
dependencies = [
"hash-db",
- "hashbrown 0.11.2",
+ "hashbrown",
"parity-util-mem",
]
@@ -4748,11 +4821,11 @@ dependencies = [
[[package]]
name = "metered-channel"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
]
@@ -4762,7 +4835,7 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c023c3f16109e7f33aa451f773fd61070e265b4977d0b6e344a51049296dd7df"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"rand 0.7.3",
"thrift",
]
@@ -4782,7 +4855,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19ce18b5423c573a13e80cb3046ea0af6379ef725dc3af4886bdb8f4e5093068"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -4914,8 +4987,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f"
dependencies = [
"proc-macro-crate 0.1.5",
- "proc-macro-error",
- "proc-macro2 1.0.27",
+ "proc-macro-error 1.0.4",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"synstructure",
@@ -4934,7 +5007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10ddc0eb0117736f19d556355464fc87efc8ad98b29e3fd84f02531eb6e90840"
dependencies = [
"bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
"log",
"pin-project 1.0.7",
"smallvec 1.6.1",
@@ -4953,7 +5026,7 @@ dependencies = [
"num-complex",
"num-rational 0.4.0",
"num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_distr",
"simba",
"typenum",
@@ -4965,7 +5038,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -5016,7 +5089,7 @@ dependencies = [
[[package]]
name = "node-primitives"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-system",
"parity-scale-codec",
@@ -5183,8 +5256,8 @@ dependencies = [
[[package]]
name = "pallet-assets"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5196,8 +5269,8 @@ dependencies = [
[[package]]
name = "pallet-aura"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5212,8 +5285,8 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5227,8 +5300,8 @@ dependencies = [
[[package]]
name = "pallet-authorship"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5241,8 +5314,8 @@ dependencies = [
[[package]]
name = "pallet-babe"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5264,8 +5337,8 @@ dependencies = [
[[package]]
name = "pallet-balances"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5279,22 +5352,48 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#d2c063430652a244e4cfe1eac25544172892a44d"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
+dependencies = [
+ "beefy-primitives",
+ "frame-support",
+ "frame-system",
+ "pallet-session",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-beefy-mmr"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0"
dependencies = [
+ "beefy-merkle-tree",
"beefy-primitives",
"frame-support",
"frame-system",
+ "hex",
+ "libsecp256k1 0.6.0",
+ "log",
+ "pallet-beefy",
+ "pallet-mmr",
+ "pallet-mmr-primitives",
"pallet-session",
"parity-scale-codec",
+ "scale-info",
"serde",
+ "sp-core",
+ "sp-io",
"sp-runtime",
"sp-std",
]
[[package]]
name = "pallet-bounties"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5308,7 +5407,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-dispatch"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-message-dispatch",
"bp-runtime",
@@ -5324,7 +5423,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-grandpa"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bp-header-chain",
"bp-runtime",
@@ -5345,7 +5444,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-messages"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bitvec",
"bp-message-dispatch",
@@ -5389,8 +5488,8 @@ dependencies = [
[[package]]
name = "pallet-collective"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5405,8 +5504,8 @@ dependencies = [
[[package]]
name = "pallet-democracy"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5420,8 +5519,8 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5441,8 +5540,8 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "5.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5458,8 +5557,8 @@ dependencies = [
[[package]]
name = "pallet-gilt"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5472,8 +5571,8 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
-version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5494,8 +5593,8 @@ dependencies = [
[[package]]
name = "pallet-identity"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5509,8 +5608,8 @@ dependencies = [
[[package]]
name = "pallet-im-online"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5528,8 +5627,8 @@ dependencies = [
[[package]]
name = "pallet-indices"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5544,8 +5643,8 @@ dependencies = [
[[package]]
name = "pallet-membership"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5559,8 +5658,8 @@ dependencies = [
[[package]]
name = "pallet-mmr"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"ckb-merkle-mountain-range",
"frame-benchmarking",
@@ -5576,8 +5675,8 @@ dependencies = [
[[package]]
name = "pallet-mmr-primitives"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5593,7 +5692,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-rpc"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -5610,8 +5709,8 @@ dependencies = [
[[package]]
name = "pallet-multisig"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5625,8 +5724,8 @@ dependencies = [
[[package]]
name = "pallet-nicks"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5638,8 +5737,8 @@ dependencies = [
[[package]]
name = "pallet-offences"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5654,8 +5753,8 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5676,8 +5775,8 @@ dependencies = [
[[package]]
name = "pallet-proxy"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5691,8 +5790,8 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5704,8 +5803,8 @@ dependencies = [
[[package]]
name = "pallet-recovery"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"enumflags2",
"frame-support",
@@ -5718,8 +5817,8 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5733,8 +5832,8 @@ dependencies = [
[[package]]
name = "pallet-session"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5753,8 +5852,8 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5769,8 +5868,8 @@ dependencies = [
[[package]]
name = "pallet-society"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5782,8 +5881,8 @@ dependencies = [
[[package]]
name = "pallet-staking"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5806,19 +5905,19 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "pallet-staking-reward-fn"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"log",
"sp-arithmetic",
@@ -5826,8 +5925,8 @@ dependencies = [
[[package]]
name = "pallet-sudo"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5839,8 +5938,8 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5857,8 +5956,8 @@ dependencies = [
[[package]]
name = "pallet-tips"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5872,8 +5971,8 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-support",
"frame-system",
@@ -5888,8 +5987,8 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -5905,8 +6004,8 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -5916,8 +6015,8 @@ dependencies = [
[[package]]
name = "pallet-treasury"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5932,8 +6031,8 @@ dependencies = [
[[package]]
name = "pallet-uniques"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5946,8 +6045,8 @@ dependencies = [
[[package]]
name = "pallet-utility"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5961,8 +6060,8 @@ dependencies = [
[[package]]
name = "pallet-vesting"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5975,8 +6074,8 @@ dependencies = [
[[package]]
name = "pallet-xcm"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"frame-support",
"frame-system",
@@ -6014,7 +6113,7 @@ dependencies = [
"log",
"memmap2",
"parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -6056,7 +6155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -6094,7 +6193,7 @@ checksum = "7ad6f1acec69b95caf435bbd158d486e5a0a44fcf51531e84922c59ff09e8457"
dependencies = [
"cfg-if 1.0.0",
"ethereum-types",
- "hashbrown 0.11.2",
+ "hashbrown",
"impl-trait-for-tuples",
"lru",
"parity-util-mem-derive",
@@ -6110,7 +6209,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"syn 1.0.73",
"synstructure",
]
@@ -6328,7 +6427,7 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
dependencies = [
"pest",
"pest_meta",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -6378,7 +6477,7 @@ version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -6389,7 +6488,7 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -6426,10 +6525,10 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
[[package]]
name = "polkadot-approval-distribution"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -6440,10 +6539,10 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"polkadot-node-network-protocol",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
@@ -6453,10 +6552,10 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"lru",
"parity-scale-codec",
"polkadot-erasure-coding",
@@ -6466,7 +6565,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"sp-application-crypto",
"sp-core",
"sp-keystore",
@@ -6476,10 +6575,10 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"lru",
"parity-scale-codec",
"polkadot-erasure-coding",
@@ -6488,18 +6587,18 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"thiserror",
"tracing",
]
[[package]]
name = "polkadot-cli"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"frame-benchmarking-cli",
- "futures 0.3.15",
+ "futures 0.3.16",
"log",
"polkadot-node-core-pvf",
"polkadot-service",
@@ -6515,8 +6614,8 @@ dependencies = [
[[package]]
name = "polkadot-client"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"beefy-primitives",
"frame-benchmarking",
@@ -6526,6 +6625,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-runtime",
"sc-client-api",
+ "sc-consensus",
"sc-executor",
"sc-service",
"sp-api",
@@ -6561,7 +6661,7 @@ dependencies = [
"exit-future 0.1.4",
"frame-benchmarking",
"frame-benchmarking-cli",
- "futures 0.3.15",
+ "futures 0.3.16",
"hex-literal 0.2.1",
"jsonrpc-core",
"log",
@@ -6617,11 +6717,11 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"always-assert",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
@@ -6637,8 +6737,8 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -6647,10 +6747,34 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "polkadot-dispute-distribution"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "futures 0.3.16",
+ "lru",
+ "parity-scale-codec",
+ "polkadot-erasure-coding",
+ "polkadot-node-core-runtime-api",
+ "polkadot-node-network-protocol",
+ "polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-node-subsystem-util",
+ "polkadot-primitives",
+ "rand 0.8.4",
+ "sc-network",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-keystore",
+ "thiserror",
+ "tracing",
+]
+
[[package]]
name = "polkadot-erasure-coding"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"parity-scale-codec",
"polkadot-node-primitives",
@@ -6663,15 +6787,15 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"polkadot-node-network-protocol",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_chacha 0.3.1",
"sp-application-crypto",
"sp-core",
@@ -6681,18 +6805,18 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
"parity-scale-codec",
"parking_lot 0.11.1",
"polkadot-node-network-protocol",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
+ "polkadot-overseer",
"polkadot-primitives",
- "sc-authority-discovery",
"sc-network",
"sp-consensus",
"strum",
@@ -6701,10 +6825,10 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-primitives",
@@ -6719,12 +6843,12 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bitvec",
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"kvdb",
"lru",
@@ -6749,11 +6873,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bitvec",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"kvdb",
"parity-scale-codec",
@@ -6769,11 +6893,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bitvec",
- "futures 0.3.15",
+ "futures 0.3.16",
"polkadot-erasure-coding",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -6787,10 +6911,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
@@ -6802,11 +6926,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
"parity-scale-codec",
"polkadot-node-core-pvf",
"polkadot-node-primitives",
@@ -6820,10 +6944,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
@@ -6833,16 +6957,64 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "polkadot-node-core-chain-selection"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "futures 0.3.16",
+ "futures-timer 3.0.2",
+ "kvdb",
+ "parity-scale-codec",
+ "polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-node-subsystem-util",
+ "polkadot-primitives",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "polkadot-node-core-dispute-coordinator"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "bitvec",
+ "derive_more 0.99.14",
+ "futures 0.3.16",
+ "kvdb",
+ "parity-scale-codec",
+ "polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-node-subsystem-util",
+ "polkadot-primitives",
+ "sc-keystore",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "polkadot-node-core-dispute-participation"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "futures 0.3.16",
+ "polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-primitives",
+ "thiserror",
+ "tracing",
+]
+
[[package]]
name = "polkadot-node-core-parachains-inherent"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"polkadot-node-subsystem",
- "polkadot-overseer",
"polkadot-primitives",
"sp-blockchain",
"sp-inherents",
@@ -6853,11 +7025,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bitvec",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
@@ -6868,21 +7040,21 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"always-assert",
"assert_matches",
"async-process",
"async-std",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"libc",
"parity-scale-codec",
"pin-project 1.0.7",
"polkadot-core-primitives",
"polkadot-parachain",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-executor",
"sc-executor-common",
"sc-executor-wasmtime",
@@ -6898,10 +7070,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"memory-lru",
"parity-util-mem",
"polkadot-node-subsystem",
@@ -6916,8 +7088,8 @@ dependencies = [
[[package]]
name = "polkadot-node-jaeger"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"async-std",
"lazy_static",
@@ -6933,26 +7105,44 @@ dependencies = [
]
[[package]]
-name = "polkadot-node-network-protocol"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+name = "polkadot-node-metrics"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
- "parity-scale-codec",
- "polkadot-node-jaeger",
- "polkadot-node-primitives",
- "polkadot-primitives",
- "sc-network",
- "strum",
+ "async-trait",
+ "futures 0.3.16",
+ "futures-timer 3.0.2",
+ "metered-channel",
+ "sc-network",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-keystore",
+ "substrate-prometheus-endpoint",
+]
+
+[[package]]
+name = "polkadot-node-network-protocol"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "async-trait",
+ "futures 0.3.16",
+ "parity-scale-codec",
+ "polkadot-node-jaeger",
+ "polkadot-node-primitives",
+ "polkadot-primitives",
+ "sc-authority-discovery",
+ "sc-network",
+ "strum",
"thiserror",
]
[[package]]
name = "polkadot-node-primitives"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"parity-scale-codec",
"polkadot-parachain",
"polkadot-primitives",
@@ -6967,68 +7157,83 @@ dependencies = [
"sp-maybe-compressed-blob",
"sp-runtime",
"thiserror",
+ "tracing",
"zstd",
]
[[package]]
name = "polkadot-node-subsystem"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "polkadot-node-jaeger",
+ "polkadot-node-subsystem-types",
+ "polkadot-overseer",
+]
+
+[[package]]
+name = "polkadot-node-subsystem-test-helpers"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "async-std",
"async-trait",
- "derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
- "lazy_static",
- "log",
- "mick-jaeger",
"parity-scale-codec",
"parking_lot 0.11.1",
"pin-project 1.0.7",
- "polkadot-node-jaeger",
- "polkadot-node-network-protocol",
"polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-node-subsystem-util",
"polkadot-primitives",
- "polkadot-procmacro-subsystem-dispatch-gen",
"polkadot-statement-table",
+ "sc-keystore",
"sc-network",
"smallvec 1.6.1",
+ "sp-application-crypto",
"sp-core",
- "substrate-prometheus-endpoint",
- "thiserror",
+ "sp-keyring",
+ "sp-keystore",
"tracing",
]
[[package]]
-name = "polkadot-node-subsystem-test-helpers"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+name = "polkadot-node-subsystem-types"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
+ "async-std",
"async-trait",
- "futures 0.3.15",
+ "derive_more 0.99.14",
+ "futures 0.3.16",
"futures-timer 3.0.2",
+ "lazy_static",
+ "log",
+ "mick-jaeger",
"parity-scale-codec",
"parking_lot 0.11.1",
"pin-project 1.0.7",
+ "polkadot-node-jaeger",
+ "polkadot-node-network-protocol",
"polkadot-node-primitives",
- "polkadot-node-subsystem",
- "polkadot-node-subsystem-util",
+ "polkadot-overseer-gen",
"polkadot-primitives",
"polkadot-statement-table",
"sc-network",
"smallvec 1.6.1",
"sp-core",
+ "substrate-prometheus-endpoint",
+ "thiserror",
"tracing",
]
[[package]]
name = "polkadot-node-subsystem-util"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"itertools 0.10.0",
"lru",
@@ -7036,11 +7241,13 @@ dependencies = [
"parity-scale-codec",
"pin-project 1.0.7",
"polkadot-node-jaeger",
+ "polkadot-node-metrics",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
"polkadot-node-subsystem",
+ "polkadot-overseer",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-network",
"sp-application-crypto",
"sp-core",
@@ -7052,29 +7259,72 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"lru",
+ "parking_lot 0.11.1",
+ "polkadot-node-metrics",
+ "polkadot-node-network-protocol",
"polkadot-node-primitives",
- "polkadot-node-subsystem",
- "polkadot-node-subsystem-util",
+ "polkadot-node-subsystem-types",
+ "polkadot-overseer-all-subsystems-gen",
+ "polkadot-overseer-gen",
"polkadot-primitives",
- "polkadot-procmacro-overseer-subsystems-gen",
"sc-client-api",
"sp-api",
"tracing",
]
+[[package]]
+name = "polkadot-overseer-all-subsystems-gen"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "assert_matches",
+ "proc-macro2 1.0.28",
+ "quote 1.0.9",
+ "syn 1.0.73",
+]
+
+[[package]]
+name = "polkadot-overseer-gen"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "async-trait",
+ "futures 0.3.16",
+ "futures-timer 3.0.2",
+ "metered-channel",
+ "pin-project 1.0.7",
+ "polkadot-node-network-protocol",
+ "polkadot-node-primitives",
+ "polkadot-overseer-gen-proc-macro",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "polkadot-overseer-gen-proc-macro"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
+dependencies = [
+ "proc-macro-crate 1.0.0",
+ "proc-macro2 1.0.28",
+ "quote 1.0.9",
+ "syn 1.0.73",
+]
+
[[package]]
name = "polkadot-parachain"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"derive_more 0.99.14",
+ "frame-support",
"parity-scale-codec",
"parity-util-mem",
"polkadot-core-primitives",
@@ -7086,12 +7336,12 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"bitvec",
"frame-system",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"parity-scale-codec",
"parity-util-mem",
"polkadot-core-primitives",
@@ -7114,32 +7364,10 @@ dependencies = [
"thiserror",
]
-[[package]]
-name = "polkadot-procmacro-overseer-subsystems-gen"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
-dependencies = [
- "assert_matches",
- "proc-macro2 1.0.27",
- "quote 1.0.9",
- "syn 1.0.73",
-]
-
-[[package]]
-name = "polkadot-procmacro-subsystem-dispatch-gen"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
-dependencies = [
- "assert_matches",
- "proc-macro2 1.0.27",
- "quote 1.0.9",
- "syn 1.0.73",
-]
-
[[package]]
name = "polkadot-rpc"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"beefy-gadget",
"beefy-gadget-rpc",
@@ -7158,6 +7386,7 @@ dependencies = [
"sc-keystore",
"sc-rpc",
"sc-sync-state-rpc",
+ "sc-transaction-pool-api",
"sp-api",
"sp-block-builder",
"sp-blockchain",
@@ -7165,14 +7394,13 @@ dependencies = [
"sp-consensus-babe",
"sp-keystore",
"sp-runtime",
- "sp-transaction-pool",
"substrate-frame-rpc-system",
]
[[package]]
name = "polkadot-runtime"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7184,7 +7412,7 @@ dependencies = [
"frame-system-benchmarking",
"frame-system-rpc-runtime-api",
"frame-try-runtime",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"pallet-authority-discovery",
"pallet-authorship",
@@ -7246,23 +7474,21 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
- "beefy-primitives",
"bitvec",
"frame-benchmarking",
"frame-support",
"frame-system",
"impl-trait-for-tuples",
- "libsecp256k1",
+ "libsecp256k1 0.6.0",
"log",
"pallet-authorship",
"pallet-babe",
"pallet-balances",
- "pallet-beefy",
+ "pallet-beefy-mmr",
"pallet-election-provider-multi-phase",
- "pallet-mmr",
"pallet-offences",
"pallet-session",
"pallet-staking",
@@ -7291,15 +7517,15 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
+ "bitflags",
"bitvec",
"derive_more 0.99.14",
"frame-benchmarking",
"frame-support",
"frame-system",
- "libsecp256k1",
"log",
"pallet-authority-discovery",
"pallet-authorship",
@@ -7311,7 +7537,7 @@ dependencies = [
"pallet-vesting",
"parity-scale-codec",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_chacha 0.3.1",
"rustc-hex",
"serde",
@@ -7330,15 +7556,15 @@ dependencies = [
[[package]]
name = "polkadot-service"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"async-trait",
"beefy-gadget",
"beefy-primitives",
"frame-system-rpc-runtime-api",
- "futures 0.3.15",
- "hex-literal 0.3.1",
+ "futures 0.3.16",
+ "hex-literal 0.3.3",
"kusama-runtime",
"kvdb",
"kvdb-rocksdb",
@@ -7353,6 +7579,7 @@ dependencies = [
"polkadot-availability-recovery",
"polkadot-client",
"polkadot-collator-protocol",
+ "polkadot-dispute-distribution",
"polkadot-gossip-support",
"polkadot-network-bridge",
"polkadot-node-collation-generation",
@@ -7362,6 +7589,9 @@ dependencies = [
"polkadot-node-core-bitfield-signing",
"polkadot-node-core-candidate-validation",
"polkadot-node-core-chain-api",
+ "polkadot-node-core-chain-selection",
+ "polkadot-node-core-dispute-coordinator",
+ "polkadot-node-core-dispute-participation",
"polkadot-node-core-parachains-inherent",
"polkadot-node-core-provisioner",
"polkadot-node-core-runtime-api",
@@ -7375,7 +7605,7 @@ dependencies = [
"polkadot-runtime",
"polkadot-runtime-parachains",
"polkadot-statement-distribution",
- "rococo-runtime 0.9.8",
+ "rococo-runtime 0.9.9",
"sc-authority-discovery",
"sc-basic-authorship",
"sc-block-builder",
@@ -7388,10 +7618,10 @@ dependencies = [
"sc-consensus-uncles",
"sc-executor",
"sc-finality-grandpa",
- "sc-finality-grandpa-warp-sync",
"sc-keystore",
"sc-network",
"sc-service",
+ "sc-sync-state-rpc",
"sc-telemetry",
"sc-transaction-pool",
"serde",
@@ -7422,11 +7652,11 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"arrayvec 0.5.2",
- "futures 0.3.15",
+ "futures 0.3.16",
"indexmap",
"parity-scale-codec",
"polkadot-node-network-protocol",
@@ -7443,8 +7673,8 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -7453,8 +7683,8 @@ dependencies = [
[[package]]
name = "polkadot-test-client"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"parity-scale-codec",
"polkadot-node-subsystem",
@@ -7478,8 +7708,8 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7506,6 +7736,7 @@ dependencies = [
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
"pallet-vesting",
+ "pallet-xcm",
"parity-scale-codec",
"polkadot-parachain",
"polkadot-primitives",
@@ -7530,17 +7761,20 @@ dependencies = [
"sp-transaction-pool",
"sp-version",
"substrate-wasm-builder",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
]
[[package]]
name = "polkadot-test-service"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"frame-benchmarking",
"frame-system",
"futures 0.1.30",
- "futures 0.3.15",
+ "futures 0.3.16",
"hex",
"pallet-balances",
"pallet-staking",
@@ -7555,7 +7789,7 @@ dependencies = [
"polkadot-runtime-parachains",
"polkadot-service",
"polkadot-test-runtime",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-authority-discovery",
"sc-chain-spec",
"sc-cli",
@@ -7682,26 +7916,52 @@ dependencies = [
"toml",
]
+[[package]]
+name = "proc-macro-error"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
+dependencies = [
+ "proc-macro-error-attr 0.4.12",
+ "proc-macro2 1.0.28",
+ "quote 1.0.9",
+ "syn 1.0.73",
+ "version_check",
+]
+
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
- "proc-macro-error-attr",
- "proc-macro2 1.0.27",
+ "proc-macro-error-attr 1.0.4",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"version_check",
]
+[[package]]
+name = "proc-macro-error-attr"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
+dependencies = [
+ "proc-macro2 1.0.28",
+ "quote 1.0.9",
+ "syn 1.0.73",
+ "syn-mid",
+ "version_check",
+]
+
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"version_check",
]
@@ -7729,9 +7989,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
dependencies = [
"unicode-xid 0.2.1",
]
@@ -7786,7 +8046,7 @@ checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
dependencies = [
"anyhow",
"itertools 0.9.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -7859,7 +8119,7 @@ version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
]
[[package]]
@@ -7926,9 +8186,9 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
dependencies = [
"libc",
"rand_chacha 0.3.1",
@@ -8006,7 +8266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "051b398806e42b9cd04ad9ec8f81e355d0a382c543ac6672c62f5a5b452ef142"
dependencies = [
"num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -8202,7 +8462,7 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -8261,8 +8521,8 @@ dependencies = [
[[package]]
name = "remote-externalities"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"env_logger 0.8.3",
"hex",
@@ -8354,7 +8614,7 @@ dependencies = [
"frame-support",
"frame-system",
"hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"pallet-assets",
"pallet-aura",
@@ -8388,8 +8648,8 @@ dependencies = [
[[package]]
name = "rococo-runtime"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"beefy-primitives",
"bp-messages",
@@ -8401,13 +8661,14 @@ dependencies = [
"frame-support",
"frame-system",
"frame-system-rpc-runtime-api",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"pallet-authority-discovery",
"pallet-authorship",
"pallet-babe",
"pallet-balances",
"pallet-beefy",
+ "pallet-beefy-mmr",
"pallet-bridge-dispatch",
"pallet-bridge-grandpa",
"pallet-bridge-messages",
@@ -8572,7 +8833,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"pin-project 0.4.27",
"static_assertions",
]
@@ -8612,25 +8873,24 @@ dependencies = [
[[package]]
name = "sc-allocator"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"log",
"sp-core",
- "sp-std",
"sp-wasm-interface",
"thiserror",
]
[[package]]
name = "sc-authority-discovery"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"derive_more 0.99.14",
"either",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"ip_network",
"libp2p",
@@ -8653,10 +8913,10 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"log",
"parity-scale-codec",
@@ -8664,20 +8924,20 @@ dependencies = [
"sc-client-api",
"sc-proposer-metrics",
"sc-telemetry",
+ "sc-transaction-pool-api",
"sp-api",
"sp-blockchain",
"sp-consensus",
"sp-core",
"sp-inherents",
"sp-runtime",
- "sp-transaction-pool",
"substrate-prometheus-endpoint",
]
[[package]]
name = "sc-block-builder"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -8692,43 +8952,39 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
"sc-chain-spec-derive",
- "sc-consensus-babe",
- "sc-consensus-epochs",
- "sc-finality-grandpa",
"sc-network",
"sc-telemetry",
"serde",
"serde_json",
- "sp-consensus-babe",
"sp-core",
"sp-runtime",
]
[[package]]
name = "sc-chain-spec-derive"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "sc-cli"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"chrono",
"fdlimit",
- "futures 0.3.15",
+ "futures 0.3.16",
"hex",
"libp2p",
"log",
@@ -8761,12 +9017,12 @@ dependencies = [
[[package]]
name = "sc-client-api"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"derive_more 0.99.14",
"fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
"hash-db",
"kvdb",
"lazy_static",
@@ -8774,6 +9030,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
"sc-executor",
+ "sc-transaction-pool-api",
"sp-api",
"sp-blockchain",
"sp-consensus",
@@ -8786,7 +9043,6 @@ dependencies = [
"sp-state-machine",
"sp-std",
"sp-storage",
- "sp-transaction-pool",
"sp-trie",
"sp-utils",
"sp-version",
@@ -8795,8 +9051,8 @@ dependencies = [
[[package]]
name = "sc-client-db"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"blake2-rfc",
"hash-db",
@@ -8814,7 +9070,6 @@ dependencies = [
"sc-state-db",
"sp-arithmetic",
"sp-blockchain",
- "sp-consensus",
"sp-core",
"sp-database",
"sp-runtime",
@@ -8825,30 +9080,43 @@ dependencies = [
[[package]]
name = "sc-consensus"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
+ "futures 0.3.16",
+ "futures-timer 3.0.2",
+ "libp2p",
+ "log",
"parking_lot 0.11.1",
"sc-client-api",
+ "serde",
+ "sp-api",
"sp-blockchain",
"sp-consensus",
+ "sp-core",
"sp-runtime",
+ "sp-state-machine",
+ "sp-utils",
+ "substrate-prometheus-endpoint",
+ "thiserror",
+ "wasm-timer",
]
[[package]]
name = "sc-consensus-aura"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"log",
"parity-scale-codec",
"sc-block-builder",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-slots",
"sc-telemetry",
"sp-api",
@@ -8869,13 +9137,13 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"derive_more 0.99.14",
"fork-tree",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"log",
"merlin",
@@ -8888,6 +9156,7 @@ dependencies = [
"rand 0.7.3",
"retain_mut",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-epochs",
"sc-consensus-slots",
"sc-consensus-uncles",
@@ -8915,11 +9184,11 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -8939,8 +9208,8 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -8952,16 +9221,17 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
"sc-client-api",
+ "sc-consensus",
"sc-telemetry",
"sp-api",
"sp-application-crypto",
@@ -8980,8 +9250,8 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"sc-client-api",
"sp-authorship",
@@ -8991,12 +9261,12 @@ dependencies = [
[[package]]
name = "sc-executor"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"derive_more 0.99.14",
"lazy_static",
- "libsecp256k1",
+ "libsecp256k1 0.3.5",
"log",
"parity-scale-codec",
"parity-wasm 0.42.2",
@@ -9020,8 +9290,8 @@ dependencies = [
[[package]]
name = "sc-executor-common"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"derive_more 0.99.14",
"parity-scale-codec",
@@ -9037,8 +9307,8 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"log",
"parity-scale-codec",
@@ -9052,8 +9322,8 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -9072,22 +9342,22 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"derive_more 0.99.14",
"dyn-clone",
"finality-grandpa",
"fork-tree",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"linked-hash-map",
"log",
"parity-scale-codec",
"parking_lot 0.11.1",
"pin-project 1.0.7",
- "rand 0.7.3",
+ "rand 0.8.4",
"sc-block-builder",
"sc-client-api",
"sc-consensus",
@@ -9113,12 +9383,12 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"derive_more 0.99.14",
"finality-grandpa",
- "futures 0.3.15",
+ "futures 0.3.16",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -9135,53 +9405,32 @@ dependencies = [
"sp-runtime",
]
-[[package]]
-name = "sc-finality-grandpa-warp-sync"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
-dependencies = [
- "derive_more 0.99.14",
- "futures 0.3.15",
- "log",
- "num-traits",
- "parity-scale-codec",
- "parking_lot 0.11.1",
- "prost",
- "sc-client-api",
- "sc-finality-grandpa",
- "sc-network",
- "sc-service",
- "sp-blockchain",
- "sp-finality-grandpa",
- "sp-runtime",
-]
-
[[package]]
name = "sc-informant"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"ansi_term 0.12.1",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"log",
"parity-util-mem",
"sc-client-api",
"sc-network",
+ "sc-transaction-pool-api",
"sp-blockchain",
"sp-runtime",
- "sp-transaction-pool",
"wasm-timer",
]
[[package]]
name = "sc-keystore"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-util",
"hex",
"merlin",
@@ -9196,8 +9445,8 @@ dependencies = [
[[package]]
name = "sc-light"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"hash-db",
"lazy_static",
@@ -9215,8 +9464,8 @@ dependencies = [
[[package]]
name = "sc-network"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-std",
"async-trait",
@@ -9230,7 +9479,7 @@ dependencies = [
"erased-serde",
"fnv",
"fork-tree",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"hex",
"ip_network",
@@ -9248,6 +9497,7 @@ dependencies = [
"rand 0.7.3",
"sc-block-builder",
"sc-client-api",
+ "sc-consensus",
"sc-peerset",
"serde",
"serde_json",
@@ -9256,6 +9506,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-core",
+ "sp-finality-grandpa",
"sp-runtime",
"sp-utils",
"substrate-prometheus-endpoint",
@@ -9268,10 +9519,10 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"libp2p",
"log",
@@ -9285,12 +9536,12 @@ dependencies = [
[[package]]
name = "sc-offchain"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"bytes 0.5.6",
"fnv",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"hex",
"hyper 0.13.9",
@@ -9313,10 +9564,10 @@ dependencies = [
[[package]]
name = "sc-peerset"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p",
"log",
"serde_json",
@@ -9327,7 +9578,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9335,10 +9586,10 @@ dependencies = [
[[package]]
name = "sc-rpc"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"hash-db",
"jsonrpc-core",
"jsonrpc-pubsub",
@@ -9352,6 +9603,7 @@ dependencies = [
"sc-keystore",
"sc-rpc-api",
"sc-tracing",
+ "sc-transaction-pool-api",
"serde_json",
"sp-api",
"sp-blockchain",
@@ -9363,18 +9615,17 @@ dependencies = [
"sp-session",
"sp-state-machine",
"sp-tracing",
- "sp-transaction-pool",
"sp-utils",
"sp-version",
]
[[package]]
name = "sc-rpc-api"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -9383,20 +9634,20 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
"sc-chain-spec",
+ "sc-transaction-pool-api",
"serde",
"serde_json",
"sp-core",
"sp-rpc",
"sp-runtime",
"sp-tracing",
- "sp-transaction-pool",
"sp-version",
]
[[package]]
name = "sc-rpc-server"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"futures 0.1.30",
"jsonrpc-core",
@@ -9413,14 +9664,14 @@ dependencies = [
[[package]]
name = "sc-service"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"directories",
"exit-future 0.2.0",
"futures 0.1.30",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
"hash-db",
"jsonrpc-core",
@@ -9436,6 +9687,7 @@ dependencies = [
"sc-chain-spec",
"sc-client-api",
"sc-client-db",
+ "sc-consensus",
"sc-executor",
"sc-informant",
"sc-keystore",
@@ -9447,6 +9699,7 @@ dependencies = [
"sc-telemetry",
"sc-tracing",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"serde",
"serde_json",
"sp-api",
@@ -9479,8 +9732,8 @@ dependencies = [
[[package]]
name = "sc-state-db"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"log",
"parity-scale-codec",
@@ -9494,18 +9747,20 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
+ "parity-scale-codec",
"sc-chain-spec",
"sc-client-api",
"sc-consensus-babe",
"sc-consensus-epochs",
"sc-finality-grandpa",
"sc-rpc-api",
+ "serde",
"serde_json",
"sp-blockchain",
"sp-runtime",
@@ -9514,11 +9769,11 @@ dependencies = [
[[package]]
name = "sc-telemetry"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"chrono",
- "futures 0.3.15",
+ "futures 0.3.16",
"libp2p",
"log",
"parking_lot 0.11.1",
@@ -9534,8 +9789,8 @@ dependencies = [
[[package]]
name = "sc-tracing"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"ansi_term 0.12.1",
"atty",
@@ -9571,60 +9826,82 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
-name = "sc-transaction-graph"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+name = "sc-transaction-pool"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
+ "intervalier",
"linked-hash-map",
"log",
+ "parity-scale-codec",
"parity-util-mem",
"parking_lot 0.11.1",
"retain_mut",
+ "sc-client-api",
+ "sc-transaction-pool-api",
"serde",
+ "sp-api",
"sp-blockchain",
"sp-core",
"sp-runtime",
+ "sp-tracing",
"sp-transaction-pool",
"sp-utils",
+ "substrate-prometheus-endpoint",
"thiserror",
"wasm-timer",
]
[[package]]
-name = "sc-transaction-pool"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+name = "sc-transaction-pool-api"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
- "intervalier",
+ "derive_more 0.99.14",
+ "futures 0.3.16",
"log",
"parity-scale-codec",
- "parity-util-mem",
- "parking_lot 0.11.1",
- "sc-client-api",
- "sc-transaction-graph",
- "sp-api",
+ "serde",
"sp-blockchain",
- "sp-core",
"sp-runtime",
- "sp-tracing",
- "sp-transaction-pool",
- "sp-utils",
- "substrate-prometheus-endpoint",
"thiserror",
- "wasm-timer",
+]
+
+[[package]]
+name = "scale-info"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e62ff266e136db561a007c84569985805f84a1d5a08278e52c36aacb6e061b"
+dependencies = [
+ "bitvec",
+ "cfg-if 1.0.0",
+ "derive_more 0.99.14",
+ "parity-scale-codec",
+ "scale-info-derive",
+]
+
+[[package]]
+name = "scale-info-derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b648fa291891a4c80187a25532f6a7d96b82c70353e30b868b14632b8fe043d6"
+dependencies = [
+ "proc-macro-crate 1.0.0",
+ "proc-macro2 1.0.28",
+ "quote 1.0.9",
+ "syn 1.0.73",
]
[[package]]
@@ -9783,20 +10060,20 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.126"
+version = "1.0.127"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.126"
+version = "1.0.127"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -9897,7 +10174,7 @@ dependencies = [
"frame-support",
"frame-system",
"hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"parachain-info",
"parity-scale-codec",
@@ -9928,9 +10205,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
[[package]]
name = "signal-hook"
-version = "0.1.17"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
+checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac"
dependencies = [
"libc",
"signal-hook-registry",
@@ -9980,8 +10257,8 @@ dependencies = [
[[package]]
name = "slot-range-helper"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -10062,7 +10339,7 @@ dependencies = [
"base64 0.12.3",
"bytes 0.5.6",
"flate2",
- "futures 0.3.15",
+ "futures 0.3.16",
"httparse",
"log",
"rand 0.7.3",
@@ -10071,23 +10348,23 @@ dependencies = [
[[package]]
name = "soketto"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa"
+checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f"
dependencies = [
"base64 0.13.0",
"bytes 1.0.1",
- "futures 0.3.15",
+ "futures 0.3.16",
"httparse",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"sha-1 0.9.2",
]
[[package]]
name = "sp-api"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"hash-db",
"log",
@@ -10103,20 +10380,20 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"blake2-rfc",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "sp-application-crypto"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"serde",
@@ -10127,8 +10404,8 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -10141,8 +10418,8 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10153,8 +10430,8 @@ dependencies = [
[[package]]
name = "sp-authorship"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10165,8 +10442,8 @@ dependencies = [
[[package]]
name = "sp-block-builder"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10177,10 +10454,10 @@ dependencies = [
[[package]]
name = "sp-blockchain"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"log",
"lru",
"parity-scale-codec",
@@ -10195,13 +10472,12 @@ dependencies = [
[[package]]
name = "sp-consensus"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-timer 3.0.2",
- "libp2p",
"log",
"parity-scale-codec",
"parking_lot 0.11.1",
@@ -10222,8 +10498,8 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10239,8 +10515,8 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"merlin",
@@ -10261,8 +10537,8 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"sp-arithmetic",
@@ -10271,8 +10547,8 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -10283,21 +10559,21 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"base58",
"blake2-rfc",
"byteorder",
"dyn-clonable",
"ed25519-dalek",
- "futures 0.3.15",
+ "futures 0.3.16",
"hash-db",
"hash256-std-hasher",
"hex",
"impl-serde",
"lazy_static",
- "libsecp256k1",
+ "libsecp256k1 0.3.5",
"log",
"merlin",
"num-traits",
@@ -10327,8 +10603,8 @@ dependencies = [
[[package]]
name = "sp-database"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"kvdb",
"parking_lot 0.11.1",
@@ -10337,17 +10613,17 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "sp-externalities"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -10357,8 +10633,8 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"finality-grandpa",
"log",
@@ -10374,8 +10650,8 @@ dependencies = [
[[package]]
name = "sp-inherents"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -10388,12 +10664,12 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"hash-db",
- "libsecp256k1",
+ "libsecp256k1 0.3.5",
"log",
"parity-scale-codec",
"parking_lot 0.11.1",
@@ -10413,8 +10689,8 @@ dependencies = [
[[package]]
name = "sp-keyring"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"lazy_static",
"sp-core",
@@ -10424,12 +10700,12 @@ dependencies = [
[[package]]
name = "sp-keystore"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"derive_more 0.99.14",
- "futures 0.3.15",
+ "futures 0.3.16",
"merlin",
"parity-scale-codec",
"parking_lot 0.11.1",
@@ -10441,8 +10717,8 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"ruzstd",
"zstd",
@@ -10450,8 +10726,8 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"serde",
@@ -10463,19 +10739,19 @@ dependencies = [
[[package]]
name = "sp-npos-elections-compact"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "sp-offchain"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"sp-api",
"sp-core",
@@ -10485,15 +10761,15 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"backtrace",
]
[[package]]
name = "sp-rpc"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"rustc-hash",
"serde",
@@ -10503,8 +10779,8 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"either",
"hash256-std-hasher",
@@ -10524,8 +10800,8 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -10541,12 +10817,12 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"Inflector",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -10554,7 +10830,7 @@ dependencies = [
[[package]]
name = "sp-serializer"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"serde",
"serde_json",
@@ -10562,8 +10838,8 @@ dependencies = [
[[package]]
name = "sp-session"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10575,8 +10851,8 @@ dependencies = [
[[package]]
name = "sp-staking"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -10585,8 +10861,8 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"hash-db",
"log",
@@ -10608,13 +10884,13 @@ dependencies = [
[[package]]
name = "sp-std"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
[[package]]
name = "sp-storage"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10626,8 +10902,8 @@ dependencies = [
[[package]]
name = "sp-tasks"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"log",
"sp-core",
@@ -10640,7 +10916,7 @@ dependencies = [
[[package]]
name = "sp-test-primitives"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -10652,8 +10928,8 @@ dependencies = [
[[package]]
name = "sp-timestamp"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"futures-timer 3.0.2",
@@ -10669,8 +10945,8 @@ dependencies = [
[[package]]
name = "sp-tracing"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"erased-serde",
"log",
@@ -10687,24 +10963,17 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "derive_more 0.99.14",
- "futures 0.3.15",
- "log",
- "parity-scale-codec",
- "serde",
"sp-api",
- "sp-blockchain",
"sp-runtime",
- "thiserror",
]
[[package]]
name = "sp-transaction-storage-proof"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"log",
@@ -10718,8 +10987,8 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"hash-db",
"memory-db",
@@ -10732,10 +11001,10 @@ dependencies = [
[[package]]
name = "sp-utils"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"futures-core",
"futures-timer 3.0.2",
"lazy_static",
@@ -10744,8 +11013,8 @@ dependencies = [
[[package]]
name = "sp-version"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10759,20 +11028,20 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"parity-scale-codec",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
[[package]]
name = "sp-wasm-interface"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -10794,7 +11063,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "statemine-runtime"
-version = "1.0.0"
+version = "2.0.0"
dependencies = [
"cumulus-pallet-aura-ext",
"cumulus-pallet-dmp-queue",
@@ -10813,7 +11082,7 @@ dependencies = [
"frame-system-benchmarking",
"frame-system-rpc-runtime-api",
"hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"node-primitives",
"pallet-assets",
@@ -10901,7 +11170,7 @@ dependencies = [
"frame-system-benchmarking",
"frame-system-rpc-runtime-api",
"hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"node-primitives",
"pallet-assets",
@@ -10917,6 +11186,7 @@ dependencies = [
"pallet-timestamp",
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
+ "pallet-uniques",
"pallet-utility",
"pallet-xcm",
"parachain-info",
@@ -10970,7 +11240,7 @@ checksum = "f2261c91034a1edc3fc4d1b80e89d82714faede0515c14a75da10cb941546bbf"
dependencies = [
"cfg_aliases",
"memchr",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -10985,7 +11255,7 @@ dependencies = [
"lazy_static",
"nalgebra",
"num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -11031,8 +11301,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
dependencies = [
"heck",
- "proc-macro-error",
- "proc-macro2 1.0.27",
+ "proc-macro-error 1.0.4",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11053,7 +11323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
dependencies = [
"heck",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11074,18 +11344,18 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"platforms",
]
[[package]]
name = "substrate-frame-rpc-system"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-system-rpc-runtime-api",
- "futures 0.3.15",
+ "futures 0.3.16",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -11093,19 +11363,19 @@ dependencies = [
"parity-scale-codec",
"sc-client-api",
"sc-rpc-api",
+ "sc-transaction-pool-api",
"serde",
"sp-api",
"sp-block-builder",
"sp-blockchain",
"sp-core",
"sp-runtime",
- "sp-transaction-pool",
]
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-std",
"derive_more 0.99.14",
@@ -11119,11 +11389,11 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"async-trait",
"futures 0.1.30",
- "futures 0.3.15",
+ "futures 0.3.16",
"hash-db",
"hex",
"parity-scale-codec",
@@ -11147,18 +11417,18 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"substrate-test-utils-derive",
"tokio 0.2.24",
]
[[package]]
name = "substrate-test-utils-derive"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"proc-macro-crate 1.0.0",
"quote 1.0.9",
@@ -11167,8 +11437,8 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "5.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"ansi_term 0.12.1",
"atty",
@@ -11210,18 +11480,29 @@ version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"unicode-xid 0.2.1",
]
+[[package]]
+name = "syn-mid"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9"
+dependencies = [
+ "proc-macro2 1.0.28",
+ "quote 1.0.9",
+ "syn 1.0.73",
+]
+
[[package]]
name = "synstructure"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"unicode-xid 0.2.1",
@@ -11253,7 +11534,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "rand 0.8.3",
+ "rand 0.8.4",
"redox_syscall 0.2.4",
"remove_dir_all",
"winapi 0.3.9",
@@ -11279,20 +11560,20 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.24"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.24"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11508,7 +11789,7 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11713,7 +11994,7 @@ version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11793,7 +12074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
dependencies = [
"hash-db",
- "hashbrown 0.11.2",
+ "hashbrown",
"log",
"rustc-hex",
"smallvec 1.6.1",
@@ -11834,7 +12115,7 @@ dependencies = [
"ipnet",
"lazy_static",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"smallvec 1.6.1",
"thiserror",
"tinyvec",
@@ -11868,8 +12149,8 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
-version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff"
dependencies = [
"frame-try-runtime",
"log",
@@ -11885,7 +12166,6 @@ dependencies = [
"sp-blockchain",
"sp-core",
"sp-externalities",
- "sp-io",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
@@ -11899,7 +12179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
dependencies = [
"cfg-if 0.1.10",
- "rand 0.7.3",
+ "rand 0.6.5",
"static_assertions",
]
@@ -12103,9 +12383,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]]
name = "walkdir"
-version = "2.3.1"
+version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
dependencies = [
"same-file",
"winapi 0.3.9",
@@ -12164,7 +12444,7 @@ dependencies = [
"bumpalo",
"lazy_static",
"log",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"wasm-bindgen-shared",
@@ -12198,7 +12478,7 @@ version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"wasm-bindgen-backend",
@@ -12228,7 +12508,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"js-sys",
"parking_lot 0.11.1",
"pin-utils",
@@ -12449,7 +12729,7 @@ dependencies = [
"mach",
"memoffset 0.6.1",
"more-asserts",
- "rand 0.8.3",
+ "rand 0.8.4",
"region",
"thiserror",
"wasmtime-environ",
@@ -12496,8 +12776,8 @@ dependencies = [
[[package]]
name = "westend-runtime"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -12509,7 +12789,7 @@ dependencies = [
"frame-system-benchmarking",
"frame-system-rpc-runtime-api",
"frame-try-runtime",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"pallet-authority-discovery",
"pallet-authorship",
@@ -12597,7 +12877,7 @@ dependencies = [
"frame-system-benchmarking",
"frame-system-rpc-runtime-api",
"hex",
- "hex-literal 0.3.1",
+ "hex-literal 0.3.3",
"log",
"node-primitives",
"pallet-assets",
@@ -12613,6 +12893,7 @@ dependencies = [
"pallet-timestamp",
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
+ "pallet-uniques",
"pallet-utility",
"pallet-xcm",
"parachain-info",
@@ -12737,8 +13018,8 @@ dependencies = [
[[package]]
name = "xcm"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"derivative",
"impl-trait-for-tuples",
@@ -12748,8 +13029,8 @@ dependencies = [
[[package]]
name = "xcm-builder"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"frame-support",
"frame-system",
@@ -12767,8 +13048,8 @@ dependencies = [
[[package]]
name = "xcm-executor"
-version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24"
+version = "0.9.9"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#0f4a7663c605d4b002ccae02df22a7fc0819d582"
dependencies = [
"frame-support",
"impl-trait-for-tuples",
@@ -12788,11 +13069,11 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
dependencies = [
- "futures 0.3.15",
+ "futures 0.3.16",
"log",
"nohash-hasher",
"parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
"static_assertions",
]
@@ -12811,7 +13092,7 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"synstructure",
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 90b866f64ee..d130830e248 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
structopt = "0.3.3"
# Substrate dependencies
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index 1af93c36aa7..e06183625dd 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -217,6 +217,10 @@ impl sc_cli::CliConfiguration for NormalizedRunCmd {
self.base.rpc_ws_max_connections()
}
+ fn rpc_http_threads(&self) -> sc_cli::Result> {
+ self.base.rpc_http_threads()
+ }
+
fn rpc_cors(&self, is_dev: bool) -> sc_cli::Result>> {
self.base.rpc_cors(is_dev)
}
diff --git a/client/collator/Cargo.toml b/client/collator/Cargo.toml
index 68b579a1a5d..ddd229a00c0 100644
--- a/client/collator/Cargo.toml
+++ b/client/collator/Cargo.toml
@@ -6,18 +6,18 @@ edition = "2018"
[dependencies]
# Substrate dependencies
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Cumulus dependencies
cumulus-client-network = { path = "../network" }
@@ -32,18 +32,18 @@ tracing = "0.1.25"
[dev-dependencies]
# Polkadot dependencies
-polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Cumulus dependencies
cumulus-test-runtime = { path = "../../test/runtime" }
cumulus-test-client = { path = "../../test/client" }
# Substrate dependencies
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Other dependencies
async-trait = "0.1.42"
diff --git a/client/collator/src/lib.rs b/client/collator/src/lib.rs
index 17af9efa2a5..610d41ad52d 100644
--- a/client/collator/src/lib.rs
+++ b/client/collator/src/lib.rs
@@ -33,7 +33,7 @@ use polkadot_node_primitives::{
BlockData, Collation, CollationGenerationConfig, CollationResult, PoV,
};
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
-use polkadot_overseer::OverseerHandler;
+use polkadot_overseer::Handle as OverseerHandle;
use polkadot_primitives::v1::{CollatorPair, Hash as PHash, HeadData, Id as ParaId};
use codec::{Decode, Encode};
@@ -239,7 +239,7 @@ where
// Create the parachain block data for the validators.
let b = ParachainBlockData::::new(header, extrinsics, compact_proof);
- tracing::debug!(
+ tracing::info!(
target: LOG_TARGET,
"PoV size {{ header: {}kb, extrinsics: {}kb, storage_proof: {}kb }}",
b.header().encode().len() as f64 / 1024f64,
@@ -275,7 +275,7 @@ pub struct StartCollatorParams {
pub runtime_api: Arc,
pub block_status: Arc,
pub announce_block: Arc>) + Send + Sync>,
- pub overseer_handler: OverseerHandler,
+ pub overseer_handle: OverseerHandle,
pub spawner: Spawner,
pub key: CollatorPair,
pub parachain_consensus: Box>,
@@ -287,7 +287,7 @@ pub async fn start_collator(
para_id,
block_status,
announce_block,
- mut overseer_handler,
+ mut overseer_handle,
spawner,
key,
parachain_consensus,
@@ -321,14 +321,14 @@ pub async fn start_collator(
}),
};
- overseer_handler
+ overseer_handle
.send_msg(
CollationGenerationMessage::Initialize(config),
"StartCollator",
)
.await;
- overseer_handler
+ overseer_handle
.send_msg(CollatorProtocolMessage::CollateOn(para_id), "StartCollator")
.await;
}
@@ -405,7 +405,7 @@ mod tests {
let all_subsystems =
AllSubsystems::<()>::dummy().replace_collation_generation(ForwardSubsystem(sub_tx));
- let (overseer, handler) = Overseer::new(
+ let (overseer, handle) = Overseer::new(
Vec::new(),
all_subsystems,
None,
@@ -420,7 +420,7 @@ mod tests {
runtime_api: client.clone(),
block_status: client.clone(),
announce_block: Arc::new(announce_block),
- overseer_handler: handler,
+ overseer_handle: OverseerHandle::Connected(handle),
spawner,
para_id,
key: CollatorPair::generate().0,
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index ed62a384654..14512cd8534 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -7,24 +7,25 @@ edition = "2018"
[dependencies]
# Substrate dependencies
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Cumulus dependencies
cumulus-client-consensus-common = { path = "../common" }
diff --git a/client/consensus/aura/src/import_queue.rs b/client/consensus/aura/src/import_queue.rs
index d0f0dd62adb..eaf7eac4461 100644
--- a/client/consensus/aura/src/import_queue.rs
+++ b/client/consensus/aura/src/import_queue.rs
@@ -18,15 +18,14 @@
use codec::Codec;
use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
+use sc_consensus::{import_queue::DefaultImportQueue, BlockImport};
use sc_consensus_aura::AuraVerifier;
use sc_consensus_slots::InherentDataProviderExt;
use sc_telemetry::TelemetryHandle;
use sp_api::{ApiExt, ProvideRuntimeApi};
use sp_block_builder::BlockBuilder as BlockBuilderApi;
use sp_blockchain::{HeaderBackend, ProvideCache};
-use sp_consensus::{
- import_queue::DefaultImportQueue, BlockImport, CanAuthorWith, Error as ConsensusError,
-};
+use sp_consensus::{CanAuthorWith, Error as ConsensusError};
use sp_consensus_aura::{digests::CompatibleDigestItem, AuraApi};
use sp_core::crypto::Pair;
use sp_inherents::CreateInherentDataProviders;
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index c3d5c0c3f37..c2edb97d763 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -33,13 +33,14 @@ use cumulus_primitives_core::{
use futures::lock::Mutex;
use polkadot_client::ClientHandle;
use sc_client_api::{backend::AuxStore, Backend, BlockOf};
+use sc_consensus::BlockImport;
use sc_consensus_slots::{BackoffAuthoringBlocksStrategy, SlotInfo};
use sc_telemetry::TelemetryHandle;
use sp_api::ProvideRuntimeApi;
use sp_application_crypto::AppPublic;
use sp_blockchain::{HeaderBackend, ProvideCache};
use sp_consensus::{
- BlockImport, EnableProofRecording, Environment, ProofRecording, Proposer, SlotData, SyncOracle,
+ EnableProofRecording, Environment, ProofRecording, Proposer, SlotData, SyncOracle,
};
use sp_consensus_aura::AuraApi;
use sp_core::crypto::Pair;
@@ -52,8 +53,7 @@ mod import_queue;
pub use import_queue::{build_verifier, import_queue, BuildVerifierParams, ImportQueueParams};
pub use sc_consensus_aura::{
- slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotDuration,
- SlotProportion,
+ slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotDuration, SlotProportion,
};
pub use sc_consensus_slots::InherentDataProviderExt;
@@ -138,8 +138,8 @@ where
P::Public: AppPublic + Hash + Member + Encode + Decode,
P::Signature: TryFrom> + Hash + Member + Encode + Decode,
{
- let worker =
- sc_consensus_aura::build_aura_worker::(BuildAuraWorkerParams {
+ let worker = sc_consensus_aura::build_aura_worker::(
+ BuildAuraWorkerParams {
client: para_client,
block_import: ParachainBlockImport::new(block_import),
justification_sync_link: (),
@@ -151,7 +151,8 @@ where
telemetry,
block_proposal_slot_portion,
max_block_proposal_slot_portion,
- });
+ },
+ );
Self {
create_inherent_data_providers: Arc::new(create_inherent_data_providers),
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index cfbf5282909..8672b59f637 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -7,20 +7,21 @@ edition = "2018"
[dependencies]
# Substrate deps
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Polkadot deps
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Other deps
futures = { version = "0.3.8", features = ["compat"] }
@@ -31,10 +32,10 @@ dyn-clone = "1.0.4"
[dev-dependencies]
# Substrate deps
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-test-runtime = { path = "../../../test/runtime" }
@@ -43,7 +44,7 @@ cumulus-test-service = { path = "../../../test/service" }
cumulus-primitives-core = { path = "../../../primitives/core" }
# Polkadot deps
-polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Other deps
tokio = { version = "0.2.21", features = ["macros"] }
diff --git a/client/consensus/common/src/lib.rs b/client/consensus/common/src/lib.rs
index bba1a4d9347..843020a36b0 100644
--- a/client/consensus/common/src/lib.rs
+++ b/client/consensus/common/src/lib.rs
@@ -15,7 +15,7 @@
// along with Cumulus. If not, see .
use polkadot_primitives::v1::{Hash as PHash, PersistedValidationData};
-use sp_consensus::BlockImport;
+use sc_consensus::BlockImport;
use sp_runtime::traits::Block as BlockT;
mod parachain_consensus;
@@ -96,19 +96,19 @@ where
async fn check_block(
&mut self,
- block: sp_consensus::BlockCheckParams,
- ) -> Result {
+ block: sc_consensus::BlockCheckParams,
+ ) -> Result {
self.0.check_block(block).await
}
async fn import_block(
&mut self,
- mut block_import_params: sp_consensus::BlockImportParams,
- cache: std::collections::HashMap>,
- ) -> Result {
+ mut block_import_params: sc_consensus::BlockImportParams,
+ cache: std::collections::HashMap>,
+ ) -> Result {
// Best block is determined by the relay chain, or if we are doing the intial sync
// we import all blocks as new best.
- block_import_params.fork_choice = Some(sp_consensus::ForkChoiceStrategy::Custom(
+ block_import_params.fork_choice = Some(sc_consensus::ForkChoiceStrategy::Custom(
block_import_params.origin == sp_consensus::BlockOrigin::NetworkInitialSync,
));
self.0.import_block(block_import_params, cache).await
diff --git a/client/consensus/common/src/parachain_consensus.rs b/client/consensus/common/src/parachain_consensus.rs
index 6373563d467..7b23bc7cbb5 100644
--- a/client/consensus/common/src/parachain_consensus.rs
+++ b/client/consensus/common/src/parachain_consensus.rs
@@ -17,9 +17,10 @@
use sc_client_api::{
Backend, BlockBackend, BlockImportNotification, BlockchainEvents, Finalizer, UsageProvider,
};
+use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
use sp_api::ProvideRuntimeApi;
use sp_blockchain::{Error as ClientError, Result as ClientResult};
-use sp_consensus::{BlockImport, BlockImportParams, BlockOrigin, BlockStatus, ForkChoiceStrategy};
+use sp_consensus::{BlockOrigin, BlockStatus};
use sp_runtime::{
generic::BlockId,
traits::{Block as BlockT, Header as HeaderT},
@@ -346,6 +347,18 @@ where
P: UsageProvider + Send + Sync + BlockBackend,
for<'a> &'a P: BlockImport,
{
+ let best_number = parachain.usage_info().chain.best_number;
+ if *header.number() < best_number {
+ tracing::debug!(
+ target: "cumulus-consensus",
+ %best_number,
+ block_number = %header.number(),
+ "Skipping importing block as new best block, because there already exists a \
+ best block with an higher number",
+ );
+ return;
+ }
+
// Make it the new best block
let mut block_import_params = BlockImportParams::new(BlockOrigin::ConsensusBroadcast, header);
block_import_params.fork_choice = Some(ForkChoiceStrategy::Custom(true));
diff --git a/client/consensus/common/src/tests.rs b/client/consensus/common/src/tests.rs
index 7f6b2d6df49..4093c2ec648 100644
--- a/client/consensus/common/src/tests.rs
+++ b/client/consensus/common/src/tests.rs
@@ -19,14 +19,15 @@ use crate::*;
use codec::Encode;
use cumulus_test_client::{
runtime::{Block, Header},
- Client, InitBlockBuilder, TestClientBuilder, TestClientBuilderExt,
+ Backend, Client, InitBlockBuilder, TestClientBuilder, TestClientBuilderExt,
};
use futures::{channel::mpsc, executor::block_on, select, FutureExt, Stream, StreamExt};
use futures_timer::Delay;
use polkadot_primitives::v1::{Block as PBlock, Id as ParaId};
use sc_client_api::UsageProvider;
+use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
use sp_blockchain::{Error as ClientError, Result as ClientResult};
-use sp_consensus::{BlockImport, BlockImportParams, BlockOrigin, ForkChoiceStrategy};
+use sp_consensus::BlockOrigin;
use sp_runtime::generic::BlockId;
use std::{
sync::{Arc, Mutex},
@@ -101,18 +102,17 @@ impl crate::parachain_consensus::RelaychainClient for Relaychain {
}
}
-fn build_and_import_block(mut client: Arc) -> Block {
+fn build_and_import_block(mut client: Arc, import_as_best: bool) -> Block {
let builder = client.init_block_builder(None, Default::default());
let block = builder.build().unwrap().block;
let (header, body) = block.clone().deconstruct();
let mut block_import_params = BlockImportParams::new(BlockOrigin::Own, header);
- block_import_params.fork_choice = Some(ForkChoiceStrategy::Custom(false));
+ block_import_params.fork_choice = Some(ForkChoiceStrategy::Custom(import_as_best));
block_import_params.body = Some(body);
block_on(client.import_block(block_import_params, Default::default())).unwrap();
- assert_eq!(0, client.chain_info().best_number);
block
}
@@ -123,7 +123,7 @@ fn follow_new_best_works() {
let client = Arc::new(TestClientBuilder::default().build());
- let block = build_and_import_block(client.clone());
+ let block = build_and_import_block(client.clone(), false);
let relay_chain = Relaychain::new();
let new_best_heads_sender = relay_chain
.inner
@@ -164,7 +164,7 @@ fn follow_finalized_works() {
let client = Arc::new(TestClientBuilder::default().build());
- let block = build_and_import_block(client.clone());
+ let block = build_and_import_block(client.clone(), false);
let relay_chain = Relaychain::new();
let finalized_sender = relay_chain
.inner
@@ -205,7 +205,7 @@ fn follow_finalized_does_not_stop_on_unknown_block() {
let client = Arc::new(TestClientBuilder::default().build());
- let block = build_and_import_block(client.clone());
+ let block = build_and_import_block(client.clone(), false);
let unknown_block = {
let block_builder =
@@ -264,7 +264,7 @@ fn follow_new_best_sets_best_after_it_is_imported() {
let mut client = Arc::new(TestClientBuilder::default().build());
- let block = build_and_import_block(client.clone());
+ let block = build_and_import_block(client.clone(), false);
let unknown_block = {
let block_builder =
@@ -336,3 +336,61 @@ fn follow_new_best_sets_best_after_it_is_imported() {
}
});
}
+
+/// When we import a new best relay chain block, we extract the best parachain block from it and set
+/// it. This works when we follow the relay chain and parachain at the tip of each other, but there
+/// can be race conditions when we are doing a full sync of both or just the relay chain.
+/// The problem is that we import parachain blocks as best as long as we are in major sync. So, we
+/// could import block 100 as best and then import a relay chain block that says that block 99 is
+/// the best parachain block. This should not happen, we should never set the best block to a lower
+/// block number.
+#[test]
+fn do_not_set_best_block_to_older_block() {
+ const NUM_BLOCKS: usize = 4;
+
+ sp_tracing::try_init_simple();
+
+ let backend = Arc::new(Backend::new_test(1000, 1));
+
+ let client = Arc::new(TestClientBuilder::with_backend(backend).build());
+
+ let blocks = (0..NUM_BLOCKS)
+ .into_iter()
+ .map(|_| build_and_import_block(client.clone(), true))
+ .collect::>();
+
+ assert_eq!(NUM_BLOCKS as u32, client.usage_info().chain.best_number);
+
+ let relay_chain = Relaychain::new();
+ let new_best_heads_sender = relay_chain
+ .inner
+ .lock()
+ .unwrap()
+ .new_best_heads_sender
+ .clone();
+
+ let consensus =
+ run_parachain_consensus(100.into(), client.clone(), relay_chain, Arc::new(|_, _| {}));
+
+ let client2 = client.clone();
+ let work = async move {
+ new_best_heads_sender
+ .unbounded_send(blocks[NUM_BLOCKS - 2].header().clone())
+ .unwrap();
+ // Wait for it to be processed.
+ Delay::new(Duration::from_millis(300)).await;
+ };
+
+ block_on(async move {
+ futures::pin_mut!(consensus);
+ futures::pin_mut!(work);
+
+ select! {
+ r = consensus.fuse() => panic!("Consensus should not end: {:?}", r),
+ _ = work.fuse() => {},
+ }
+ });
+
+ // Build and import a new best block.
+ build_and_import_block(client2.clone(), true);
+}
diff --git a/client/consensus/relay-chain/Cargo.toml b/client/consensus/relay-chain/Cargo.toml
index cb782025b71..6eb5225f98f 100644
--- a/client/consensus/relay-chain/Cargo.toml
+++ b/client/consensus/relay-chain/Cargo.toml
@@ -7,18 +7,19 @@ edition = "2018"
[dependencies]
# Substrate deps
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Cumulus dependencies
cumulus-client-consensus-common = { path = "../common" }
diff --git a/client/consensus/relay-chain/src/import_queue.rs b/client/consensus/relay-chain/src/import_queue.rs
index f7a25f3da52..ea9fc5bef50 100644
--- a/client/consensus/relay-chain/src/import_queue.rs
+++ b/client/consensus/relay-chain/src/import_queue.rs
@@ -16,19 +16,18 @@
use std::{marker::PhantomData, sync::Arc};
+use sc_consensus::{
+ import_queue::{BasicQueue, Verifier as VerifierT},
+ BlockImport, BlockImportParams,
+};
use sp_api::ProvideRuntimeApi;
use sp_block_builder::BlockBuilder as BlockBuilderApi;
use sp_blockchain::Result as ClientResult;
-use sp_consensus::{
- error::Error as ConsensusError,
- import_queue::{BasicQueue, CacheKeyId, Verifier as VerifierT},
- BlockImport, BlockImportParams, BlockOrigin,
-};
+use sp_consensus::{error::Error as ConsensusError, CacheKeyId};
use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
use sp_runtime::{
generic::BlockId,
traits::{Block as BlockT, Header as HeaderT},
- Justifications,
};
/// A verifier that just checks the inherents.
@@ -59,10 +58,7 @@ where
{
async fn verify(
&mut self,
- origin: BlockOrigin,
- header: Block::Header,
- justifications: Option,
- mut body: Option>,
+ mut block_params: BlockImportParams,
) -> Result<
(
BlockImportParams,
@@ -70,10 +66,10 @@ where
),
String,
> {
- if let Some(inner_body) = body.take() {
+ if let Some(inner_body) = block_params.body.take() {
let inherent_data_providers = self
.create_inherent_data_providers
- .create_inherent_data_providers(*header.parent_hash(), ())
+ .create_inherent_data_providers(*block_params.header.parent_hash(), ())
.await
.map_err(|e| e.to_string())?;
@@ -81,13 +77,13 @@ where
.create_inherent_data()
.map_err(|e| format!("{:?}", e))?;
- let block = Block::new(header.clone(), inner_body);
+ let block = Block::new(block_params.header.clone(), inner_body);
let inherent_res = self
.client
.runtime_api()
.check_inherents(
- &BlockId::Hash(*header.parent_hash()),
+ &BlockId::Hash(*block.header().parent_hash()),
block.clone(),
inherent_data,
)
@@ -106,17 +102,12 @@ where
}
let (_, inner_body) = block.deconstruct();
- body = Some(inner_body);
+ block_params.body = Some(inner_body);
}
- let post_hash = Some(header.hash());
- let mut block_import_params = BlockImportParams::new(origin, header);
- block_import_params.body = body;
- block_import_params.justifications = justifications;
-
- block_import_params.post_hash = post_hash;
+ block_params.post_hash = Some(block_params.header.hash());
- Ok((block_import_params, None))
+ Ok((block_params, None))
}
}
diff --git a/client/consensus/relay-chain/src/lib.rs b/client/consensus/relay-chain/src/lib.rs
index 782080bf7a7..7e1f7d85509 100644
--- a/client/consensus/relay-chain/src/lib.rs
+++ b/client/consensus/relay-chain/src/lib.rs
@@ -43,10 +43,10 @@ use cumulus_primitives_core::{
use parking_lot::Mutex;
use polkadot_client::ClientHandle;
use sc_client_api::Backend;
+use sc_consensus::{BlockImport, BlockImportParams};
use sp_api::ProvideRuntimeApi;
use sp_consensus::{
- BlockImport, BlockImportParams, BlockOrigin, EnableProofRecording, Environment, ProofRecording,
- Proposal, Proposer,
+ BlockOrigin, EnableProofRecording, Environment, ProofRecording, Proposal, Proposer,
};
use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
use sp_runtime::traits::{Block as BlockT, HashFor, Header as HeaderT};
@@ -208,8 +208,8 @@ where
let mut block_import_params = BlockImportParams::new(BlockOrigin::Own, header);
block_import_params.body = Some(extrinsics);
- block_import_params.state_action = sp_consensus::StateAction::ApplyChanges(
- sp_consensus::StorageChanges::Changes(storage_changes)
+ block_import_params.state_action = sc_consensus::StateAction::ApplyChanges(
+ sc_consensus::StorageChanges::Changes(storage_changes),
);
if let Err(err) = self
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index a63d9a90e5f..a9de5286ee9 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -7,19 +7,19 @@ edition = "2018"
[dependencies]
# Substrate deps
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Polkadot deps
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# other deps
codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
@@ -37,14 +37,14 @@ cumulus-test-service = { path = "../../test/service" }
cumulus-primitives-core = { path = "../../primitives/core" }
# Polkadot deps
-polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# substrate deps
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 685007e1806..74479c9d0d9 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -33,7 +33,7 @@ use sp_runtime::{
traits::{Block as BlockT, HashFor, Header as HeaderT},
};
-use polkadot_node_primitives::{SignedFullStatement, Statement};
+use polkadot_node_primitives::{SignedFullStatement, Statement, CollationSecondedSignal};
use polkadot_parachain::primitives::HeadData;
use polkadot_primitives::v1::{
Block as PBlock, Hash as PHash, CandidateReceipt, CompactStatement, Id as ParaId,
@@ -530,7 +530,7 @@ impl WaitToAnnounce {
pub fn wait_to_announce(
&mut self,
block_hash: ::Hash,
- signed_stmt_recv: oneshot::Receiver,
+ signed_stmt_recv: oneshot::Receiver,
) {
let announce_block = self.announce_block.clone();
@@ -557,10 +557,10 @@ impl WaitToAnnounce {
async fn wait_to_announce(
block_hash: ::Hash,
announce_block: Arc>) + Send + Sync>,
- signed_stmt_recv: oneshot::Receiver,
+ signed_stmt_recv: oneshot::Receiver,
) {
let statement = match signed_stmt_recv.await {
- Ok(s) => s,
+ Ok(s) => s.statement,
Err(_) => {
tracing::debug!(
target: "cumulus-network",
diff --git a/client/pov-recovery/Cargo.toml b/client/pov-recovery/Cargo.toml
index 0af05ea452f..f34017b7cd3 100644
--- a/client/pov-recovery/Cargo.toml
+++ b/client/pov-recovery/Cargo.toml
@@ -7,18 +7,19 @@ edition = "2018"
[dependencies]
# Substrate deps
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Polkadot deps
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Cumulus deps
cumulus-primitives-core = { path = "../../primitives/core" }
@@ -37,14 +38,13 @@ tokio = { version = "0.2.21", features = ["macros"] }
cumulus-test-service = { path = "../../test/service" }
# Polkadot deps
-polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# substrate deps
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
diff --git a/client/pov-recovery/src/active_candidate_recovery.rs b/client/pov-recovery/src/active_candidate_recovery.rs
index 1a2f5d81584..42384e0d289 100644
--- a/client/pov-recovery/src/active_candidate_recovery.rs
+++ b/client/pov-recovery/src/active_candidate_recovery.rs
@@ -18,7 +18,7 @@ use sp_runtime::traits::Block as BlockT;
use polkadot_node_primitives::AvailableData;
use polkadot_node_subsystem::messages::AvailabilityRecoveryMessage;
-use polkadot_overseer::OverseerHandler;
+use polkadot_overseer::Handle as OverseerHandle;
use futures::{channel::oneshot, stream::FuturesUnordered, Future, FutureExt, StreamExt};
@@ -34,15 +34,15 @@ pub(crate) struct ActiveCandidateRecovery {
>,
/// The block hashes of the candidates currently being recovered.
candidates: HashSet,
- overseer_handler: OverseerHandler,
+ overseer_handle: OverseerHandle,
}
impl ActiveCandidateRecovery {
- pub fn new(overseer_handler: OverseerHandler) -> Self {
+ pub fn new(overseer_handle: OverseerHandle) -> Self {
Self {
recoveries: Default::default(),
candidates: Default::default(),
- overseer_handler,
+ overseer_handle,
}
}
@@ -54,7 +54,7 @@ impl ActiveCandidateRecovery {
) {
let (tx, rx) = oneshot::channel();
- self.overseer_handler
+ self.overseer_handle
.send_msg(
AvailabilityRecoveryMessage::RecoverAvailableData(
pending_candidate.receipt,
diff --git a/client/pov-recovery/src/lib.rs b/client/pov-recovery/src/lib.rs
index 4e979a255f6..24c2e3b580f 100644
--- a/client/pov-recovery/src/lib.rs
+++ b/client/pov-recovery/src/lib.rs
@@ -43,18 +43,16 @@
//! make sure that the blocks are imported in the correct order.
use sc_client_api::{BlockBackend, BlockchainEvents, UsageProvider};
+use sc_consensus::import_queue::{ImportQueue, IncomingBlock};
use sp_api::ProvideRuntimeApi;
-use sp_consensus::{
- import_queue::{ImportQueue, IncomingBlock},
- BlockOrigin, BlockStatus,
-};
+use sp_consensus::{BlockOrigin, BlockStatus};
use sp_runtime::{
generic::BlockId,
traits::{Block as BlockT, Header as HeaderT, NumberFor},
};
use polkadot_node_primitives::{AvailableData, POV_BOMB_LIMIT};
-use polkadot_overseer::OverseerHandler;
+use polkadot_overseer::Handle as OverseerHandle;
use polkadot_primitives::v1::{
Block as PBlock, CandidateReceipt, CommittedCandidateReceipt, Id as ParaId, ParachainHost,
SessionIndex,
@@ -117,7 +115,7 @@ where
{
/// Create a new instance.
pub fn new(
- overseer_handler: OverseerHandler,
+ overseer_handle: OverseerHandle,
relay_chain_slot_duration: Duration,
parachain_client: Arc,
parachain_import_queue: IQ,
@@ -127,7 +125,7 @@ where
Self {
pending_candidates: HashMap::new(),
next_candidate_to_recover: Default::default(),
- active_candidate_recovery: ActiveCandidateRecovery::new(overseer_handler),
+ active_candidate_recovery: ActiveCandidateRecovery::new(overseer_handle),
relay_chain_slot_duration,
waiting_for_parent: HashMap::new(),
parachain_client,
@@ -354,6 +352,7 @@ where
origin: None,
skip_execution: false,
state: None,
+ indexed_body: None,
});
if let Some(waiting) = self.waiting_for_parent.remove(&block_hash) {
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index b4e1924c7f0..db17155015d 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -12,22 +12,23 @@ cumulus-client-pov-recovery = { path = "../pov-recovery" }
cumulus-primitives-core = { path = "../../primitives/core" }
# Substrate dependencies
-sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Other deps
tracing = "0.1.22"
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index 6db45b5e1fa..0262bca4881 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -20,20 +20,21 @@
use cumulus_client_consensus_common::ParachainConsensus;
use cumulus_primitives_core::{CollectCollationInfo, ParaId};
-use polkadot_overseer::OverseerHandler;
+use polkadot_overseer::Handle as OverseerHandle;
use polkadot_primitives::v1::{Block as PBlock, CollatorPair};
use polkadot_service::{AbstractClient, Client as PClient, ClientHandle, RuntimeApiCollection};
use sc_client_api::{
Backend as BackendT, BlockBackend, BlockchainEvents, Finalizer, UsageProvider,
};
+use sc_consensus::{
+ import_queue::{ImportQueue, IncomingBlock, Link, Origin},
+ BlockImport,
+};
use sc_service::{Configuration, Role, TaskManager};
use sc_telemetry::TelemetryWorkerHandle;
use sp_api::ProvideRuntimeApi;
use sp_blockchain::HeaderBackend;
-use sp_consensus::{
- import_queue::{ImportQueue, IncomingBlock, Link, Origin},
- BlockImport, BlockOrigin,
-};
+use sp_consensus::BlockOrigin;
use sp_core::{traits::SpawnNamed, Pair};
use sp_runtime::{
traits::{BlakeTwo256, Block as BlockT, NumberFor},
@@ -118,27 +119,27 @@ where
});
relay_chain_full_node
- .client
- .execute_with(StartPoVRecovery {
- para_id,
- client: client.clone(),
- import_queue,
- task_manager,
- overseer_handler: relay_chain_full_node
- .overseer_handler
+ .client
+ .execute_with(StartPoVRecovery {
+ para_id,
+ client: client.clone(),
+ import_queue,
+ task_manager,
+ overseer_handle: relay_chain_full_node
+ .overseer_handle
.clone()
- .ok_or_else(|| "Polkadot full node did not provided an `OverseerHandler`!")?,
- _phantom: PhantomData,
- })?;
+ .ok_or_else(|| "Polkadot full node did not provide an `OverseerHandle`!")?,
+ _phantom: PhantomData,
+ })?;
cumulus_client_collator::start_collator(cumulus_client_collator::StartCollatorParams {
runtime_api: client.clone(),
block_status,
announce_block,
- overseer_handler: relay_chain_full_node
- .overseer_handler
+ overseer_handle: relay_chain_full_node
+ .overseer_handle
.clone()
- .ok_or_else(|| "Polkadot full node did not provided an `OverseerHandler`!")?,
+ .ok_or_else(|| "Polkadot full node did not provide an `OverseerHandle`!")?,
spawner,
para_id,
key: relay_chain_full_node.collator_key.clone(),
@@ -248,7 +249,7 @@ struct StartPoVRecovery<'a, Block: BlockT, Client, IQ> {
para_id: ParaId,
client: Arc,
task_manager: &'a mut TaskManager,
- overseer_handler: OverseerHandler,
+ overseer_handle: OverseerHandle,
import_queue: IQ,
_phantom: PhantomData,
}
@@ -276,7 +277,7 @@ where
PClient: AbstractClient + 'static,
{
let pov_recovery = cumulus_client_pov_recovery::PoVRecovery::new(
- self.overseer_handler,
+ self.overseer_handle,
sc_consensus_babe::Config::get_or_compute(&*client)?.slot_duration(),
self.client,
self.import_queue,
diff --git a/pallets/aura-ext/Cargo.toml b/pallets/aura-ext/Cargo.toml
index 375977a8245..7e25975597c 100644
--- a/pallets/aura-ext/Cargo.toml
+++ b/pallets/aura-ext/Cargo.toml
@@ -7,14 +7,14 @@ description = "AURA consensus extension pallet for parachains"
[dependencies]
# Substrate dependencies
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Other Dependencies
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"]}
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
index 0d8c0179556..ea8da123a5e 100644
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -16,25 +16,25 @@ targets = ['x86_64-unknown-linux-gnu']
log = { version = "0.4.0", default-features = false }
codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = '2.0.0' }
serde = { version = "1.0.119", default-features = false }
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-staking = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-pallet-authorship = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-pallet-session = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-staking = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+pallet-authorship = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+pallet-session = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
[dev-dependencies]
-sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '0.9.0' }
-pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-pallet-aura = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
+sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-io = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+pallet-aura = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
[features]
default = ['std']
diff --git a/pallets/collator-selection/src/mock.rs b/pallets/collator-selection/src/mock.rs
index bbc63295814..b5555357456 100644
--- a/pallets/collator-selection/src/mock.rs
+++ b/pallets/collator-selection/src/mock.rs
@@ -55,7 +55,7 @@ parameter_types! {
}
impl system::Config for Test {
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
@@ -126,6 +126,7 @@ impl pallet_timestamp::Config for Test {
impl pallet_aura::Config for Test {
type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;
+ type DisabledValidators = ();
}
sp_runtime::impl_opaque_keys! {
diff --git a/pallets/dmp-queue/Cargo.toml b/pallets/dmp-queue/Cargo.toml
index e1f4447730c..86657a3d290 100644
--- a/pallets/dmp-queue/Cargo.toml
+++ b/pallets/dmp-queue/Cargo.toml
@@ -12,22 +12,22 @@ rand = { version = "0.8.3", default-features = false }
rand_chacha = { version = "0.3.0", default-features = false }
# Substrate Dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Polkadot Dependencies
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
# Cumulus Dependencies
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
[dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
[features]
default = [ "std" ]
diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs
index a0eb91a8788..01bd6b5d96a 100644
--- a/pallets/dmp-queue/src/lib.rs
+++ b/pallets/dmp-queue/src/lib.rs
@@ -396,7 +396,7 @@ mod tests {
type OnNewAccount = ();
type OnKilledAccount = ();
type DbWeight = ();
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type SystemWeightInfo = ();
type SS58Prefix = ();
type OnSetCode = ();
diff --git a/pallets/parachain-system/Cargo.toml b/pallets/parachain-system/Cargo.toml
index 3c16f9ad0b2..2c7a50e564f 100644
--- a/pallets/parachain-system/Cargo.toml
+++ b/pallets/parachain-system/Cargo.toml
@@ -12,22 +12,22 @@ cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inh
cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ], branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ], branch = "release-v0.9.9" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
# Substrate dependencies
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Other Dependencies
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"]}
@@ -41,10 +41,10 @@ hex-literal = "0.2.1"
lazy_static = "1.4"
# Substrate dependencies
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-test-client = { path = "../../test/client" }
diff --git a/pallets/parachain-system/src/lib.rs b/pallets/parachain-system/src/lib.rs
index 6280e53e53d..02b15911a80 100644
--- a/pallets/parachain-system/src/lib.rs
+++ b/pallets/parachain-system/src/lib.rs
@@ -595,6 +595,29 @@ pub mod pallet {
sp_io::storage::set(b":c", &[]);
}
}
+
+ #[pallet::validate_unsigned]
+ impl sp_runtime::traits::ValidateUnsigned for Pallet {
+ type Call = Call;
+
+ fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
+ if let Call::enact_authorized_upgrade(ref code) = call {
+ if let Ok(hash) = Self::validate_authorized_upgrade(code) {
+ return Ok(ValidTransaction {
+ priority: 100,
+ requires: vec![],
+ provides: vec![hash.as_ref().to_vec()],
+ longevity: TransactionLongevity::max_value(),
+ propagate: true,
+ });
+ }
+ }
+ if let Call::set_validation_data(..) = call {
+ return Ok(Default::default());
+ }
+ Err(InvalidTransaction::Call.into())
+ }
+ }
}
impl Pallet {
@@ -606,28 +629,6 @@ impl Pallet {
}
}
-impl sp_runtime::traits::ValidateUnsigned for Pallet {
- type Call = Call;
-
- fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
- if let Call::enact_authorized_upgrade(ref code) = call {
- if let Ok(hash) = Self::validate_authorized_upgrade(code) {
- return Ok(ValidTransaction {
- priority: 100,
- requires: vec![],
- provides: vec![hash.as_ref().to_vec()],
- longevity: TransactionLongevity::max_value(),
- propagate: true,
- });
- }
- }
- if let Call::set_validation_data(..) = call {
- return Ok(Default::default());
- }
- Err(InvalidTransaction::Call.into())
- }
-}
-
impl GetChannelInfo for Pallet {
fn get_channel_status(id: ParaId) -> ChannelStatus {
// Note, that we are using `relevant_messaging_state` which may be from the previous
diff --git a/pallets/parachain-system/src/tests.rs b/pallets/parachain-system/src/tests.rs
index 2bfc1c0c610..3108f870a93 100755
--- a/pallets/parachain-system/src/tests.rs
+++ b/pallets/parachain-system/src/tests.rs
@@ -49,7 +49,7 @@ frame_support::construct_runtime!(
UncheckedExtrinsic = UncheckedExtrinsic,
{
System: frame_system::{Pallet, Call, Config, Storage, Event},
- ParachainSystem: parachain_system::{Pallet, Call, Storage, Event},
+ ParachainSystem: parachain_system::{Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned},
}
);
@@ -88,7 +88,7 @@ impl frame_system::Config for Test {
type OnNewAccount = ();
type OnKilledAccount = ();
type DbWeight = ();
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type SystemWeightInfo = ();
type SS58Prefix = ();
type OnSetCode = ParachainSetCode;
diff --git a/pallets/session-benchmarking/Cargo.toml b/pallets/session-benchmarking/Cargo.toml
index 6136bb26740..f21f8f8c202 100644
--- a/pallets/session-benchmarking/Cargo.toml
+++ b/pallets/session-benchmarking/Cargo.toml
@@ -13,19 +13,19 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-staking = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-pallet-session = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-staking = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+pallet-session = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
[dev-dependencies]
serde = { version = "1.0.119" }
-codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
+codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
+sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
[features]
default = ["std"]
diff --git a/pallets/xcm/Cargo.toml b/pallets/xcm/Cargo.toml
index 2d3c0f8220f..cd2cf573bcd 100644
--- a/pallets/xcm/Cargo.toml
+++ b/pallets/xcm/Cargo.toml
@@ -8,13 +8,13 @@ version = "0.1.0"
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
diff --git a/pallets/xcmp-queue/Cargo.toml b/pallets/xcmp-queue/Cargo.toml
index e1bf3894830..4b1e3687e25 100644
--- a/pallets/xcmp-queue/Cargo.toml
+++ b/pallets/xcmp-queue/Cargo.toml
@@ -12,24 +12,24 @@ rand = { version = "0.8.3", default-features = false }
rand_chacha = { version = "0.3.0", default-features = false }
# Substrate Dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Polkadot Dependencies
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
# Cumulus Dependencies
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
[dev-dependencies]
-sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
-sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
+sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-io = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
cumulus-pallet-parachain-system = { path = "../parachain-system" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
[features]
default = [ "std" ]
diff --git a/pallets/xcmp-queue/src/lib.rs b/pallets/xcmp-queue/src/lib.rs
index 34c30e98184..1cb83a98ea6 100644
--- a/pallets/xcmp-queue/src/lib.rs
+++ b/pallets/xcmp-queue/src/lib.rs
@@ -34,7 +34,7 @@ mod tests;
use codec::{Decode, Encode};
use cumulus_primitives_core::{
relay_chain::BlockNumber as RelayBlockNumber, ChannelStatus, GetChannelInfo, MessageSendError,
- ParaId, XcmpMessageHandler, XcmpMessageSource,
+ ParaId, XcmpMessageHandler, XcmpMessageSource, XcmpMessageFormat,
};
use frame_support::weights::Weight;
use rand_chacha::{
@@ -208,18 +208,6 @@ pub enum ChannelSignal {
Resume,
}
-/// The aggregate XCMP message format.
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug)]
-pub enum XcmpMessageFormat {
- /// Encoded `VersionedXcm` messages, all concatenated.
- ConcatenatedVersionedXcm,
- /// Encoded `Vec` messages, all concatenated.
- ConcatenatedEncodedBlob,
- /// One or more channel control signals; these should be interpreted immediately upon receipt
- /// from the relay-chain.
- Signals,
-}
-
impl Pallet {
/// Place a message `fragment` on the outgoing XCMP queue for `recipient`.
///
diff --git a/pallets/xcmp-queue/src/mock.rs b/pallets/xcmp-queue/src/mock.rs
index 1c62a66c29c..7caf56eaf86 100644
--- a/pallets/xcmp-queue/src/mock.rs
+++ b/pallets/xcmp-queue/src/mock.rs
@@ -38,7 +38,9 @@ frame_support::construct_runtime!(
{
System: frame_system::{Pallet, Call, Config, Storage, Event},
Balances: pallet_balances::{Pallet, Call, Storage, Config, Event},
- ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event},
+ ParachainSystem: cumulus_pallet_parachain_system::{
+ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned,
+ },
XcmpQueue: xcmp_queue::{Pallet, Call, Storage, Event},
}
);
@@ -51,7 +53,7 @@ parameter_types! {
type AccountId = u64;
impl frame_system::Config for Test {
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml
index fc142b46a89..e1287fcfcb5 100644
--- a/polkadot-parachains/Cargo.toml
+++ b/polkadot-parachains/Cargo.toml
@@ -31,36 +31,36 @@ westmint-runtime = { path = "westmint" }
statemint-common = { path = "statemint-common" }
# Substrate dependencies
-frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "master" }
-frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# RPC related dependencies
jsonrpc-core = "15.1.0"
@@ -77,13 +77,13 @@ cumulus-primitives-core = { path = "../primitives/core" }
cumulus-primitives-parachain-inherent = { path = "../primitives/parachain-inherent" }
# Polkadot dependencies
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
[build-dependencies]
-substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
[dev-dependencies]
assert_cmd = "0.12"
diff --git a/polkadot-parachains/pallets/parachain-info/Cargo.toml b/polkadot-parachains/pallets/parachain-info/Cargo.toml
index 42bf4afceab..d60976eb6ab 100644
--- a/polkadot-parachains/pallets/parachain-info/Cargo.toml
+++ b/polkadot-parachains/pallets/parachain-info/Cargo.toml
@@ -8,8 +8,8 @@ version = "0.1.0"
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
cumulus-primitives-core = { path = "../../../primitives/core", default-features = false }
diff --git a/polkadot-parachains/pallets/ping/Cargo.toml b/polkadot-parachains/pallets/ping/Cargo.toml
index 3c3d3a72416..0be3a9f0e9a 100644
--- a/polkadot-parachains/pallets/ping/Cargo.toml
+++ b/polkadot-parachains/pallets/ping/Cargo.toml
@@ -8,12 +8,12 @@ version = "0.1.0"
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
cumulus-primitives-core = { path = "../../../primitives/core", default-features = false }
cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false }
diff --git a/polkadot-parachains/res/statemine.json b/polkadot-parachains/res/statemine.json
index b5ed5d2d0b1..826cdd37f0c 100644
--- a/polkadot-parachains/res/statemine.json
+++ b/polkadot-parachains/res/statemine.json
@@ -16,7 +16,6 @@
"relay_chain": "kusama",
"para_id": 1000,
"consensusEngine": null,
- "lightSyncState": null,
"genesis": {
"raw": {
"top": {
diff --git a/polkadot-parachains/res/statemine_genesis.json b/polkadot-parachains/res/statemine_genesis.json
index a24257046c3..95b7a973a49 100644
--- a/polkadot-parachains/res/statemine_genesis.json
+++ b/polkadot-parachains/res/statemine_genesis.json
@@ -14,7 +14,6 @@
"relay_chain": "kusama",
"para_id": 1000,
"consensusEngine": null,
- "lightSyncState": null,
"codeSubstitutes": {},
"genesis": {
"raw": {
@@ -74,4 +73,4 @@
"childrenDefault": {}
}
}
-}
\ No newline at end of file
+}
diff --git a/polkadot-parachains/res/statemint.json b/polkadot-parachains/res/statemint.json
index 5807c84dfb5..98714d5fd1d 100755
--- a/polkadot-parachains/res/statemint.json
+++ b/polkadot-parachains/res/statemint.json
@@ -13,7 +13,6 @@
"relay_chain": "rococo",
"para_id": 1,
"consensusEngine": null,
- "lightSyncState": null,
"genesis": {
"raw": {
"top": {
diff --git a/polkadot-parachains/res/tick.json b/polkadot-parachains/res/tick.json
index 47e00132e18..0bb0394b195 100644
--- a/polkadot-parachains/res/tick.json
+++ b/polkadot-parachains/res/tick.json
@@ -18,7 +18,6 @@
"relay_chain": "rococo",
"para_id": 100,
"consensusEngine": null,
- "lightSyncState": null,
"genesis": {
"raw": {
"top": {
diff --git a/polkadot-parachains/res/track.json b/polkadot-parachains/res/track.json
index 614c21b4eaf..1c70ce96b72 100644
--- a/polkadot-parachains/res/track.json
+++ b/polkadot-parachains/res/track.json
@@ -18,7 +18,6 @@
"relay_chain": "rococo",
"para_id": 120,
"consensusEngine": null,
- "lightSyncState": null,
"genesis": {
"raw": {
"top": {
diff --git a/polkadot-parachains/res/trick.json b/polkadot-parachains/res/trick.json
index d55288022b6..a3f29bfecfc 100644
--- a/polkadot-parachains/res/trick.json
+++ b/polkadot-parachains/res/trick.json
@@ -18,7 +18,6 @@
"relay_chain": "rococo",
"para_id": 110,
"consensusEngine": null,
- "lightSyncState": null,
"genesis": {
"raw": {
"top": {
diff --git a/polkadot-parachains/res/westmint.json b/polkadot-parachains/res/westmint.json
index 3c191c0b6e5..4e0af339388 100644
--- a/polkadot-parachains/res/westmint.json
+++ b/polkadot-parachains/res/westmint.json
@@ -17,7 +17,6 @@
},
"para_id": 1000,
"consensusEngine": null,
- "lightSyncState": null,
"genesis": {
"raw": {
"top": {
diff --git a/polkadot-parachains/res/westmint_genesis.json b/polkadot-parachains/res/westmint_genesis.json
index 90c30544767..ffd30fbe2de 100644
--- a/polkadot-parachains/res/westmint_genesis.json
+++ b/polkadot-parachains/res/westmint_genesis.json
@@ -14,7 +14,6 @@
"relay_chain": "westend",
"para_id": 1000,
"consensusEngine": null,
- "lightSyncState": null,
"codeSubstitutes": {},
"genesis": {
"raw": {
@@ -75,4 +74,4 @@
"childrenDefault": {}
}
}
-}
\ No newline at end of file
+}
diff --git a/polkadot-parachains/rococo/Cargo.toml b/polkadot-parachains/rococo/Cargo.toml
index b118ac416fa..0004de3840e 100644
--- a/polkadot-parachains/rococo/Cargo.toml
+++ b/polkadot-parachains/rococo/Cargo.toml
@@ -12,29 +12,29 @@ log = { version = "0.4.14", default-features = false }
parachain-info = { path = "../pallets/parachain-info", default-features = false }
# Substrate dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
@@ -48,18 +48,18 @@ cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false }
cumulus-ping = { path = "../pallets/ping", default-features = false }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
[dev-dependencies]
hex-literal = "0.3.1"
hex = "0.4.3"
[build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
[features]
default = [ "std" ]
diff --git a/polkadot-parachains/rococo/src/lib.rs b/polkadot-parachains/rococo/src/lib.rs
index ab8977059f3..f90a55260a6 100644
--- a/polkadot-parachains/rococo/src/lib.rs
+++ b/polkadot-parachains/rococo/src/lib.rs
@@ -38,7 +38,7 @@ use sp_version::RuntimeVersion;
// A few exports that help ease life for downstream crates.
pub use frame_support::{
construct_runtime, match_type, parameter_types,
- traits::{All, IsInVec, Randomness},
+ traits::{Everything, IsInVec, Randomness},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
DispatchClass, IdentityFee, Weight,
@@ -56,7 +56,7 @@ pub use sp_runtime::{Perbill, Permill};
// XCM imports
use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough};
use polkadot_parachain::primitives::Sibling;
-use xcm::v0::{BodyId, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId, Xcm};
+use xcm::v0::{BodyId, Junction::*, MultiLocation, MultiLocation::*, NetworkId, Xcm};
use xcm_builder::{
AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,
EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,
@@ -179,7 +179,7 @@ impl frame_system::Config for Runtime {
type OnNewAccount = ();
type OnKilledAccount = ();
type DbWeight = ();
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type SystemWeightInfo = ();
type BlockWeights = RuntimeBlockWeights;
type BlockLength = RuntimeBlockLength;
@@ -328,7 +328,7 @@ match_type! {
pub type Barrier = (
TakeWeightCredit,
- AllowTopLevelPaidExecutionFrom>,
+ AllowTopLevelPaidExecutionFrom,
AllowUnpaidExecutionFrom,
// ^^^ Parent & its unit plurality gets free execution
);
@@ -366,11 +366,12 @@ impl pallet_xcm::Config for Runtime {
type SendXcmOrigin = EnsureXcmOrigin;
type XcmRouter = XcmRouter;
type ExecuteXcmOrigin = EnsureXcmOrigin;
- type XcmExecuteFilter = All<(MultiLocation, Xcm)>;
+ type XcmExecuteFilter = Everything;
type XcmExecutor = XcmExecutor;
- type XcmTeleportFilter = All<(MultiLocation, Vec)>;
+ type XcmTeleportFilter = Everything;
type XcmReserveTransferFilter = ();
type Weigher = FixedWeightBounds;
+ type LocationInverter = LocationInverter;
}
impl cumulus_pallet_xcm::Config for Runtime {
@@ -427,6 +428,7 @@ impl pallet_assets::Config for Runtime {
impl pallet_aura::Config for Runtime {
type AuthorityId = AuraId;
+ type DisabledValidators = ();
}
construct_runtime! {
@@ -441,7 +443,9 @@ construct_runtime! {
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
- ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 20,
+ ParachainSystem: cumulus_pallet_parachain_system::{
+ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned,
+ } = 20,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,
Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 30,
diff --git a/polkadot-parachains/shell/Cargo.toml b/polkadot-parachains/shell/Cargo.toml
index d0f18618d15..38d196a28c6 100644
--- a/polkadot-parachains/shell/Cargo.toml
+++ b/polkadot-parachains/shell/Cargo.toml
@@ -11,21 +11,21 @@ log = { version = "0.4.14", default-features = false }
parachain-info = { path = "../pallets/parachain-info", default-features = false }
# Substrate dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false }
@@ -35,17 +35,17 @@ cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features
cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
[dev-dependencies]
hex = "0.4.3"
hex-literal = "0.3.1"
[build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
[features]
default = [ "std" ]
diff --git a/polkadot-parachains/shell/src/lib.rs b/polkadot-parachains/shell/src/lib.rs
index fe88fc76bcc..680c003159c 100644
--- a/polkadot-parachains/shell/src/lib.rs
+++ b/polkadot-parachains/shell/src/lib.rs
@@ -38,7 +38,7 @@ use sp_version::RuntimeVersion;
// A few exports that help ease life for downstream crates.
pub use frame_support::{
construct_runtime, match_type, parameter_types,
- traits::{All, IsInVec, Randomness},
+ traits::{Everything, IsInVec, Randomness},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
DispatchClass, IdentityFee, Weight,
@@ -145,7 +145,7 @@ impl frame_system::Config for Runtime {
type OnNewAccount = ();
type OnKilledAccount = ();
type DbWeight = ();
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type SystemWeightInfo = ();
type BlockWeights = RuntimeBlockWeights;
type BlockLength = RuntimeBlockLength;
@@ -226,7 +226,9 @@ construct_runtime! {
UncheckedExtrinsic = UncheckedExtrinsic,
{
System: frame_system::{Pallet, Call, Storage, Config, Event},
- ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event},
+ ParachainSystem: cumulus_pallet_parachain_system::{
+ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned,
+ },
ParachainInfo: parachain_info::{Pallet, Storage, Config},
// DMP handler.
diff --git a/polkadot-parachains/src/command.rs b/polkadot-parachains/src/command.rs
index 5b56787e1c2..5432a4c33c6 100644
--- a/polkadot-parachains/src/command.rs
+++ b/polkadot-parachains/src/command.rs
@@ -575,6 +575,10 @@ impl CliConfiguration for RelayChainCli {
self.base.base.rpc_ws_max_connections()
}
+ fn rpc_http_threads(&self) -> Result> {
+ self.base.base.rpc_http_threads()
+ }
+
fn rpc_cors(&self, is_dev: bool) -> Result>> {
self.base.base.rpc_cors(is_dev)
}
diff --git a/polkadot-parachains/src/service.rs b/polkadot-parachains/src/service.rs
index 26c43f2f24b..9268b64a7fb 100644
--- a/polkadot-parachains/src/service.rs
+++ b/polkadot-parachains/src/service.rs
@@ -18,33 +18,38 @@ use cumulus_client_consensus_aura::{
build_aura_consensus, BuildAuraConsensusParams, SlotProportion,
};
use cumulus_client_consensus_common::{
- ParachainConsensus, ParachainCandidate, ParachainBlockImport,
+ ParachainBlockImport, ParachainCandidate, ParachainConsensus,
};
use cumulus_client_network::build_block_announce_validator;
use cumulus_client_service::{
prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
};
use cumulus_primitives_core::{
- ParaId, relay_chain::v1::{Hash as PHash, PersistedValidationData},
+ relay_chain::v1::{Hash as PHash, PersistedValidationData},
+ ParaId,
};
+use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier;
+use futures::lock::Mutex;
use sc_client_api::ExecutorProvider;
+use sc_consensus::{
+ import_queue::{BasicQueue, Verifier as VerifierT},
+ BlockImportParams,
+};
use sc_executor::native_executor_instance;
use sc_network::NetworkService;
use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
-use sp_api::{ConstructRuntimeApi, ApiExt};
-use sp_consensus::{
- BlockImportParams, BlockOrigin, SlotData,
- import_queue::{BasicQueue, CacheKeyId, Verifier as VerifierT},
-};
+use sp_api::{ApiExt, ConstructRuntimeApi};
+use sp_consensus::{CacheKeyId, SlotData};
use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi};
use sp_keystore::SyncCryptoStorePtr;
-use sp_runtime::{traits::{BlakeTwo256, Header as HeaderT}, generic::BlockId};
+use sp_runtime::{
+ generic::BlockId,
+ traits::{BlakeTwo256, Header as HeaderT},
+};
use std::sync::Arc;
use substrate_prometheus_endpoint::Registry;
-use futures::lock::Mutex;
-use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier;
pub use sc_executor::NativeExecutor;
@@ -103,7 +108,7 @@ pub fn new_partial(
TFullClient,
TFullBackend,
(),
- sp_consensus::DefaultImportQueue>,
+ sc_consensus::DefaultImportQueue>,
sc_transaction_pool::FullPool>,
(Option, Option),
>,
@@ -130,7 +135,7 @@ where
Option,
&TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue>,
+ sc_consensus::DefaultImportQueue>,
sc_service::Error,
>,
{
@@ -218,7 +223,7 @@ where
Executor: sc_executor::NativeExecutionDispatch + 'static,
RB: Fn(
Arc>,
- ) -> jsonrpc_core::IoHandler
+ ) -> Result, sc_service::Error>
+ Send
+ 'static,
BIQ: FnOnce(
@@ -227,7 +232,7 @@ where
Option,
&TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue>,
+ sc_consensus::DefaultImportQueue>,
sc_service::Error,
>,
BIC: FnOnce(
@@ -251,14 +256,12 @@ where
let params = new_partial::(¶chain_config, build_import_queue)?;
let (mut telemetry, telemetry_worker_handle) = params.other;
- let relay_chain_full_node = cumulus_client_service::build_polkadot_full_node(
- polkadot_config,
- telemetry_worker_handle,
- )
- .map_err(|e| match e {
- polkadot_service::Error::Sub(x) => x,
- s => format!("{}", s).into(),
- })?;
+ let relay_chain_full_node =
+ cumulus_client_service::build_polkadot_full_node(polkadot_config, telemetry_worker_handle)
+ .map_err(|e| match e {
+ polkadot_service::Error::Sub(x) => x,
+ s => format!("{}", s).into(),
+ })?;
let client = params.client.clone();
let backend = params.backend.clone();
@@ -284,6 +287,7 @@ where
import_queue: import_queue.clone(),
on_demand: None,
block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)),
+ warp_sync: None,
})?;
let rpc_client = client.clone();
@@ -363,7 +367,7 @@ pub fn rococo_parachain_build_import_queue(
telemetry: Option,
task_manager: &TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue<
+ sc_consensus::DefaultImportQueue<
Block,
TFullClient,
>,
@@ -371,29 +375,33 @@ pub fn rococo_parachain_build_import_queue(
> {
let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
- cumulus_client_consensus_aura::import_queue::(
- cumulus_client_consensus_aura::ImportQueueParams {
- block_import: client.clone(),
- client: client.clone(),
- create_inherent_data_providers: move |_, _| async move {
- let time = sp_timestamp::InherentDataProvider::from_system_time();
+ cumulus_client_consensus_aura::import_queue::<
+ sp_consensus_aura::sr25519::AuthorityPair,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ >(cumulus_client_consensus_aura::ImportQueueParams {
+ block_import: client.clone(),
+ client: client.clone(),
+ create_inherent_data_providers: move |_, _| async move {
+ let time = sp_timestamp::InherentDataProvider::from_system_time();
- let slot =
- sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
- *time,
- slot_duration.slot_duration(),
- );
+ let slot =
+ sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+ *time,
+ slot_duration.slot_duration(),
+ );
- Ok((time, slot))
- },
- registry: config.prometheus_registry().clone(),
- can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(
- client.executor().clone(),
- ),
- spawner: &task_manager.spawn_essential_handle(),
- telemetry,
+ Ok((time, slot))
},
- )
+ registry: config.prometheus_registry().clone(),
+ can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
+ spawner: &task_manager.spawn_essential_handle(),
+ telemetry,
+ })
.map_err(Into::into)
}
@@ -410,7 +418,7 @@ pub async fn start_rococo_parachain_node(
parachain_config,
polkadot_config,
id,
- |_| Default::default(),
+ |_| Ok(Default::default()),
rococo_parachain_build_import_queue,
|client,
prometheus_registry,
@@ -499,7 +507,7 @@ pub fn shell_build_import_queue(
_: Option,
task_manager: &TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue<
+ sc_consensus::DefaultImportQueue<
Block,
TFullClient,
>,
@@ -528,7 +536,7 @@ pub async fn start_shell_node(
parachain_config,
polkadot_config,
id,
- |_| Default::default(),
+ |_| Ok(Default::default()),
shell_build_import_queue,
|client,
prometheus_registry,
@@ -671,10 +679,7 @@ where
{
async fn verify(
&mut self,
- origin: BlockOrigin,
- header: Header,
- justifications: Option,
- body: Option::Extrinsic>>,
+ block_import: BlockImportParams,
) -> Result<
(
BlockImportParams,
@@ -682,7 +687,7 @@ where
),
String,
> {
- let block_id = BlockId::hash(*header.parent_hash());
+ let block_id = BlockId::hash(*block_import.header.parent_hash());
if self
.client
@@ -690,14 +695,9 @@ where
.has_api::>(&block_id)
.unwrap_or(false)
{
- self.aura_verifier
- .get_mut()
- .verify(origin, header, justifications, body)
- .await
+ self.aura_verifier.get_mut().verify(block_import).await
} else {
- self.relay_chain_verifier
- .verify(origin, header, justifications, body)
- .await
+ self.relay_chain_verifier.verify(block_import).await
}
}
}
@@ -709,7 +709,7 @@ pub fn statemint_build_import_queue(
telemetry_handle: Option,
task_manager: &TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue>,
+ sc_consensus::DefaultImportQueue>,
sc_service::Error,
>
where
@@ -786,10 +786,7 @@ pub async fn start_statemint_node(
parachain_config: Configuration,
polkadot_config: Configuration,
id: ParaId,
-) -> sc_service::error::Result<(
- TaskManager,
- Arc>,
-)>
+) -> sc_service::error::Result<(TaskManager, Arc>)>
where
RuntimeApi: ConstructRuntimeApi>
+ Send
@@ -812,7 +809,7 @@ where
parachain_config,
polkadot_config,
id,
- |_| Default::default(),
+ |_| Ok(Default::default()),
statemint_build_import_queue,
|client,
prometheus_registry,
@@ -831,39 +828,36 @@ where
let telemetry2 = telemetry.clone();
let prometheus_registry2 = prometheus_registry.map(|r| (*r).clone());
- let aura_consensus = BuildOnAccess::Uninitialized(Some(
- Box::new(move || {
- let slot_duration =
- cumulus_client_consensus_aura::slot_duration(&*client2).unwrap();
-
- let proposer_factory =
- sc_basic_authorship::ProposerFactory::with_proof_recording(
- spawn_handle,
- client2.clone(),
- transaction_pool2,
- prometheus_registry2.as_ref(),
- telemetry2.clone(),
- );
+ let aura_consensus = BuildOnAccess::Uninitialized(Some(Box::new(move || {
+ let slot_duration =
+ cumulus_client_consensus_aura::slot_duration(&*client2).unwrap();
- let relay_chain_backend2 = relay_chain_backend.clone();
- let relay_chain_client2 = relay_chain_client.clone();
-
- build_aura_consensus::<
- sp_consensus_aura::sr25519::AuthorityPair,
- _,
- _,
- _,
- _,
- _,
- _,
- _,
- _,
- _,
- >(BuildAuraConsensusParams {
- proposer_factory,
- create_inherent_data_providers:
- move |_, (relay_parent, validation_data)| {
- let parachain_inherent =
+ let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
+ spawn_handle,
+ client2.clone(),
+ transaction_pool2,
+ prometheus_registry2.as_ref(),
+ telemetry2.clone(),
+ );
+
+ let relay_chain_backend2 = relay_chain_backend.clone();
+ let relay_chain_client2 = relay_chain_client.clone();
+
+ build_aura_consensus::<
+ sp_consensus_aura::sr25519::AuthorityPair,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ >(BuildAuraConsensusParams {
+ proposer_factory,
+ create_inherent_data_providers: move |_, (relay_parent, validation_data)| {
+ let parachain_inherent =
cumulus_primitives_parachain_inherent::ParachainInherentData::create_at_with_client(
relay_parent,
&relay_chain_client,
@@ -871,42 +865,39 @@ where
&validation_data,
id,
);
- async move {
- let time =
- sp_timestamp::InherentDataProvider::from_system_time();
+ async move {
+ let time = sp_timestamp::InherentDataProvider::from_system_time();
- let slot =
+ let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*time,
slot_duration.slot_duration(),
);
- let parachain_inherent =
- parachain_inherent.ok_or_else(|| {
- Box::::from(
- "Failed to create parachain inherent",
- )
- })?;
- Ok((time, slot, parachain_inherent))
- }
- },
- block_import: client2.clone(),
- relay_chain_client: relay_chain_client2,
- relay_chain_backend: relay_chain_backend2,
- para_client: client2.clone(),
- backoff_authoring_blocks: Option::<()>::None,
- sync_oracle,
- keystore,
- force_authoring,
- slot_duration,
- // We got around 500ms for proposing
- block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),
- // And a maximum of 750ms if slots are skipped
- max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)),
- telemetry: telemetry2,
- })
- }),
- ));
+ let parachain_inherent = parachain_inherent.ok_or_else(|| {
+ Box::::from(
+ "Failed to create parachain inherent",
+ )
+ })?;
+ Ok((time, slot, parachain_inherent))
+ }
+ },
+ block_import: client2.clone(),
+ relay_chain_client: relay_chain_client2,
+ relay_chain_backend: relay_chain_backend2,
+ para_client: client2.clone(),
+ backoff_authoring_blocks: Option::<()>::None,
+ sync_oracle,
+ keystore,
+ force_authoring,
+ slot_duration,
+ // We got around 500ms for proposing
+ block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),
+ // And a maximum of 750ms if slots are skipped
+ max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)),
+ telemetry: telemetry2,
+ })
+ })));
let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
task_manager.spawn_handle(),
diff --git a/polkadot-parachains/statemine/Cargo.toml b/polkadot-parachains/statemine/Cargo.toml
index 9c6fed623e4..bf3777588a9 100644
--- a/polkadot-parachains/statemine/Cargo.toml
+++ b/polkadot-parachains/statemine/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = 'statemine-runtime'
-version = '1.0.0'
+version = '2.0.0'
authors = ["Parity Technologies "]
edition = '2018'
description = "Kusama variant of Statemint parachain runtime"
@@ -14,41 +14,41 @@ smallvec = "1.6.1"
hex-literal = { version = '0.3.1', optional = true }
# Substrate dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "master" }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "polkadot-v0.9.9" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
@@ -65,19 +65,19 @@ pallet-collator-selection = { path = "../../pallets/collator-selection", default
statemint-common = { path = "../statemint-common", default-features = false }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
[dev-dependencies]
hex-literal = "0.3.1"
hex = "0.4.3"
[build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
[features]
default = [ "std" ]
diff --git a/polkadot-parachains/statemine/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs
index 091962c0cd4..a3eaf5a0ef1 100644
--- a/polkadot-parachains/statemine/src/lib.rs
+++ b/polkadot-parachains/statemine/src/lib.rs
@@ -43,7 +43,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime, match_type, parameter_types,
- traits::{All, Filter, InstanceFilter},
+ traits::{Contains, Everything, InstanceFilter},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
DispatchClass, IdentityFee, Weight,
@@ -68,7 +68,7 @@ pub use sp_runtime::BuildStorage;
use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough};
use polkadot_parachain::primitives::Sibling;
use polkadot_runtime_common::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
-use xcm::v0::{BodyId, Junction, MultiAsset, MultiLocation, NetworkId, Xcm};
+use xcm::v0::{BodyId, Junction, MultiLocation, NetworkId};
use xcm_builder::{
AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,
EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,
@@ -103,8 +103,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("statemine"),
impl_name: create_runtime_str!("statemine"),
authoring_version: 1,
- spec_version: 1,
- impl_version: 1,
+ spec_version: 3,
+ impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
};
@@ -143,15 +143,10 @@ parameter_types! {
pub const SS58Prefix: u8 = 2;
}
-// Don't allow permission-less asset creation.
pub struct BaseFilter;
-impl Filter for BaseFilter {
- fn filter(c: &Call) -> bool {
- !matches!(
- c,
- Call::Assets(pallet_assets::Call::create(..))
- | Call::Uniques(pallet_uniques::Call::create(..))
- )
+impl Contains for BaseFilter {
+ fn contains(_c: &Call) -> bool {
+ true
}
}
@@ -541,7 +536,7 @@ match_type! {
pub type Barrier = (
TakeWeightCredit,
- AllowTopLevelPaidExecutionFrom>,
+ AllowTopLevelPaidExecutionFrom,
AllowUnpaidExecutionFrom,
// ^^^ Parent and its exec plurality get free execution
);
@@ -583,11 +578,12 @@ impl pallet_xcm::Config for Runtime {
type SendXcmOrigin = EnsureXcmOrigin;
type XcmRouter = XcmRouter;
type ExecuteXcmOrigin = EnsureXcmOrigin;
- type XcmExecuteFilter = All<(MultiLocation, Xcm)>;
+ type XcmExecuteFilter = Everything;
type XcmExecutor = XcmExecutor;
- type XcmTeleportFilter = All<(MultiLocation, Vec)>;
- type XcmReserveTransferFilter = All<(MultiLocation, Vec)>;
+ type XcmTeleportFilter = Everything;
+ type XcmReserveTransferFilter = Everything;
type Weigher = FixedWeightBounds;
+ type LocationInverter = LocationInverter;
}
impl cumulus_pallet_xcm::Config for Runtime {
@@ -631,6 +627,7 @@ impl pallet_session::Config for Runtime {
impl pallet_aura::Config for Runtime {
type AuthorityId = AuraId;
+ type DisabledValidators = ();
}
parameter_types! {
@@ -673,7 +670,9 @@ construct_runtime!(
{
// System support stuff.
System: frame_system::{Pallet, Call, Config, Storage, Event} = 0,
- ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 1,
+ ParachainSystem: cumulus_pallet_parachain_system::{
+ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned,
+ } = 1,
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 2,
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4,
@@ -741,8 +740,9 @@ pub type Executive = frame_executive::Executive<
pub struct OnRuntimeUpgrade;
impl frame_support::traits::OnRuntimeUpgrade for OnRuntimeUpgrade {
fn on_runtime_upgrade() -> u64 {
- sp_io::storage::set(b":c", &[]);
- RocksDbWeight::get().writes(1)
+ frame_support::migrations::migrate_from_pallet_version_to_storage_version::<
+ AllPalletsWithSystem,
+ >(&RocksDbWeight::get())
}
}
diff --git a/polkadot-parachains/statemint-common/Cargo.toml b/polkadot-parachains/statemint-common/Cargo.toml
index 683cb2197eb..f18460ab6fd 100644
--- a/polkadot-parachains/statemint-common/Cargo.toml
+++ b/polkadot-parachains/statemint-common/Cargo.toml
@@ -13,31 +13,31 @@ targets = ['x86_64-unknown-linux-gnu']
codec = { package = 'parity-scale-codec', version = '2.0.0', features = ['derive'], default-features = false }
# Substrate dependencies
-sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-sp-std = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-frame-executive = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-frame-support = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-frame-system = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-node-primitives = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
+sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+sp-std = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+sp-io = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+frame-executive = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+frame-support = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+frame-system = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+pallet-balances = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+sp-core = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+node-primitives = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot', branch = "master", default-features = false }
-polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', branch = "master", default-features = false }
+polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "release-v0.9.9" }
+polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "release-v0.9.9" }
# Local dependencies
pallet-collator-selection = { path = '../../pallets/collator-selection', default-features = false }
[dev-dependencies]
serde = { version = "1.0.119" }
-sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
-pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
+sp-io = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "polkadot-v0.9.9" }
[build-dependencies]
-substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = "master" }
+substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.9" }
[features]
default = ["std"]
diff --git a/polkadot-parachains/statemint-common/src/impls.rs b/polkadot-parachains/statemint-common/src/impls.rs
index 84eccd24666..31c433b34fd 100644
--- a/polkadot-parachains/statemint-common/src/impls.rs
+++ b/polkadot-parachains/statemint-common/src/impls.rs
@@ -99,7 +99,7 @@ mod tests {
}
impl frame_system::Config for Test {
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type Origin = Origin;
type Index = u64;
type BlockNumber = u64;
diff --git a/polkadot-parachains/statemint/Cargo.toml b/polkadot-parachains/statemint/Cargo.toml
index 79900740737..b039fdf0316 100644
--- a/polkadot-parachains/statemint/Cargo.toml
+++ b/polkadot-parachains/statemint/Cargo.toml
@@ -14,40 +14,41 @@ smallvec = "1.6.1"
hex-literal = { version = '0.3.1', optional = true }
# Substrate dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "master" }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "polkadot-v0.9.9" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
@@ -64,23 +65,24 @@ pallet-collator-selection = { path = "../../pallets/collator-selection", default
statemint-common = { path = "../statemint-common", default-features = false }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
[dev-dependencies]
hex-literal = "0.3.1"
hex = "0.4.3"
[build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
[features]
default = [ "std" ]
runtime-benchmarks = [
+ 'cumulus-pallet-session-benchmarking/runtime-benchmarks',
'hex-literal',
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
@@ -92,7 +94,7 @@ runtime-benchmarks = [
'pallet-balances/runtime-benchmarks',
'pallet-multisig/runtime-benchmarks',
'pallet-proxy/runtime-benchmarks',
- 'cumulus-pallet-session-benchmarking/runtime-benchmarks',
+ 'pallet-uniques/runtime-benchmarks',
'pallet-utility/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
@@ -129,6 +131,7 @@ std = [
"pallet-timestamp/std",
"pallet-transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std",
+ "pallet-uniques/std",
"pallet-utility/std",
"parachain-info/std",
"cumulus-pallet-aura-ext/std",
diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs
index d15b0527a91..957571565b9 100644
--- a/polkadot-parachains/statemint/src/lib.rs
+++ b/polkadot-parachains/statemint/src/lib.rs
@@ -43,7 +43,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime, match_type, parameter_types,
- traits::{All, InstanceFilter},
+ traits::{Everything, InstanceFilter},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
DispatchClass, IdentityFee, Weight,
@@ -145,7 +145,7 @@ parameter_types! {
// Configure FRAME pallets to include in runtime.
impl frame_system::Config for Runtime {
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type BlockWeights = RuntimeBlockWeights;
type BlockLength = RuntimeBlockLength;
type AccountId = AccountId;
@@ -327,14 +327,20 @@ impl InstanceFilter for ProxyType {
fn filter(&self, c: &Call) -> bool {
match self {
ProxyType::Any => true,
- ProxyType::NonTransfer => !matches!(c, Call::Balances(..) | Call::Assets(..)),
+ ProxyType::NonTransfer => !matches!(
+ c,
+ Call::Balances(..) | Call::Assets(..) | Call::Uniques(..)
+ ),
ProxyType::CancelProxy => matches!(
c,
Call::Proxy(pallet_proxy::Call::reject_announcement(..))
| Call::Utility(..) | Call::Multisig(..)
),
ProxyType::Assets => {
- matches!(c, Call::Assets(..) | Call::Utility(..) | Call::Multisig(..))
+ matches!(
+ c,
+ Call::Assets(..) | Call::Utility(..) | Call::Multisig(..) | Call::Uniques(..)
+ )
}
ProxyType::AssetOwner => matches!(
c,
@@ -344,6 +350,16 @@ impl InstanceFilter for ProxyType {
| Call::Assets(pallet_assets::Call::set_team(..))
| Call::Assets(pallet_assets::Call::set_metadata(..))
| Call::Assets(pallet_assets::Call::clear_metadata(..))
+ | Call::Uniques(pallet_uniques::Call::create(..))
+ | Call::Uniques(pallet_uniques::Call::destroy(..))
+ | Call::Uniques(pallet_uniques::Call::transfer_ownership(..))
+ | Call::Uniques(pallet_uniques::Call::set_team(..))
+ | Call::Uniques(pallet_uniques::Call::set_metadata(..))
+ | Call::Uniques(pallet_uniques::Call::set_attribute(..))
+ | Call::Uniques(pallet_uniques::Call::set_class_metadata(..))
+ | Call::Uniques(pallet_uniques::Call::clear_metadata(..))
+ | Call::Uniques(pallet_uniques::Call::clear_attribute(..))
+ | Call::Uniques(pallet_uniques::Call::clear_class_metadata(..))
| Call::Utility(..) | Call::Multisig(..)
),
ProxyType::AssetManager => matches!(
@@ -354,6 +370,12 @@ impl InstanceFilter for ProxyType {
| Call::Assets(pallet_assets::Call::thaw(..))
| Call::Assets(pallet_assets::Call::freeze_asset(..))
| Call::Assets(pallet_assets::Call::thaw_asset(..))
+ | Call::Uniques(pallet_uniques::Call::mint(..))
+ | Call::Uniques(pallet_uniques::Call::burn(..))
+ | Call::Uniques(pallet_uniques::Call::freeze(..))
+ | Call::Uniques(pallet_uniques::Call::thaw(..))
+ | Call::Uniques(pallet_uniques::Call::freeze_class(..))
+ | Call::Uniques(pallet_uniques::Call::thaw_class(..))
| Call::Utility(..) | Call::Multisig(..)
),
ProxyType::Collator => matches!(
@@ -480,7 +502,7 @@ match_type! {
pub type Barrier = (
TakeWeightCredit,
- AllowTopLevelPaidExecutionFrom>,
+ AllowTopLevelPaidExecutionFrom,
AllowUnpaidExecutionFrom,
// ^^^ Parent and its exec plurality get free execution
);
@@ -522,11 +544,12 @@ impl pallet_xcm::Config for Runtime {
type SendXcmOrigin = EnsureXcmOrigin;
type XcmRouter = XcmRouter;
type ExecuteXcmOrigin = EnsureXcmOrigin;
- type XcmExecuteFilter = All<(MultiLocation, Xcm)>;
+ type XcmExecuteFilter = Everything;
type XcmExecutor = XcmExecutor;
- type XcmTeleportFilter = All<(MultiLocation, Vec)>;
- type XcmReserveTransferFilter = All<(MultiLocation, Vec)>;
+ type XcmTeleportFilter = Everything;
+ type XcmReserveTransferFilter = Everything;
type Weigher = FixedWeightBounds;
+ type LocationInverter = LocationInverter;
}
impl cumulus_pallet_xcm::Config for Runtime {
@@ -570,6 +593,7 @@ impl pallet_session::Config for Runtime {
impl pallet_aura::Config for Runtime {
type AuthorityId = AuraId;
+ type DisabledValidators = ();
}
parameter_types! {
@@ -603,6 +627,34 @@ impl pallet_collator_selection::Config for Runtime {
type WeightInfo = weights::pallet_collator_selection::WeightInfo;
}
+parameter_types! {
+ pub const ClassDeposit: Balance = UNITS; // 1 UNIT deposit to create asset class
+ pub const InstanceDeposit: Balance = UNITS / 100; // 1/100 UNIT deposit to create asset instance
+ pub const KeyLimit: u32 = 32; // Max 32 bytes per key
+ pub const ValueLimit: u32 = 64; // Max 64 bytes per value
+ pub const UniquesMetadataDepositBase: Balance = deposit(1, 129);
+ pub const AttributeDepositBase: Balance = deposit(1, 0);
+ pub const DepositPerByte: Balance = deposit(0, 1);
+ pub const UniquesStringLimit: u32 = 128;
+}
+
+impl pallet_uniques::Config for Runtime {
+ type Event = Event;
+ type ClassId = u32;
+ type InstanceId = u32;
+ type Currency = Balances;
+ type ForceOrigin = AssetsForceOrigin;
+ type ClassDeposit = ClassDeposit;
+ type InstanceDeposit = InstanceDeposit;
+ type MetadataDepositBase = UniquesMetadataDepositBase;
+ type AttributeDepositBase = AttributeDepositBase;
+ type DepositPerByte = DepositPerByte;
+ type StringLimit = UniquesStringLimit;
+ type KeyLimit = KeyLimit;
+ type ValueLimit = ValueLimit;
+ type WeightInfo = weights::pallet_uniques::WeightInfo;
+}
+
// Create the runtime by composing the FRAME pallets that were previously configured.
construct_runtime!(
pub enum Runtime where
@@ -612,7 +664,9 @@ construct_runtime!(
{
// System support stuff.
System: frame_system::{Pallet, Call, Config, Storage, Event} = 0,
- ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 1,
+ ParachainSystem: cumulus_pallet_parachain_system::{
+ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned,
+ } = 1,
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 2,
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4,
@@ -641,6 +695,7 @@ construct_runtime!(
// The main stage. To include pallet-assets-freezer and pallet-uniques.
Assets: pallet_assets::{Pallet, Call, Storage, Event} = 50,
+ Uniques: pallet_uniques::{Pallet, Call, Storage, Event} = 51,
}
);
diff --git a/polkadot-parachains/statemint/src/weights/mod.rs b/polkadot-parachains/statemint/src/weights/mod.rs
index 85e91c2791c..0e4e48b1a1e 100644
--- a/polkadot-parachains/statemint/src/weights/mod.rs
+++ b/polkadot-parachains/statemint/src/weights/mod.rs
@@ -5,4 +5,5 @@ pub mod pallet_collator_selection;
pub mod pallet_proxy;
pub mod pallet_session;
pub mod pallet_timestamp;
+pub mod pallet_uniques;
pub mod pallet_utility;
diff --git a/polkadot-parachains/statemint/src/weights/pallet_uniques.rs b/polkadot-parachains/statemint/src/weights/pallet_uniques.rs
new file mode 100644
index 00000000000..4cab4dffbf7
--- /dev/null
+++ b/polkadot-parachains/statemint/src/weights/pallet_uniques.rs
@@ -0,0 +1,171 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Cumulus is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Cumulus. If not, see .
+
+//! Autogenerated weights for pallet_uniques
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-02, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 128
+
+// Executed Command:
+// ./target/release/polkadot-collator
+// benchmark
+// --chain=statemine-dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_uniques
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --header=./file_header.txt
+// --output=./polkadot-parachains/statemine-runtime/src/weights/
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for pallet_uniques.
+pub struct WeightInfo(PhantomData);
+impl pallet_uniques::WeightInfo for WeightInfo {
+ fn create() -> Weight {
+ (42_199_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn force_create() -> Weight {
+ (21_030_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
+ (0 as Weight)
+ // Standard Error: 14_000
+ .saturating_add((16_814_000 as Weight).saturating_mul(n as Weight))
+ // Standard Error: 14_000
+ .saturating_add((1_026_000 as Weight).saturating_mul(m as Weight))
+ // Standard Error: 14_000
+ .saturating_add((952_000 as Weight).saturating_mul(a as Weight))
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight)))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(m as Weight)))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
+ }
+ fn mint() -> Weight {
+ (57_236_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn burn() -> Weight {
+ (58_129_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn transfer() -> Weight {
+ (42_980_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn redeposit(i: u32, ) -> Weight {
+ (0 as Weight)
+ // Standard Error: 11_000
+ .saturating_add((26_921_000 as Weight).saturating_mul(i as Weight))
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+ }
+ fn freeze() -> Weight {
+ (30_427_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn thaw() -> Weight {
+ (29_789_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn freeze_class() -> Weight {
+ (21_380_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn thaw_class() -> Weight {
+ (21_430_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn transfer_ownership() -> Weight {
+ (49_331_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn set_team() -> Weight {
+ (22_305_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn force_asset_status() -> Weight {
+ (21_965_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn set_attribute() -> Weight {
+ (70_386_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn clear_attribute() -> Weight {
+ (63_932_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn set_metadata() -> Weight {
+ (53_647_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn clear_metadata() -> Weight {
+ (52_353_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn set_class_metadata() -> Weight {
+ (51_900_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn clear_class_metadata() -> Weight {
+ (46_929_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn approve_transfer() -> Weight {
+ (32_693_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn cancel_approval() -> Weight {
+ (32_418_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+}
diff --git a/polkadot-parachains/westmint/Cargo.toml b/polkadot-parachains/westmint/Cargo.toml
index 36388769f35..73277547f2a 100644
--- a/polkadot-parachains/westmint/Cargo.toml
+++ b/polkadot-parachains/westmint/Cargo.toml
@@ -14,40 +14,41 @@ smallvec = "1.6.1"
hex-literal = { version = '0.3.1', optional = true }
# Substrate dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "master" }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "polkadot-v0.9.9" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
-node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
@@ -64,23 +65,24 @@ pallet-collator-selection = { path = "../../pallets/collator-selection", default
statemint-common = { path = "../statemint-common", default-features = false }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
[dev-dependencies]
hex-literal = "0.3.1"
hex = "0.4.3"
[build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
[features]
default = [ "std" ]
runtime-benchmarks = [
+ 'cumulus-pallet-session-benchmarking/runtime-benchmarks',
'hex-literal',
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
@@ -92,7 +94,7 @@ runtime-benchmarks = [
'pallet-balances/runtime-benchmarks',
'pallet-multisig/runtime-benchmarks',
'pallet-proxy/runtime-benchmarks',
- 'cumulus-pallet-session-benchmarking/runtime-benchmarks',
+ 'pallet-uniques/runtime-benchmarks',
'pallet-utility/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
@@ -129,6 +131,7 @@ std = [
"pallet-timestamp/std",
"pallet-transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std",
+ "pallet-uniques/std",
"pallet-utility/std",
"parachain-info/std",
"cumulus-pallet-aura-ext/std",
diff --git a/polkadot-parachains/westmint/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs
index d38e57172ab..f494ece75e6 100644
--- a/polkadot-parachains/westmint/src/lib.rs
+++ b/polkadot-parachains/westmint/src/lib.rs
@@ -43,7 +43,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime, match_type, parameter_types,
- traits::{All, InstanceFilter},
+ traits::{Everything, InstanceFilter},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
DispatchClass, IdentityFee, Weight,
@@ -68,7 +68,7 @@ pub use sp_runtime::BuildStorage;
use pallet_xcm::XcmPassthrough;
use polkadot_parachain::primitives::Sibling;
use polkadot_runtime_common::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
-use xcm::v0::{Junction, MultiAsset, MultiLocation, NetworkId, Xcm};
+use xcm::v0::{Junction, MultiLocation, NetworkId};
use xcm_builder::{
AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,
EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,
@@ -103,8 +103,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("westmint"),
impl_name: create_runtime_str!("westmint"),
authoring_version: 1,
- spec_version: 1,
- impl_version: 1,
+ spec_version: 3,
+ impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
};
@@ -144,9 +144,8 @@ parameter_types! {
}
// Configure FRAME pallets to include in runtime.
-
impl frame_system::Config for Runtime {
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type BlockWeights = RuntimeBlockWeights;
type BlockLength = RuntimeBlockLength;
type AccountId = AccountId;
@@ -234,6 +233,8 @@ impl pallet_sudo::Config for Runtime {
type Call = Call;
}
+pub type AssetsForceOrigin = EnsureRoot;
+
parameter_types! {
pub const AssetDeposit: Balance = 100 * UNITS; // 100 WND deposit to create asset
pub const ApprovalDeposit: Balance = EXISTENTIAL_DEPOSIT;
@@ -249,7 +250,7 @@ impl pallet_assets::Config for Runtime {
type Balance = Balance;
type AssetId = u32;
type Currency = Balances;
- type ForceOrigin = EnsureRoot;
+ type ForceOrigin = AssetsForceOrigin;
type AssetDeposit = AssetDeposit;
type MetadataDepositBase = MetadataDepositBase;
type MetadataDepositPerByte = MetadataDepositPerByte;
@@ -325,14 +326,20 @@ impl InstanceFilter for ProxyType {
fn filter(&self, c: &Call) -> bool {
match self {
ProxyType::Any => true,
- ProxyType::NonTransfer => !matches!(c, Call::Balances(..) | Call::Assets(..)),
+ ProxyType::NonTransfer => !matches!(
+ c,
+ Call::Balances(..) | Call::Assets(..) | Call::Uniques(..)
+ ),
ProxyType::CancelProxy => matches!(
c,
Call::Proxy(pallet_proxy::Call::reject_announcement(..))
| Call::Utility(..) | Call::Multisig(..)
),
ProxyType::Assets => {
- matches!(c, Call::Assets(..) | Call::Utility(..) | Call::Multisig(..))
+ matches!(
+ c,
+ Call::Assets(..) | Call::Utility(..) | Call::Multisig(..) | Call::Uniques(..)
+ )
}
ProxyType::AssetOwner => matches!(
c,
@@ -342,6 +349,16 @@ impl InstanceFilter for ProxyType {
| Call::Assets(pallet_assets::Call::set_team(..))
| Call::Assets(pallet_assets::Call::set_metadata(..))
| Call::Assets(pallet_assets::Call::clear_metadata(..))
+ | Call::Uniques(pallet_uniques::Call::create(..))
+ | Call::Uniques(pallet_uniques::Call::destroy(..))
+ | Call::Uniques(pallet_uniques::Call::transfer_ownership(..))
+ | Call::Uniques(pallet_uniques::Call::set_team(..))
+ | Call::Uniques(pallet_uniques::Call::set_metadata(..))
+ | Call::Uniques(pallet_uniques::Call::set_attribute(..))
+ | Call::Uniques(pallet_uniques::Call::set_class_metadata(..))
+ | Call::Uniques(pallet_uniques::Call::clear_metadata(..))
+ | Call::Uniques(pallet_uniques::Call::clear_attribute(..))
+ | Call::Uniques(pallet_uniques::Call::clear_class_metadata(..))
| Call::Utility(..) | Call::Multisig(..)
),
ProxyType::AssetManager => matches!(
@@ -352,6 +369,12 @@ impl InstanceFilter for ProxyType {
| Call::Assets(pallet_assets::Call::thaw(..))
| Call::Assets(pallet_assets::Call::freeze_asset(..))
| Call::Assets(pallet_assets::Call::thaw_asset(..))
+ | Call::Uniques(pallet_uniques::Call::mint(..))
+ | Call::Uniques(pallet_uniques::Call::burn(..))
+ | Call::Uniques(pallet_uniques::Call::freeze(..))
+ | Call::Uniques(pallet_uniques::Call::thaw(..))
+ | Call::Uniques(pallet_uniques::Call::freeze_class(..))
+ | Call::Uniques(pallet_uniques::Call::thaw_class(..))
| Call::Utility(..) | Call::Multisig(..)
),
ProxyType::Collator => matches!(
@@ -477,7 +500,7 @@ match_type! {
pub type Barrier = (
TakeWeightCredit,
- AllowTopLevelPaidExecutionFrom>,
+ AllowTopLevelPaidExecutionFrom,
AllowUnpaidExecutionFrom,
// ^^^ Parent & its plurality gets free execution
);
@@ -519,11 +542,12 @@ impl pallet_xcm::Config for Runtime {
type SendXcmOrigin = EnsureXcmOrigin;
type XcmRouter = XcmRouter;
type ExecuteXcmOrigin = EnsureXcmOrigin;
- type XcmExecuteFilter = All<(MultiLocation, Xcm)>;
+ type XcmExecuteFilter = Everything;
type XcmExecutor = XcmExecutor;
- type XcmTeleportFilter = All<(MultiLocation, Vec)>;
- type XcmReserveTransferFilter = All<(MultiLocation, Vec)>;
+ type XcmTeleportFilter = Everything;
+ type XcmReserveTransferFilter = Everything;
type Weigher = FixedWeightBounds;
+ type LocationInverter = LocationInverter;
}
impl cumulus_pallet_xcm::Config for Runtime {
@@ -567,6 +591,7 @@ impl pallet_session::Config for Runtime {
impl pallet_aura::Config for Runtime {
type AuthorityId = AuraId;
+ type DisabledValidators = ();
}
parameter_types! {
@@ -593,6 +618,34 @@ impl pallet_collator_selection::Config for Runtime {
type WeightInfo = weights::pallet_collator_selection::WeightInfo;
}
+parameter_types! {
+ pub const ClassDeposit: Balance = UNITS; // 1 UNIT deposit to create asset class
+ pub const InstanceDeposit: Balance = UNITS / 100; // 1/100 UNIT deposit to create asset instance
+ pub const KeyLimit: u32 = 32; // Max 32 bytes per key
+ pub const ValueLimit: u32 = 64; // Max 64 bytes per value
+ pub const UniquesMetadataDepositBase: Balance = deposit(1, 129);
+ pub const AttributeDepositBase: Balance = deposit(1, 0);
+ pub const DepositPerByte: Balance = deposit(0, 1);
+ pub const UniquesStringLimit: u32 = 128;
+}
+
+impl pallet_uniques::Config for Runtime {
+ type Event = Event;
+ type ClassId = u32;
+ type InstanceId = u32;
+ type Currency = Balances;
+ type ForceOrigin = AssetsForceOrigin;
+ type ClassDeposit = ClassDeposit;
+ type InstanceDeposit = InstanceDeposit;
+ type MetadataDepositBase = UniquesMetadataDepositBase;
+ type AttributeDepositBase = AttributeDepositBase;
+ type DepositPerByte = DepositPerByte;
+ type StringLimit = UniquesStringLimit;
+ type KeyLimit = KeyLimit;
+ type ValueLimit = ValueLimit;
+ type WeightInfo = weights::pallet_uniques::WeightInfo;
+}
+
// Create the runtime by composing the FRAME pallets that were previously configured.
construct_runtime!(
pub enum Runtime where
@@ -602,7 +655,9 @@ construct_runtime!(
{
// System support stuff;
System: frame_system::{Pallet, Call, Config, Storage, Event},
- ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event},
+ ParachainSystem: cumulus_pallet_parachain_system::{
+ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned,
+ },
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
ParachainInfo: parachain_info::{Pallet, Storage, Config},
@@ -630,6 +685,9 @@ construct_runtime!(
PolkadotXcm: pallet_xcm::{Pallet, Call, Event, Origin},
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin},
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event},
+
+ // More things for the main stage
+ Uniques: pallet_uniques::{Pallet, Call, Storage, Event},
}
);
@@ -668,8 +726,9 @@ pub type Executive = frame_executive::Executive<
pub struct OnRuntimeUpgrade;
impl frame_support::traits::OnRuntimeUpgrade for OnRuntimeUpgrade {
fn on_runtime_upgrade() -> u64 {
- sp_io::storage::set(b":c", &[]);
- RocksDbWeight::get().writes(1)
+ frame_support::migrations::migrate_from_pallet_version_to_storage_version::<
+ AllPalletsWithSystem,
+ >(&RocksDbWeight::get())
}
}
diff --git a/polkadot-parachains/westmint/src/weights/mod.rs b/polkadot-parachains/westmint/src/weights/mod.rs
index 85e91c2791c..0e4e48b1a1e 100644
--- a/polkadot-parachains/westmint/src/weights/mod.rs
+++ b/polkadot-parachains/westmint/src/weights/mod.rs
@@ -5,4 +5,5 @@ pub mod pallet_collator_selection;
pub mod pallet_proxy;
pub mod pallet_session;
pub mod pallet_timestamp;
+pub mod pallet_uniques;
pub mod pallet_utility;
diff --git a/polkadot-parachains/westmint/src/weights/pallet_uniques.rs b/polkadot-parachains/westmint/src/weights/pallet_uniques.rs
new file mode 100644
index 00000000000..4cab4dffbf7
--- /dev/null
+++ b/polkadot-parachains/westmint/src/weights/pallet_uniques.rs
@@ -0,0 +1,171 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Cumulus is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Cumulus. If not, see .
+
+//! Autogenerated weights for pallet_uniques
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-02, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 128
+
+// Executed Command:
+// ./target/release/polkadot-collator
+// benchmark
+// --chain=statemine-dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_uniques
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --header=./file_header.txt
+// --output=./polkadot-parachains/statemine-runtime/src/weights/
+
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for pallet_uniques.
+pub struct WeightInfo(PhantomData);
+impl pallet_uniques::WeightInfo for WeightInfo {
+ fn create() -> Weight {
+ (42_199_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn force_create() -> Weight {
+ (21_030_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
+ (0 as Weight)
+ // Standard Error: 14_000
+ .saturating_add((16_814_000 as Weight).saturating_mul(n as Weight))
+ // Standard Error: 14_000
+ .saturating_add((1_026_000 as Weight).saturating_mul(m as Weight))
+ // Standard Error: 14_000
+ .saturating_add((952_000 as Weight).saturating_mul(a as Weight))
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight)))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(m as Weight)))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
+ }
+ fn mint() -> Weight {
+ (57_236_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn burn() -> Weight {
+ (58_129_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn transfer() -> Weight {
+ (42_980_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn redeposit(i: u32, ) -> Weight {
+ (0 as Weight)
+ // Standard Error: 11_000
+ .saturating_add((26_921_000 as Weight).saturating_mul(i as Weight))
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+ }
+ fn freeze() -> Weight {
+ (30_427_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn thaw() -> Weight {
+ (29_789_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn freeze_class() -> Weight {
+ (21_380_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn thaw_class() -> Weight {
+ (21_430_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn transfer_ownership() -> Weight {
+ (49_331_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn set_team() -> Weight {
+ (22_305_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn force_asset_status() -> Weight {
+ (21_965_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn set_attribute() -> Weight {
+ (70_386_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn clear_attribute() -> Weight {
+ (63_932_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn set_metadata() -> Weight {
+ (53_647_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn clear_metadata() -> Weight {
+ (52_353_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn set_class_metadata() -> Weight {
+ (51_900_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+ fn clear_class_metadata() -> Weight {
+ (46_929_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn approve_transfer() -> Weight {
+ (32_693_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn cancel_approval() -> Weight {
+ (32_418_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+}
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 20d78aea358..b74b8f1920d 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -6,17 +6,17 @@ edition = "2018"
[dependencies]
# Substrate dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
# Other dependencies
impl-trait-for-tuples = "0.2.1"
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index 5d49b892862..a59cd7012b2 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -19,12 +19,14 @@
#![cfg_attr(not(feature = "std"), no_std)]
use codec::{Decode, Encode};
-use frame_support::weights::Weight;
use sp_runtime::{traits::Block as BlockT, RuntimeDebug};
use sp_std::prelude::*;
pub use polkadot_core_primitives::InboundDownwardMessage;
-pub use polkadot_parachain::primitives::{Id as ParaId, UpwardMessage, ValidationParams};
+pub use polkadot_parachain::primitives::{
+ DmpMessageHandler, Id as ParaId, UpwardMessage, ValidationParams, XcmpMessageFormat,
+ XcmpMessageHandler,
+};
pub use polkadot_primitives::v1::{
AbridgedHostConfiguration, AbridgedHrmpChannel, PersistedValidationData,
};
@@ -34,7 +36,6 @@ pub mod relay_chain {
pub use polkadot_core_primitives::*;
pub use polkadot_primitives::{v1, v1::well_known_keys};
}
-use relay_chain::BlockNumber as RelayBlockNumber;
/// An inbound HRMP message.
pub type InboundHrmpMessage = polkadot_primitives::v1::InboundHrmpMessage;
@@ -88,47 +89,6 @@ pub trait GetChannelInfo {
fn get_channel_max(id: ParaId) -> Option;
}
-/// Something that should be called when a downward message is received.
-pub trait DmpMessageHandler {
- /// Handle some incoming DMP messages (note these are individual XCM messages).
- ///
- /// Also, process messages up to some `max_weight`.
- fn handle_dmp_messages(
- iter: impl Iterator- )>,
- max_weight: Weight,
- ) -> Weight;
-}
-impl DmpMessageHandler for () {
- fn handle_dmp_messages(
- iter: impl Iterator
- )>,
- _max_weight: Weight,
- ) -> Weight {
- iter.for_each(drop);
- 0
- }
-}
-
-/// Something that should be called for each batch of messages received over XCMP.
-pub trait XcmpMessageHandler {
- /// Handle some incoming XCMP messages (note these are the big one-per-block aggregate
- /// messages).
- ///
- /// Also, process messages up to some `max_weight`.
- fn handle_xcmp_messages<'a, I: Iterator
- >(
- iter: I,
- max_weight: Weight,
- ) -> Weight;
-}
-impl XcmpMessageHandler for () {
- fn handle_xcmp_messages<'a, I: Iterator
- >(
- iter: I,
- _max_weight: Weight,
- ) -> Weight {
- for _ in iter {}
- 0
- }
-}
-
/// Something that should be called when sending an upward message.
pub trait UpwardMessageSender {
/// Send the given UMP message; return the expected number of blocks before the message will
diff --git a/primitives/parachain-inherent/Cargo.toml b/primitives/parachain-inherent/Cargo.toml
index 041d7f974f2..780b53afd4c 100644
--- a/primitives/parachain-inherent/Cargo.toml
+++ b/primitives/parachain-inherent/Cargo.toml
@@ -6,17 +6,17 @@ edition = "2018"
[dependencies]
# Substrate dependencies
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-client = { git = "https://github.com/paritytech/polkadot", optional = true, branch = "master" }
+polkadot-client = { git = "https://github.com/paritytech/polkadot", optional = true, branch = "release-v0.9.9" }
# Cumulus dependencies
cumulus-primitives-core = { path = "../core", default-features = false }
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 4cd8b262d8a..1d386c50a89 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -7,18 +7,18 @@ description = "Provides timestamp related functionality for parachains."
[dependencies]
# Substrate dependencies
-sp-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-primitives-core = { path = "../core", default-features = false }
[dev-dependencies]
# Substrate dependencies
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-test-client = { path = "../../test/client" }
diff --git a/primitives/utility/Cargo.toml b/primitives/utility/Cargo.toml
index d069f7394f1..c1dd974fbcd 100644
--- a/primitives/utility/Cargo.toml
+++ b/primitives/utility/Cargo.toml
@@ -6,16 +6,16 @@ edition = "2018"
[dependencies]
# Substrate dependencies
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
cumulus-primitives-core = { path = "../core", default-features = false }
diff --git a/scripts/ci/pre_cache.sh b/scripts/ci/pre_cache.sh
new file mode 100755
index 00000000000..c25d73587bf
--- /dev/null
+++ b/scripts/ci/pre_cache.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -u
+
+# if there is no directory for this $CI_COMMIT_REF_NAME/$CI_JOB_NAME
+# create such directory and
+# copy recursively all the files from the newest dir which has $CI_JOB_NAME, if it exists
+
+# cache lives in /ci-cache/${CI_PROJECT_NAME}/${2}/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}
+
+function prepopulate {
+ if [[ ! -d $1 ]]; then
+ mkdir -p "/ci-cache/$CI_PROJECT_NAME/$2/$CI_COMMIT_REF_NAME";
+ FRESH_CACHE=$(find "/ci-cache/$CI_PROJECT_NAME/$2" -mindepth 2 -maxdepth 2 \
+ -type d -name "$CI_JOB_NAME" -exec stat --printf="%Y\t%n\n" {} \; |sort -n -r |head -1 |cut -f2);
+ if [[ -d $FRESH_CACHE ]]; then
+ echo "____Using" "$FRESH_CACHE" "to prepopulate the cache____";
+ time cp -r "$FRESH_CACHE" "$1";
+ else
+ echo "_____No such $2 dir, proceeding from scratch_____";
+ fi
+ else
+ echo "____No need to prepopulate $2 cache____";
+ fi
+}
+
+# CARGO_HOME cache is still broken so would be handled some other way.
+prepopulate "$CARGO_TARGET_DIR" targets
diff --git a/test/client/Cargo.toml b/test/client/Cargo.toml
index a5c836e7cc9..cb1905fabef 100644
--- a/test/client/Cargo.toml
+++ b/test/client/Cargo.toml
@@ -5,25 +5,25 @@ authors = ["Parity Technologies "]
edition = "2018"
[dependencies]
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-test-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-test-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Cumulus deps
cumulus-test-runtime = { path = "../runtime" }
@@ -33,8 +33,8 @@ cumulus-primitives-core = { path = "../../primitives/core" }
cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" }
# Polkadot deps
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Other deps
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ "derive" ] }
diff --git a/test/relay-sproof-builder/Cargo.toml b/test/relay-sproof-builder/Cargo.toml
index 9342ff74721..4a2238446dc 100644
--- a/test/relay-sproof-builder/Cargo.toml
+++ b/test/relay-sproof-builder/Cargo.toml
@@ -9,12 +9,12 @@ edition = '2018'
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ "derive" ] }
# Substrate dependencies
-sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Polkadot dependencies
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
# Cumulus dependencies
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
diff --git a/test/relay-validation-worker-provider/Cargo.toml b/test/relay-validation-worker-provider/Cargo.toml
index 9946a29b704..371fce6eea0 100644
--- a/test/relay-validation-worker-provider/Cargo.toml
+++ b/test/relay-validation-worker-provider/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2018"
build = "build.rs"
[dependencies]
-polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
diff --git a/test/relay-validation-worker-provider/build.rs b/test/relay-validation-worker-provider/build.rs
index 05eb38c9d5a..838e2dfcdb7 100644
--- a/test/relay-validation-worker-provider/build.rs
+++ b/test/relay-validation-worker-provider/build.rs
@@ -26,7 +26,8 @@ const PROJECT_NAME: &str = "validation-worker";
const SKIP_ENV: &str = "SKIP_BUILD";
fn main() {
- if env::var(SKIP_ENV).is_ok() { return
+ if env::var(SKIP_ENV).is_ok() {
+ return;
}
let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo"));
@@ -42,11 +43,13 @@ fn main() {
}
fn find_cargo_lock() -> PathBuf {
- let mut path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is set by cargo"));
+ let mut path = PathBuf::from(
+ env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is set by cargo"),
+ );
loop {
if path.join("Cargo.lock").exists() {
- return path.join("Cargo.lock")
+ return path.join("Cargo.lock");
}
if !path.pop() {
diff --git a/test/runtime-upgrade/Cargo.toml b/test/runtime-upgrade/Cargo.toml
index e944d56a574..49ce1d3eda3 100644
--- a/test/runtime-upgrade/Cargo.toml
+++ b/test/runtime-upgrade/Cargo.toml
@@ -9,25 +9,25 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
serde = { version = "1.0.101", optional = true, features = ["derive"] }
# Substrate dependencies
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false }
@@ -35,10 +35,10 @@ cumulus-primitives-core = { path = "../../primitives/core", default-features = f
cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-features = false }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
[build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
[features]
default = [ "std", "upgrade" ]
diff --git a/test/runtime/Cargo.toml b/test/runtime/Cargo.toml
index 1bbdc88cb40..f9fbb9db54d 100644
--- a/test/runtime/Cargo.toml
+++ b/test/runtime/Cargo.toml
@@ -9,25 +9,25 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
serde = { version = "1.0.101", optional = true, features = ["derive"] }
# Substrate dependencies
-frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
# Cumulus dependencies
cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false }
@@ -35,10 +35,10 @@ cumulus-primitives-core = { path = "../../primitives/core", default-features = f
cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-features = false }
# Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.9" }
[build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
[features]
default = [ "std" ]
diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs
index 17353c5aff0..b6b4d8ce2a5 100644
--- a/test/runtime/src/lib.rs
+++ b/test/runtime/src/lib.rs
@@ -184,7 +184,7 @@ impl frame_system::Config for Runtime {
type OnNewAccount = ();
type OnKilledAccount = ();
type DbWeight = ();
- type BaseCallFilter = ();
+ type BaseCallFilter = frame_support::traits::Everything;
type SystemWeightInfo = ();
type BlockWeights = RuntimeBlockWeights;
type BlockLength = RuntimeBlockLength;
@@ -262,7 +262,9 @@ construct_runtime! {
UncheckedExtrinsic = UncheckedExtrinsic,
{
System: frame_system::{Pallet, Call, Storage, Config, Event},
- ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event, Config},
+ ParachainSystem: cumulus_pallet_parachain_system::{
+ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned,
+ },
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
Balances: pallet_balances::{Pallet, Call, Storage, Config, Event},
Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event},
diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml
index 483fc1c524d..8759678d9b8 100644
--- a/test/service/Cargo.toml
+++ b/test/service/Cargo.toml
@@ -11,40 +11,40 @@ serde = { version = "1.0.101", features = ["derive"] }
async-trait = "0.1.42"
# Substrate
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Polkadot
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Cumulus
cumulus-client-consensus-relay-chain = { path = "../../client/consensus/relay-chain" }
@@ -64,14 +64,14 @@ futures = "0.3.5"
tokio = { version = "0.2.21", features = ["macros"] }
# Polkadot dependencies
-polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
+polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" }
# Substrate dependencies
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
# Cumulus
cumulus-test-runtime-upgrade = { path = "../runtime-upgrade" }
diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs
index 22576a2fecf..972488a9a1d 100644
--- a/test/service/src/lib.rs
+++ b/test/service/src/lib.rs
@@ -99,7 +99,7 @@ pub fn new_partial(
Client,
TFullBackend,
(),
- sp_consensus::import_queue::BasicQueue>,
+ sc_consensus::import_queue::BasicQueue>,
sc_transaction_pool::FullPool,
(),
>,
@@ -162,7 +162,7 @@ async fn start_node_impl(
where
RB: Fn(
Arc>,
- ) -> jsonrpc_core::IoHandler
+ ) -> Result, sc_service::Error>
+ Send
+ 'static,
{
@@ -213,6 +213,7 @@ where
import_queue: import_queue.clone(),
on_demand: None,
block_announce_validator_builder: Some(Box::new(block_announce_validator_builder)),
+ warp_sync: None,
})?;
let rpc_extensions_builder = {
@@ -515,7 +516,7 @@ impl TestNodeBuilder {
relay_chain_config,
self.para_id,
self.wrap_announce_block,
- |_| Default::default(),
+ |_| Ok(Default::default()),
self.consensus,
)
.await