diff --git a/.github/ISSUE_TEMPLATE/blank.md b/.github/ISSUE_TEMPLATE/blank.md
new file mode 100644
index 0000000000..2a9137e728
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/blank.md
@@ -0,0 +1,4 @@
+---
+name: New blank issue
+about: New blank issue
+---
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2e9f57f539..dd4f8952cb 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,7 +2,7 @@ version: 2
updates:
- package-ecosystem: "cargo"
directory: "/"
- labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
+ labels: ["A2-insubstantial", "B0-silent", "C1-low"]
# Handle updates for crates from github.com/paritytech/substrate manually.
ignore:
- dependency-name: "substrate-*"
@@ -25,6 +25,6 @@ updates:
interval: "daily"
- package-ecosystem: github-actions
directory: '/'
- labels: ["A2-insubstantial", "B0-silent", "C1-low 📌", "E3-dependencies"]
+ labels: ["A2-insubstantial", "B0-silent", "C1-low", "E2-dependencies"]
schedule:
interval: daily
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 8d0d6bd0a7..b2888f1247 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,7 +18,7 @@ jobs:
run: rustup show
- name: Rust cache
- uses: Swatinem/rust-cache@v1
+ uses: Swatinem/rust-cache@6720f05bc48b77f96918929a9019fb2203ff71f8 # v2.0.0
- name: Build rustdocs
run: SKIP_WASM_BUILD=1 cargo doc --all --no-deps
@@ -27,7 +27,7 @@ jobs:
run: echo "" > ./target/doc/index.html
- name: Deploy documentation
- uses: peaceiris/actions-gh-pages@v3
+ uses: peaceiris/actions-gh-pages@068dc23d9710f1ba62e86896f84735d869951305 # v3.8.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
diff --git a/.github/workflows/release-30_create-draft.yml b/.github/workflows/release-30_create-draft.yml
index 709f040c4a..2869aa5344 100644
--- a/.github/workflows/release-30_create-draft.yml
+++ b/.github/workflows/release-30_create-draft.yml
@@ -192,7 +192,7 @@ jobs:
- name: Create draft release
id: create-release
- uses: actions/create-release@v1
+ uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
@@ -258,7 +258,7 @@ jobs:
mv "$(sed -E 's/-(.*)/_\1/' <<< ${{ matrix.runtime }})_runtime.compact.compressed.wasm" "${{ matrix.runtime }}_runtime.compact.compressed.wasm" || true
- name: Upload compressed ${{ matrix.runtime }} wasm
- uses: actions/upload-release-asset@v1
+ uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e11e2814a8..78a189fbce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ stages:
- benchmarks-build
- benchmarks-run
- publish
+ - integration-test
default:
interruptible: true
@@ -28,6 +29,7 @@ variables:
CI_IMAGE: "paritytech/ci-linux:production"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.56"
.collect-artifacts: &collect-artifacts
artifacts:
@@ -84,6 +86,15 @@ variables:
rules:
- if: $CI_COMMIT_REF_NAME =~ /^release-parachains-v[0-9].*$/ # i.e. release-parachains-v1.0, release-parachains-v2.1rc1, release-parachains-v3000
+.zombienet-refs: &zombienet-refs
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "pipeline"
+ when: never
+ - if: $CI_PIPELINE_SOURCE == "schedule"
+ when: never
+ - if: $CI_COMMIT_REF_NAME == "master"
+ - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+
.docker-env: &docker-env
image: "${CI_IMAGE}"
before_script:
@@ -212,6 +223,8 @@ build-test-parachain:
- echo "___Packing the artifacts___"
- mkdir -p ./artifacts
- mv ./target/release/test-parachain ./artifacts/.
+ - mkdir -p ./artifacts/zombienet
+ - mv ./target/release/wbuild/cumulus-test-runtime/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm ./artifacts/zombienet/.
#### stage: publish
@@ -313,7 +326,7 @@ benchmarks-build:
- git commit -m "[benchmarks] pr with weights"
- git push origin $BRANCHNAME
-benchmarks-statemint:
+benchmarks-assets:
stage: benchmarks-run
before_script:
- *rust-info-script
@@ -326,9 +339,24 @@ benchmarks-statemint:
- ./scripts/benchmarks-ci.sh assets westmint ./artifacts
- export BRANCHNAME="weights-statemint-${CI_COMMIT_BRANCH}"
- *git-commit-push
- # create PR
+ # create PR to release-parachains-v* branch
- curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
- -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'$BRANCHNAME'","base":"'${CI_COMMIT_BRANCH}'"}'
+ -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'${CI_COMMIT_BRANCH}'"}'
+ -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
+ # create PR to master
+ - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
+ -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"master"}'
+ -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
+ # create PR to a branch with version number (e.g. v0.9.270) and release-v* (e.g. release-v0.9.270)
+ # transform release-parachains-v9270 to v0.9.270
+ - export BASEBRANCH=$(echo ${CI_COMMIT_BRANCH} | cut -d "-" -f 3 | sed -e "s/\(.\)\(.\)\(...\)/\10.\2.\3/")
+ # create PR to v* branch
+ - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
+ -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'${BASEBRANCH}'"}'
+ -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
+ # create PR to release-v* branch
+ - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
+ -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'${BRANCHNAME}'","base":"'release-${BASEBRANCH}'"}'
-X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
after_script:
- rm -rf .git/config
@@ -355,13 +383,13 @@ benchmarks-collectives:
tags:
- weights
-publish-benchmarks-statemint-s3: &publish-benchmarks
+publish-benchmarks-assets-s3: &publish-benchmarks
stage: publish
<<: *kubernetes-env
image: paritytech/awscli:latest
<<: *benchmarks-refs
needs:
- - job: benchmarks-statemint
+ - job: benchmarks-assets
artifacts: true
variables:
GIT_STRATEGY: none
@@ -395,6 +423,161 @@ update-parachain-template:
--github-api-token "$GITHUB_TOKEN"
--polkadot-branch "$CI_COMMIT_REF_NAME"
+#### stage: integration-test
+
+zombienet-0001-sync_blocks_from_tip_without_connected_collator:
+ stage: integration-test
+ image: "${ZOMBIENET_IMAGE}"
+ <<: *zombienet-refs
+ needs:
+ - job: build-push-image-test-parachain
+ variables:
+ POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:master"
+ GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests"
+ COL_IMAGE: "docker.io/paritypr/test-parachain:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
+ before_script:
+ - echo "Zombie-net Tests Config"
+ - echo "${ZOMBIENET_IMAGE}"
+ - echo "${RELAY_IMAGE}"
+ - echo "${COL_IMAGE}"
+ - echo "${GH_DIR}"
+ - export DEBUG=zombie
+ - export RELAY_IMAGE=${POLKADOT_IMAGE}
+ - export COL_IMAGE=${COL_IMAGE}
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+ --github-remote-dir="${GH_DIR}"
+ --concurrency=1
+ --test="0001-sync_blocks_from_tip_without_connected_collator.feature"
+ allow_failure: true
+ retry: 2
+ tags:
+ - zombienet-polkadot-integration-test
+
+zombienet-0002-pov_recovery:
+ stage: integration-test
+ image: "${ZOMBIENET_IMAGE}"
+ <<: *zombienet-refs
+ needs:
+ - job: build-push-image-test-parachain
+ variables:
+ POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:master"
+ GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests"
+ COL_IMAGE: "docker.io/paritypr/test-parachain:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
+ before_script:
+ - echo "Zombie-net Tests Config"
+ - echo "${ZOMBIENET_IMAGE}"
+ - echo "${RELAY_IMAGE}"
+ - echo "${COL_IMAGE}"
+ - echo "${GH_DIR}"
+ - export DEBUG=zombie
+ - export RELAY_IMAGE=${POLKADOT_IMAGE}
+ - export COL_IMAGE=${COL_IMAGE}
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+ --github-remote-dir="${GH_DIR}"
+ --concurrency=1
+ --test="0002-pov_recovery.feature"
+ allow_failure: true
+ retry: 2
+ tags:
+ - zombienet-polkadot-integration-test
+
+zombienet-0003-full_node_catching_up:
+ stage: integration-test
+ image: "${ZOMBIENET_IMAGE}"
+ <<: *zombienet-refs
+ needs:
+ - job: build-push-image-test-parachain
+ variables:
+ POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:master"
+ GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests"
+ COL_IMAGE: "docker.io/paritypr/test-parachain:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
+ before_script:
+ - echo "Zombie-net Tests Config"
+ - echo "${ZOMBIENET_IMAGE}"
+ - echo "${RELAY_IMAGE}"
+ - echo "${COL_IMAGE}"
+ - echo "${GH_DIR}"
+ - export DEBUG=zombie
+ - export RELAY_IMAGE=${POLKADOT_IMAGE}
+ - export COL_IMAGE=${COL_IMAGE}
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+ --github-remote-dir="${GH_DIR}"
+ --concurrency=1
+ --test="0003-full_node_catching_up.feature"
+ allow_failure: true
+ retry: 2
+ tags:
+ - zombienet-polkadot-integration-test
+
+zombienet-0004-runtime_upgrade:
+ stage: integration-test
+ image: "${ZOMBIENET_IMAGE}"
+ <<: *zombienet-refs
+ needs:
+ - job: build-push-image-test-parachain
+ - job: build-test-parachain
+ artifacts: true
+ variables:
+ POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:master"
+ GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests"
+ COL_IMAGE: "docker.io/paritypr/test-parachain:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
+ before_script:
+ - ls -ltr *
+ - cp ./artifacts/zombienet/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm /tmp/
+ - ls /tmp
+ - echo "Zombie-net Tests Config"
+ - echo "${ZOMBIENET_IMAGE}"
+ - echo "${RELAY_IMAGE}"
+ - echo "${COL_IMAGE}"
+ - echo "${GH_DIR}"
+ - export DEBUG=zombie
+ - export RELAY_IMAGE=${POLKADOT_IMAGE}
+ - export COL_IMAGE=${COL_IMAGE}
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+ --github-remote-dir="${GH_DIR}"
+ --concurrency=1
+ --test="0004-runtime_upgrade.feature"
+ allow_failure: true
+ retry: 2
+ tags:
+ - zombienet-polkadot-integration-test
+
+zombienet-0005-migrate_solo_to_para:
+ stage: integration-test
+ image: "${ZOMBIENET_IMAGE}"
+ <<: *zombienet-refs
+ needs:
+ - job: build-push-image-test-parachain
+ - job: build-test-parachain
+ artifacts: true
+ variables:
+ POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:master"
+ GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests"
+ COL_IMAGE: "docker.io/paritypr/test-parachain:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
+ before_script:
+ - ls -ltr *
+ - echo "Zombie-net Tests Config"
+ - echo "${ZOMBIENET_IMAGE}"
+ - echo "${RELAY_IMAGE}"
+ - echo "${COL_IMAGE}"
+ - echo "${GH_DIR}"
+ - export DEBUG=zombie
+ - export RELAY_IMAGE=${POLKADOT_IMAGE}
+ - export COL_IMAGE=${COL_IMAGE}
+ script:
+ - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+ --github-remote-dir="${GH_DIR}"
+ --concurrency=1
+ --test="0005-migrate_solo_to_para.feature"
+ allow_failure: true
+ retry: 2
+ tags:
+ - zombienet-polkadot-integration-test
+
#### stage: .post
# This job cancels the whole pipeline if any of provided jobs fail.
diff --git a/Cargo.lock b/Cargo.lock
index eee6bd514c..a189550c04 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -108,9 +108,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.61"
+version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "508b352bb5c066aac251f6daf6b36eccd03e8a88e8081cd44959ea277a3af9a8"
+checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305"
[[package]]
name = "approx"
@@ -246,10 +246,11 @@ dependencies = [
[[package]]
name = "async-io"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07"
+checksum = "0ab006897723d9352f63e2b13047177c3982d8d79709d713ce7747a8f19fd1b0"
dependencies = [
+ "autocfg",
"concurrent-queue",
"futures-lite",
"libc",
@@ -274,11 +275,12 @@ dependencies = [
[[package]]
name = "async-process"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
+checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
dependencies = [
"async-io",
+ "autocfg",
"blocking",
"cfg-if 1.0.0",
"event-listener",
@@ -450,7 +452,7 @@ dependencies = [
[[package]]
name = "beefy-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"beefy-primitives",
@@ -486,7 +488,7 @@ dependencies = [
[[package]]
name = "beefy-gadget-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"beefy-gadget",
"beefy-primitives",
@@ -506,7 +508,7 @@ dependencies = [
[[package]]
name = "beefy-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"beefy-primitives",
"sp-api",
@@ -515,7 +517,7 @@ dependencies = [
[[package]]
name = "beefy-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -731,9 +733,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.10.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
[[package]]
name = "byte-slice-cast"
@@ -1207,9 +1209,9 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.2"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "dc948ebb96241bb40ab73effeb80d9f93afaad49359d159a5e61be51619fe813"
dependencies = [
"libc",
]
@@ -2457,10 +2459,24 @@ dependencies = [
]
[[package]]
-name = "either"
-version = "1.7.0"
+name = "ed25519-zebra"
+version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
+checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
+dependencies = [
+ "curve25519-dalek 3.2.0",
+ "hex",
+ "rand_core 0.6.3",
+ "sha2 0.9.9",
+ "thiserror",
+ "zeroize",
+]
+
+[[package]]
+name = "either"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "elliptic-curve"
@@ -2744,7 +2760,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
]
@@ -2762,7 +2778,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -2774,6 +2790,7 @@ dependencies = [
"serde",
"sp-api",
"sp-application-crypto",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-runtime-interface",
@@ -2784,7 +2801,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"Inflector",
"chrono",
@@ -2835,7 +2852,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2846,7 +2863,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2862,7 +2879,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -2890,7 +2907,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"bitflags",
"frame-metadata",
@@ -2921,7 +2938,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"Inflector",
"frame-support-procedural-tools",
@@ -2933,7 +2950,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -2945,7 +2962,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro2",
"quote",
@@ -2955,7 +2972,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"log",
@@ -2972,7 +2989,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2987,7 +3004,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2996,7 +3013,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"sp-api",
@@ -3006,9 +3023,9 @@ dependencies = [
[[package]]
name = "fs-err"
-version = "2.7.0"
+version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e"
+checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50"
[[package]]
name = "fs-swap"
@@ -3046,9 +3063,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa"
dependencies = [
"futures-channel",
"futures-core",
@@ -3061,9 +3078,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1"
dependencies = [
"futures-core",
"futures-sink",
@@ -3071,15 +3088,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115"
[[package]]
name = "futures-executor"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528"
dependencies = [
"futures-core",
"futures-task",
@@ -3089,9 +3106,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5"
[[package]]
name = "futures-lite"
@@ -3110,9 +3127,9 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d"
dependencies = [
"proc-macro2",
"quote",
@@ -3132,15 +3149,15 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765"
[[package]]
name = "futures-task"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306"
[[package]]
name = "futures-timer"
@@ -3150,9 +3167,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.21"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577"
dependencies = [
"futures-channel",
"futures-core",
@@ -3293,9 +3310,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.13"
+version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
dependencies = [
"bytes",
"fnv",
@@ -3519,9 +3536,9 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.44"
+version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf7d67cf4a22adc5be66e75ebdf769b3f2ea032041437a7061f97a63dad4b"
+checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -3641,9 +3658,9 @@ checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6"
[[package]]
name = "io-lifetimes"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb"
+checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06"
[[package]]
name = "ip_network"
@@ -3873,7 +3890,7 @@ checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
[[package]]
name = "kusama-runtime"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -3966,7 +3983,7 @@ dependencies = [
[[package]]
name = "kusama-runtime-constants"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -4037,9 +4054,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.131"
+version = "0.2.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40"
+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
[[package]]
name = "libloading"
@@ -4825,9 +4842,9 @@ dependencies = [
[[package]]
name = "memmap2"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2e4455be2010e8c5e77f0d10234b30f3a636a5305725609b5a71ad00d22577"
+checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498"
dependencies = [
"libc",
]
@@ -5122,7 +5139,20 @@ dependencies = [
"bitflags",
"cfg-if 1.0.0",
"libc",
+]
+
+[[package]]
+name = "nix"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+dependencies = [
+ "autocfg",
+ "bitflags",
+ "cfg-if 1.0.0",
+ "libc",
"memoffset",
+ "pin-utils",
]
[[package]]
@@ -5253,9 +5283,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.13.0"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
[[package]]
name = "oorandom"
@@ -5284,7 +5314,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "orchestra"
version = "0.0.1"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"dyn-clonable",
@@ -5300,7 +5330,7 @@ dependencies = [
[[package]]
name = "orchestra-proc-macro"
version = "0.0.1"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"expander 0.0.6",
"itertools",
@@ -5322,9 +5352,9 @@ dependencies = [
[[package]]
name = "os_str_bytes"
-version = "6.2.0"
+version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
[[package]]
name = "owning_ref"
@@ -5338,7 +5368,7 @@ dependencies = [
[[package]]
name = "pallet-alliance"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5359,7 +5389,7 @@ dependencies = [
[[package]]
name = "pallet-asset-tx-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -5376,7 +5406,7 @@ dependencies = [
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5390,7 +5420,7 @@ dependencies = [
[[package]]
name = "pallet-aura"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -5406,7 +5436,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -5422,7 +5452,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -5437,7 +5467,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5461,7 +5491,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5481,7 +5511,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5496,7 +5526,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"beefy-primitives",
"frame-support",
@@ -5512,7 +5542,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"beefy-merkle-tree",
"beefy-primitives",
@@ -5535,7 +5565,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5553,7 +5583,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5598,7 +5628,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5615,7 +5645,7 @@ dependencies = [
[[package]]
name = "pallet-contracts"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"bitflags",
"frame-benchmarking",
@@ -5643,7 +5673,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-primitives"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"bitflags",
"parity-scale-codec",
@@ -5658,7 +5688,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro2",
"quote",
@@ -5668,7 +5698,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"jsonrpsee",
"pallet-contracts-primitives",
@@ -5685,7 +5715,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"pallet-contracts-primitives",
"parity-scale-codec",
@@ -5698,7 +5728,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5714,7 +5744,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5737,7 +5767,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5750,7 +5780,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5768,7 +5798,7 @@ dependencies = [
[[package]]
name = "pallet-gilt"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5783,7 +5813,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5806,7 +5836,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5822,7 +5852,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5842,7 +5872,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5859,7 +5889,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5876,7 +5906,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"ckb-merkle-mountain-range",
"frame-benchmarking",
@@ -5894,7 +5924,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-rpc"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -5909,7 +5939,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5924,7 +5954,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -5941,7 +5971,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5960,7 +5990,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-runtime-api"
version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -5970,7 +6000,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -5987,7 +6017,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6010,7 +6040,7 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6026,7 +6056,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6041,7 +6071,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -6055,7 +6085,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6070,7 +6100,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6086,7 +6116,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -6107,7 +6137,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6123,7 +6153,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -6137,7 +6167,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6160,7 +6190,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -6171,7 +6201,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"log",
"sp-arithmetic",
@@ -6180,7 +6210,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -6209,7 +6239,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6227,7 +6257,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6246,7 +6276,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-support",
"frame-system",
@@ -6262,7 +6292,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -6277,7 +6307,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -6288,7 +6318,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6305,7 +6335,7 @@ dependencies = [
[[package]]
name = "pallet-uniques"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6320,7 +6350,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6336,7 +6366,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6351,7 +6381,7 @@ dependencies = [
[[package]]
name = "pallet-xcm"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-support",
"frame-system",
@@ -6369,7 +6399,7 @@ dependencies = [
[[package]]
name = "pallet-xcm-benchmarks"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6761,6 +6791,7 @@ dependencies = [
"pallet-transaction-payment-rpc-runtime-api",
"pallet-xcm",
"parachain-info",
+ "parachains-common",
"parity-scale-codec",
"polkadot-parachain 0.9.27",
"polkadot-primitives",
@@ -6794,9 +6825,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "pest"
-version = "2.2.1"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8"
+checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4"
dependencies = [
"thiserror",
"ucd-trie",
@@ -6804,9 +6835,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.2.1"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13570633aff33c6d22ce47dd566b10a3b9122c2fe9d8e7501895905be532b91"
+checksum = "905708f7f674518498c1f8d644481440f476d39ca6ecae83319bba7c6c12da91"
dependencies = [
"pest",
"pest_generator",
@@ -6814,9 +6845,9 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.2.1"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c567e5702efdc79fb18859ea74c3eb36e14c43da7b8c1f098a4ed6514ec7a0"
+checksum = "5803d8284a629cc999094ecd630f55e91b561a1d1ba75e233b00ae13b91a69ad"
dependencies = [
"pest",
"pest_meta",
@@ -6827,9 +6858,9 @@ dependencies = [
[[package]]
name = "pest_meta"
-version = "2.2.1"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb32be5ee3bbdafa8c7a18b0a8a8d962b66cfa2ceee4037f49267a50ee821fe"
+checksum = "1538eb784f07615c6d9a8ab061089c6c54a344c5b4301db51990ca1c241e8c04"
dependencies = [
"once_cell",
"pest",
@@ -6848,18 +6879,18 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260"
+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74"
+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
@@ -6898,9 +6929,9 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
[[package]]
name = "plotters"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f"
+checksum = "716b4eeb6c4a1d3ecc956f75b43ec2e8e8ba80026413e70a3f41fd3313d3492b"
dependencies = [
"num-traits",
"plotters-backend",
@@ -6917,9 +6948,9 @@ checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
[[package]]
name = "plotters-svg"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615"
+checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
dependencies = [
"plotters-backend",
]
@@ -6927,7 +6958,7 @@ dependencies = [
[[package]]
name = "polkadot-approval-distribution"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"polkadot-node-network-protocol",
@@ -6942,7 +6973,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"polkadot-node-network-protocol",
@@ -6956,7 +6987,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"derive_more",
"fatality",
@@ -6979,7 +7010,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"fatality",
"futures",
@@ -7000,7 +7031,7 @@ dependencies = [
[[package]]
name = "polkadot-cli"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"clap 3.2.17",
"frame-benchmarking-cli",
@@ -7026,7 +7057,7 @@ dependencies = [
[[package]]
name = "polkadot-client"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"beefy-primitives",
"frame-benchmarking",
@@ -7040,6 +7071,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-runtime",
"polkadot-runtime-common",
+ "rococo-runtime",
"sc-client-api",
"sc-consensus",
"sc-executor",
@@ -7066,7 +7098,7 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"always-assert",
"fatality",
@@ -7087,7 +7119,7 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -7100,7 +7132,7 @@ dependencies = [
[[package]]
name = "polkadot-dispute-distribution"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"derive_more",
"fatality",
@@ -7123,7 +7155,7 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"parity-scale-codec",
"polkadot-node-primitives",
@@ -7137,7 +7169,7 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"futures-timer",
@@ -7157,7 +7189,7 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"always-assert",
"async-trait",
@@ -7181,7 +7213,7 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"parity-scale-codec",
@@ -7199,7 +7231,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bitvec",
"derive_more",
@@ -7228,7 +7260,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bitvec",
"futures",
@@ -7248,7 +7280,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bitvec",
"fatality",
@@ -7267,7 +7299,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"polkadot-node-subsystem",
@@ -7282,7 +7314,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"futures",
@@ -7300,7 +7332,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"polkadot-node-subsystem",
@@ -7315,7 +7347,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-selection"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"futures-timer",
@@ -7332,7 +7364,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-coordinator"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"fatality",
"futures",
@@ -7351,7 +7383,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"futures",
@@ -7368,7 +7400,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bitvec",
"fatality",
@@ -7386,7 +7418,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"always-assert",
"assert_matches",
@@ -7418,7 +7450,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf-checker"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"polkadot-node-primitives",
@@ -7434,7 +7466,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"futures",
"memory-lru",
@@ -7450,7 +7482,7 @@ dependencies = [
[[package]]
name = "polkadot-node-jaeger"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-std",
"lazy_static",
@@ -7468,7 +7500,7 @@ dependencies = [
[[package]]
name = "polkadot-node-metrics"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bs58",
"futures",
@@ -7487,7 +7519,7 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"derive_more",
@@ -7509,7 +7541,7 @@ dependencies = [
[[package]]
name = "polkadot-node-primitives"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bounded-vec",
"futures",
@@ -7531,7 +7563,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -7541,7 +7573,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-test-helpers"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"futures",
@@ -7559,7 +7591,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-types"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"derive_more",
@@ -7582,7 +7614,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-util"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"derive_more",
@@ -7615,7 +7647,7 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"futures",
@@ -7638,7 +7670,7 @@ dependencies = [
[[package]]
name = "polkadot-parachain"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"derive_more",
"frame-support",
@@ -7678,7 +7710,7 @@ dependencies = [
"hex-literal",
"jsonrpsee",
"log",
- "nix",
+ "nix 0.25.0",
"pallet-contracts-rpc",
"pallet-transaction-payment-rpc",
"parachains-common",
@@ -7718,6 +7750,7 @@ dependencies = [
"sp-keystore",
"sp-offchain",
"sp-runtime",
+ "sp-serializer",
"sp-session",
"sp-timestamp",
"sp-transaction-pool",
@@ -7737,7 +7770,7 @@ dependencies = [
[[package]]
name = "polkadot-performance-test"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"env_logger",
"kusama-runtime",
@@ -7752,7 +7785,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bitvec",
"frame-system",
@@ -7782,7 +7815,7 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"beefy-gadget",
"beefy-gadget-rpc",
@@ -7814,7 +7847,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7846,6 +7879,8 @@ dependencies = [
"pallet-indices",
"pallet-membership",
"pallet-multisig",
+ "pallet-nomination-pools",
+ "pallet-nomination-pools-benchmarking",
"pallet-offences",
"pallet-offences-benchmarking",
"pallet-preimage",
@@ -7899,7 +7934,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7946,7 +7981,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-constants"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -7958,7 +7993,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-metrics"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bs58",
"parity-scale-codec",
@@ -7970,7 +8005,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"bitflags",
"bitvec",
@@ -8013,7 +8048,7 @@ dependencies = [
[[package]]
name = "polkadot-service"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"async-trait",
"beefy-gadget",
@@ -8066,6 +8101,7 @@ dependencies = [
"polkadot-runtime-parachains",
"polkadot-statement-distribution",
"rococo-runtime",
+ "rococo-runtime-constants",
"sc-authority-discovery",
"sc-basic-authorship",
"sc-block-builder",
@@ -8116,7 +8152,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"arrayvec 0.5.2",
"fatality",
@@ -8137,7 +8173,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -8147,7 +8183,7 @@ dependencies = [
[[package]]
name = "polkadot-test-client"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"parity-scale-codec",
"polkadot-node-subsystem",
@@ -8172,7 +8208,7 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -8233,7 +8269,7 @@ dependencies = [
[[package]]
name = "polkadot-test-service"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-benchmarking",
"frame-system",
@@ -8286,10 +8322,11 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
dependencies = [
+ "autocfg",
"cfg-if 1.0.0",
"libc",
"log",
@@ -8378,7 +8415,7 @@ dependencies = [
[[package]]
name = "prioritized-metered-channel"
version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"coarsetime",
"crossbeam-queue",
@@ -8816,7 +8853,7 @@ dependencies = [
[[package]]
name = "remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"env_logger",
"jsonrpsee",
@@ -8938,7 +8975,7 @@ dependencies = [
[[package]]
name = "rococo-runtime"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"beefy-merkle-tree",
"beefy-primitives",
@@ -9007,7 +9044,7 @@ dependencies = [
[[package]]
name = "rococo-runtime-constants"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -9018,9 +9055,9 @@ dependencies = [
[[package]]
name = "rpassword"
-version = "5.0.1"
+version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
+checksum = "26b763cb66df1c928432cc35053f8bd4cec3335d8559fc16010017d16b3c1680"
dependencies = [
"libc",
"winapi",
@@ -9037,7 +9074,7 @@ dependencies = [
"log",
"netlink-packet-route",
"netlink-proto",
- "nix",
+ "nix 0.24.2",
"thiserror",
]
@@ -9093,13 +9130,13 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.35.7"
+version = "0.35.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787"
+checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada"
dependencies = [
"bitflags",
"errno",
- "io-lifetimes 0.7.2",
+ "io-lifetimes 0.7.3",
"libc",
"linux-raw-sys 0.0.46",
"windows-sys",
@@ -9191,7 +9228,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"log",
"sp-core",
@@ -9202,7 +9239,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"futures-timer",
@@ -9214,7 +9251,6 @@ dependencies = [
"prost-build",
"rand 0.7.3",
"sc-client-api",
- "sc-network",
"sc-network-common",
"sp-api",
"sp-authority-discovery",
@@ -9229,7 +9265,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"futures-timer",
@@ -9252,7 +9288,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -9268,13 +9304,13 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"impl-trait-for-tuples",
- "memmap2 0.5.6",
+ "memmap2 0.5.7",
"parity-scale-codec",
"sc-chain-spec-derive",
- "sc-network",
+ "sc-network-common",
"sc-telemetry",
"serde",
"serde_json",
@@ -9285,7 +9321,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9296,7 +9332,7 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"chrono",
"clap 3.2.17",
@@ -9335,7 +9371,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"fnv",
"futures",
@@ -9363,7 +9399,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"hash-db",
"kvdb",
@@ -9388,7 +9424,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"futures",
@@ -9412,7 +9448,7 @@ dependencies = [
[[package]]
name = "sc-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"futures",
@@ -9441,7 +9477,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"fork-tree",
@@ -9483,7 +9519,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"jsonrpsee",
@@ -9505,7 +9541,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -9518,7 +9554,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"futures",
@@ -9543,7 +9579,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"lazy_static",
"lru 0.7.8",
@@ -9570,7 +9606,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -9586,7 +9622,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"log",
"parity-scale-codec",
@@ -9601,7 +9637,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -9609,7 +9645,7 @@ dependencies = [
"once_cell",
"parity-scale-codec",
"parity-wasm 0.42.2",
- "rustix 0.35.7",
+ "rustix 0.35.9",
"sc-allocator",
"sc-executor-common",
"sp-runtime-interface",
@@ -9621,7 +9657,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"ahash",
"async-trait",
@@ -9662,7 +9698,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"finality-grandpa",
"futures",
@@ -9683,7 +9719,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"ansi_term",
"futures",
@@ -9700,7 +9736,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"hex",
@@ -9715,7 +9751,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"asynchronous-codec",
@@ -9764,7 +9800,7 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"bitflags",
@@ -9775,6 +9811,7 @@ dependencies = [
"prost-build",
"sc-consensus",
"sc-peerset",
+ "serde",
"smallvec",
"sp-consensus",
"sp-finality-grandpa",
@@ -9785,7 +9822,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"ahash",
"futures",
@@ -9793,8 +9830,8 @@ dependencies = [
"libp2p",
"log",
"lru 0.7.8",
- "sc-network",
"sc-network-common",
+ "sc-peerset",
"sp-runtime",
"substrate-prometheus-endpoint",
"tracing",
@@ -9803,7 +9840,7 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"hex",
@@ -9824,7 +9861,7 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"fork-tree",
"futures",
@@ -9852,7 +9889,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"bytes",
"fnv",
@@ -9861,14 +9898,15 @@ dependencies = [
"hex",
"hyper",
"hyper-rustls",
+ "libp2p",
"num_cpus",
"once_cell",
"parity-scale-codec",
"parking_lot 0.12.1",
"rand 0.7.3",
"sc-client-api",
- "sc-network",
"sc-network-common",
+ "sc-peerset",
"sc-utils",
"sp-api",
"sp-core",
@@ -9881,7 +9919,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"libp2p",
@@ -9894,7 +9932,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9903,7 +9941,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"hash-db",
@@ -9933,7 +9971,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"jsonrpsee",
@@ -9956,7 +9994,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"jsonrpsee",
@@ -9969,7 +10007,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"directories",
@@ -10036,7 +10074,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"log",
"parity-scale-codec",
@@ -10050,7 +10088,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -10069,7 +10107,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"libc",
@@ -10088,7 +10126,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"chrono",
"futures",
@@ -10106,7 +10144,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"ansi_term",
"atty",
@@ -10137,7 +10175,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -10148,7 +10186,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"futures-timer",
@@ -10174,7 +10212,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"log",
@@ -10187,7 +10225,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"futures-timer",
@@ -10308,9 +10346,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.6.1"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
dependencies = [
"bitflags",
"core-foundation",
@@ -10343,6 +10381,7 @@ dependencies = [
"pallet-balances",
"pallet-sudo",
"parachain-info",
+ "parachains-common",
"parity-scale-codec",
"scale-info",
"serde",
@@ -10395,9 +10434,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.143"
+version = "1.0.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
dependencies = [
"serde_derive",
]
@@ -10414,9 +10453,9 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.143"
+version = "1.0.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
dependencies = [
"proc-macro2",
"quote",
@@ -10425,9 +10464,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.83"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
dependencies = [
"itoa 1.0.3",
"ryu",
@@ -10549,6 +10588,7 @@ dependencies = [
"frame-try-runtime",
"log",
"parachain-info",
+ "parachains-common",
"parity-scale-codec",
"scale-info",
"serde",
@@ -10634,7 +10674,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
[[package]]
name = "slot-range-helper"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -10710,7 +10750,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"hash-db",
"log",
@@ -10720,6 +10760,7 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-std",
+ "sp-trie",
"sp-version",
"thiserror",
]
@@ -10727,7 +10768,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"blake2",
"proc-macro-crate",
@@ -10739,7 +10780,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10752,7 +10793,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -10767,7 +10808,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10780,7 +10821,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10792,7 +10833,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10804,7 +10845,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"log",
@@ -10822,7 +10863,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"futures",
@@ -10841,7 +10882,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10859,7 +10900,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"merlin",
@@ -10882,7 +10923,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10896,7 +10937,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10909,14 +10950,14 @@ dependencies = [
[[package]]
name = "sp-core"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"base58",
"bitflags",
"blake2-rfc",
"byteorder",
"dyn-clonable",
- "ed25519-dalek",
+ "ed25519-zebra",
"futures",
"hash-db",
"hash256-std-hasher",
@@ -10955,7 +10996,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"blake2",
"byteorder",
@@ -10969,7 +11010,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro2",
"quote",
@@ -10980,7 +11021,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -10989,7 +11030,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro2",
"quote",
@@ -10999,7 +11040,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -11010,7 +11051,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"finality-grandpa",
"log",
@@ -11028,7 +11069,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -11042,7 +11083,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"bytes",
"futures",
@@ -11068,7 +11109,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"lazy_static",
"sp-core",
@@ -11079,7 +11120,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"futures",
@@ -11096,7 +11137,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"thiserror",
"zstd",
@@ -11105,7 +11146,7 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"log",
"parity-scale-codec",
@@ -11120,7 +11161,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11134,7 +11175,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"sp-api",
"sp-core",
@@ -11144,7 +11185,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"backtrace",
"lazy_static",
@@ -11154,7 +11195,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"rustc-hash",
"serde",
@@ -11164,7 +11205,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"either",
"hash256-std-hasher",
@@ -11186,7 +11227,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -11204,7 +11245,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -11216,7 +11257,7 @@ dependencies = [
[[package]]
name = "sp-sandbox"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"log",
"parity-scale-codec",
@@ -11227,10 +11268,19 @@ dependencies = [
"wasmi",
]
+[[package]]
+name = "sp-serializer"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11244,7 +11294,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11255,7 +11305,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"hash-db",
"log",
@@ -11277,12 +11327,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
[[package]]
name = "sp-storage"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11295,7 +11345,7 @@ dependencies = [
[[package]]
name = "sp-tasks"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"log",
"sp-core",
@@ -11308,7 +11358,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"futures-timer",
@@ -11324,7 +11374,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -11336,7 +11386,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"sp-api",
"sp-runtime",
@@ -11345,7 +11395,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"log",
@@ -11361,15 +11411,22 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
+ "ahash",
"hash-db",
+ "hashbrown 0.12.3",
+ "lazy_static",
+ "lru 0.7.8",
"memory-db",
+ "nohash-hasher",
"parity-scale-codec",
+ "parking_lot 0.12.1",
"scale-info",
"sp-core",
"sp-std",
"thiserror",
+ "tracing",
"trie-db",
"trie-root",
]
@@ -11377,7 +11434,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11394,7 +11451,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -11405,7 +11462,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"impl-trait-for-tuples",
"log",
@@ -11423,9 +11480,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "ss58-registry"
-version = "1.25.0"
+version = "1.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a039906277e0d8db996cd9d1ef19278c10209d994ecfc1025ced16342873a17c"
+checksum = "1c8a1e645fa0bd3e81a90e592a677f7ada3182ac338c4a71cd9ec0ba911f6abb"
dependencies = [
"Inflector",
"num-format",
@@ -11664,7 +11721,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"platforms",
]
@@ -11672,7 +11729,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -11693,7 +11750,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures-util",
"hyper",
@@ -11706,7 +11763,7 @@ dependencies = [
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"jsonrpsee",
"log",
@@ -11727,7 +11784,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"async-trait",
"futures",
@@ -11753,7 +11810,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -11763,7 +11820,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -11774,7 +11831,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"ansi_term",
"build-helper",
@@ -11882,7 +11939,7 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
[[package]]
name = "test-runtime-constants"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -12159,7 +12216,7 @@ dependencies = [
[[package]]
name = "tracing-gum"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"polkadot-node-jaeger",
"polkadot-primitives",
@@ -12170,7 +12227,7 @@ dependencies = [
[[package]]
name = "tracing-gum-proc-macro"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"expander 0.0.6",
"proc-macro-crate",
@@ -12225,9 +12282,9 @@ dependencies = [
[[package]]
name = "trie-db"
-version = "0.23.1"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83"
+checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908"
dependencies = [
"hash-db",
"hashbrown 0.12.3",
@@ -12297,7 +12354,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#055453ebdf00db9e59ef5af0c59c1b4e39267813"
+source = "git+https://github.com/paritytech/substrate?branch=master#40703f41167c718e13b491228efeafb4a6194448"
dependencies = [
"clap 3.2.17",
"jsonrpsee",
@@ -12875,7 +12932,7 @@ dependencies = [
[[package]]
name = "westend-runtime"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -12964,7 +13021,7 @@ dependencies = [
[[package]]
name = "westend-runtime-constants"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -13206,7 +13263,7 @@ dependencies = [
[[package]]
name = "xcm"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"derivative",
"impl-trait-for-tuples",
@@ -13220,7 +13277,7 @@ dependencies = [
[[package]]
name = "xcm-builder"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-support",
"frame-system",
@@ -13240,7 +13297,7 @@ dependencies = [
[[package]]
name = "xcm-executor"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -13258,7 +13315,7 @@ dependencies = [
[[package]]
name = "xcm-procedural"
version = "0.9.27"
-source = "git+https://github.com/paritytech/polkadot?branch=master#93f45f996a3d5592a57eba02f91f2fc2bc5a07cf"
+source = "git+https://github.com/paritytech/polkadot?branch=master#f23b88302570f800234bacc6f92153b9433e3429"
dependencies = [
"Inflector",
"proc-macro2",
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 6745fef473..39e7c33f83 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies "]
edition = "2021"
[dependencies]
-clap = { version = "3.2.16", features = ["derive", "deprecated"] }
+clap = { version = "3.2.17", features = ["derive", "deprecated"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
url = "2.2.2"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index 29d2976a7e..e4c459e48f 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
async-trait = "0.1.57"
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
-futures = "0.3.21"
+futures = "0.3.23"
tracing = "0.1.36"
# Substrate
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 2b93f0d826..bddbf56f4e 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
async-trait = "0.1.57"
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
dyn-clone = "1.0.9"
-futures = "0.3.21"
+futures = "0.3.23"
tracing = "0.1.36"
# Substrate
diff --git a/client/consensus/relay-chain/Cargo.toml b/client/consensus/relay-chain/Cargo.toml
index 5288b14d6a..e9d0dae40f 100644
--- a/client/consensus/relay-chain/Cargo.toml
+++ b/client/consensus/relay-chain/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
async-trait = "0.1.57"
-futures = "0.3.21"
+futures = "0.3.23"
parking_lot = "0.12.1"
tracing = "0.1.36"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index d78969ce95..b4b1704a7d 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
async-trait = "0.1.57"
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
derive_more = "0.99.2"
-futures = "0.3.21"
+futures = "0.3.23"
futures-timer = "3.0.2"
parking_lot = "0.12.1"
tracing = "0.1.36"
diff --git a/client/pov-recovery/Cargo.toml b/client/pov-recovery/Cargo.toml
index f585f572ea..73920c6101 100644
--- a/client/pov-recovery/Cargo.toml
+++ b/client/pov-recovery/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
-futures = "0.3.21"
+futures = "0.3.23"
futures-timer = "3.0.2"
rand = "0.8.5"
tracing = "0.1.36"
diff --git a/client/relay-chain-inprocess-interface/Cargo.toml b/client/relay-chain-inprocess-interface/Cargo.toml
index 28e1f749bf..612b56c0ad 100644
--- a/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/client/relay-chain-inprocess-interface/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
async-trait = "0.1.57"
-futures = "0.3.21"
+futures = "0.3.23"
futures-timer = "3.0.2"
tracing = "0.1.36"
diff --git a/client/relay-chain-interface/Cargo.toml b/client/relay-chain-interface/Cargo.toml
index 5037c91031..49cf0bf380 100644
--- a/client/relay-chain-interface/Cargo.toml
+++ b/client/relay-chain-interface/Cargo.toml
@@ -17,7 +17,7 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "mas
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-futures = "0.3.21"
+futures = "0.3.23"
parking_lot = "0.12.1"
derive_more = "0.99.2"
async-trait = "0.1.57"
diff --git a/client/relay-chain-rpc-interface/Cargo.toml b/client/relay-chain-rpc-interface/Cargo.toml
index acd4485342..34f49a69f8 100644
--- a/client/relay-chain-rpc-interface/Cargo.toml
+++ b/client/relay-chain-rpc-interface/Cargo.toml
@@ -20,7 +20,7 @@ sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master
sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
tokio = { version = "1.19.2", features = ["sync"] }
-futures = "0.3.21"
+futures = "0.3.23"
futures-timer = "3.0.2"
parity-scale-codec = "3.1.5"
parking_lot = "0.12.1"
diff --git a/pallets/aura-ext/Cargo.toml b/pallets/aura-ext/Cargo.toml
index f51e4f6986..30f5214a92 100644
--- a/pallets/aura-ext/Cargo.toml
+++ b/pallets/aura-ext/Cargo.toml
@@ -8,7 +8,7 @@ description = "AURA consensus extension pallet for parachains"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
# Substrate
frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
index b82d11088b..4ed02a07c5 100644
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -17,7 +17,7 @@ log = { version = "0.4.17", default-features = false }
codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.0.0" }
rand = { version = "0.8.5", features = ["std_rng"], default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", default-features = false }
+serde = { version = "1.0.144", default-features = false }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/pallets/parachain-system/Cargo.toml b/pallets/parachain-system/Cargo.toml
index e3e0e965a9..16fdfe1af9 100644
--- a/pallets/parachain-system/Cargo.toml
+++ b/pallets/parachain-system/Cargo.toml
@@ -12,7 +12,7 @@ environmental = { version = "1.1.2", default-features = false }
impl-trait-for-tuples = "0.2.1"
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
# Substrate
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/pallets/parachain-system/src/relay_state_snapshot.rs b/pallets/parachain-system/src/relay_state_snapshot.rs
index 9f69dd9476..5b6a1ad3df 100644
--- a/pallets/parachain-system/src/relay_state_snapshot.rs
+++ b/pallets/parachain-system/src/relay_state_snapshot.rs
@@ -20,7 +20,7 @@ use cumulus_primitives_core::{
};
use scale_info::TypeInfo;
use sp_runtime::traits::HashFor;
-use sp_state_machine::{Backend, TrieBackend};
+use sp_state_machine::{Backend, TrieBackend, TrieBackendBuilder};
use sp_std::vec::Vec;
use sp_trie::{HashDBT, MemoryDB, StorageProof, EMPTY_PREFIX};
@@ -156,7 +156,7 @@ impl RelayChainStateProof {
if !db.contains(&relay_parent_storage_root, EMPTY_PREFIX) {
return Err(Error::RootMismatch)
}
- let trie_backend = TrieBackend::new(db, relay_parent_storage_root);
+ let trie_backend = TrieBackendBuilder::new(db, relay_parent_storage_root).build();
Ok(Self { para_id, trie_backend })
}
diff --git a/pallets/parachain-system/src/validate_block/implementation.rs b/pallets/parachain-system/src/validate_block/implementation.rs
index 9acb76875d..f37622688d 100644
--- a/pallets/parachain-system/src/validate_block/implementation.rs
+++ b/pallets/parachain-system/src/validate_block/implementation.rs
@@ -74,7 +74,7 @@ where
sp_std::mem::drop(storage_proof);
- let backend = sp_state_machine::TrieBackend::new(db, *parent_head.state_root());
+ let backend = sp_state_machine::TrieBackendBuilder::new(db, *parent_head.state_root()).build();
let _guard = (
// Replace storage calls with our own implementations
diff --git a/pallets/xcm/Cargo.toml b/pallets/xcm/Cargo.toml
index aa8ab7f789..6ea825c07f 100644
--- a/pallets/xcm/Cargo.toml
+++ b/pallets/xcm/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", 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" }
diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml
index 60c3feabfb..2dad3ab4e5 100644
--- a/parachain-template/node/Cargo.toml
+++ b/parachain-template/node/Cargo.toml
@@ -10,11 +10,11 @@ edition = "2021"
build = "build.rs"
[dependencies]
-clap = { version = "3.2.16", features = ["derive"] }
+clap = { version = "3.2.17", features = ["derive"] }
derive_more = "0.99.2"
log = "0.4.17"
codec = { package = "parity-scale-codec", version = "3.0.0" }
-serde = { version = "1.0.143", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
hex-literal = "0.3.4"
jsonrpsee = { version = "0.15.1", features = ["server"] }
diff --git a/parachain-template/node/src/chain_spec.rs b/parachain-template/node/src/chain_spec.rs
index afb760685c..b6d018602d 100644
--- a/parachain-template/node/src/chain_spec.rs
+++ b/parachain-template/node/src/chain_spec.rs
@@ -14,7 +14,7 @@ pub type ChainSpec =
const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
/// Helper function to generate a crypto pair from seed
-pub fn get_public_from_seed(seed: &str) -> ::Public {
+pub fn get_from_seed(seed: &str) -> ::Public {
TPublic::Pair::from_string(&format!("//{}", seed), None)
.expect("static values are valid; qed")
.public()
@@ -43,7 +43,7 @@ type AccountPublic = ::Signer;
///
/// This function's return type must always match the session keys of the chain in tuple format.
pub fn get_collator_keys_from_seed(seed: &str) -> AuraId {
- get_public_from_seed::(seed)
+ get_from_seed::(seed)
}
/// Helper function to generate an account ID from seed
@@ -51,7 +51,7 @@ pub fn get_account_id_from_seed(seed: &str) -> AccountId
where
AccountPublic: From<::Public>,
{
- AccountPublic::from(get_public_from_seed::(seed)).into_account()
+ AccountPublic::from(get_from_seed::(seed)).into_account()
}
/// Generate the session keys from individual elements.
diff --git a/parachain-template/node/src/command.rs b/parachain-template/node/src/command.rs
index 5dc04bbb54..735af3e42a 100644
--- a/parachain-template/node/src/command.rs
+++ b/parachain-template/node/src/command.rs
@@ -399,8 +399,8 @@ impl CliConfiguration for RelayChainCli {
self.base.base.transaction_pool(is_dev)
}
- fn state_cache_child_ratio(&self) -> Result> {
- self.base.base.state_cache_child_ratio()
+ fn trie_cache_maximum_size(&self) -> Result> {
+ self.base.base.trie_cache_maximum_size()
}
fn rpc_methods(&self) -> Result {
diff --git a/parachain-template/runtime/Cargo.toml b/parachain-template/runtime/Cargo.toml
index 791c32f704..12d25abbe1 100644
--- a/parachain-template/runtime/Cargo.toml
+++ b/parachain-template/runtime/Cargo.toml
@@ -19,7 +19,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = { version = "0.3.4", optional = true }
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
smallvec = "1.9.0"
# Local
diff --git a/parachain-template/runtime/src/lib.rs b/parachain-template/runtime/src/lib.rs
index 1764214918..bbd720633a 100644
--- a/parachain-template/runtime/src/lib.rs
+++ b/parachain-template/runtime/src/lib.rs
@@ -614,6 +614,23 @@ impl_runtime_apis! {
}
}
+ impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi
+ for Runtime
+ {
+ fn query_call_info(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::RuntimeDispatchInfo {
+ TransactionPayment::query_call_info(call, len)
+ }
+ fn query_call_fee_details(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::FeeDetails {
+ TransactionPayment::query_call_fee_details(call, len)
+ }
+ }
+
impl cumulus_primitives_core::CollectCollationInfo for Runtime {
fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info(header)
diff --git a/parachains/pallets/parachain-info/Cargo.toml b/parachains/pallets/parachain-info/Cargo.toml
index b1b15f5a14..3544ba4f79 100644
--- a/parachains/pallets/parachain-info/Cargo.toml
+++ b/parachains/pallets/parachain-info/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", 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" }
diff --git a/parachains/pallets/ping/Cargo.toml b/parachains/pallets/ping/Cargo.toml
index c3ad055c60..4e97fcb6b8 100644
--- a/parachains/pallets/ping/Cargo.toml
+++ b/parachains/pallets/ping/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", 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" }
diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml
index a73e694dcb..78f540c279 100644
--- a/parachains/runtimes/assets/statemine/Cargo.toml
+++ b/parachains/runtimes/assets/statemine/Cargo.toml
@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = { version = "0.3.4", optional = true }
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
smallvec = "1.9.0"
# Substrate
diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs
index 7f7a6a859d..57b7c7eee2 100644
--- a/parachains/runtimes/assets/statemine/src/lib.rs
+++ b/parachains/runtimes/assets/statemine/src/lib.rs
@@ -743,6 +743,23 @@ impl_runtime_apis! {
}
}
+ impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi
+ for Runtime
+ {
+ fn query_call_info(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::RuntimeDispatchInfo {
+ TransactionPayment::query_call_info(call, len)
+ }
+ fn query_call_fee_details(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::FeeDetails {
+ TransactionPayment::query_call_fee_details(call, len)
+ }
+ }
+
impl cumulus_primitives_core::CollectCollationInfo for Runtime {
fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info(header)
diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs
index a49c1795c2..ea3943cc73 100644
--- a/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs
+++ b/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs
@@ -214,13 +214,6 @@ impl pallet_uniques::WeightInfo for WeightInfo {
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- // Done by hand to satisfy master branch
- // This will be regenerated for the next release
- fn try_increment_id() -> Weight {
- (20_000_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
// Storage: Uniques Class (r:1 w:0)
// Storage: Uniques ClassMetadataOf (r:1 w:1)
fn clear_collection_metadata() -> Weight {
diff --git a/parachains/runtimes/assets/statemint/Cargo.toml b/parachains/runtimes/assets/statemint/Cargo.toml
index 48c465fde7..c1f469a4f9 100644
--- a/parachains/runtimes/assets/statemint/Cargo.toml
+++ b/parachains/runtimes/assets/statemint/Cargo.toml
@@ -9,7 +9,7 @@ description = "Statemint parachain runtime"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
hex-literal = { version = "0.3.4", optional = true }
log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
smallvec = "1.9.0"
diff --git a/parachains/runtimes/assets/statemint/src/lib.rs b/parachains/runtimes/assets/statemint/src/lib.rs
index 792dd5026c..69a05f97e1 100644
--- a/parachains/runtimes/assets/statemint/src/lib.rs
+++ b/parachains/runtimes/assets/statemint/src/lib.rs
@@ -772,6 +772,23 @@ impl_runtime_apis! {
}
}
+ impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi
+ for Runtime
+ {
+ fn query_call_info(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::RuntimeDispatchInfo {
+ TransactionPayment::query_call_info(call, len)
+ }
+ fn query_call_fee_details(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::FeeDetails {
+ TransactionPayment::query_call_fee_details(call, len)
+ }
+ }
+
impl cumulus_primitives_core::CollectCollationInfo for Runtime {
fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info(header)
diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs
index c421cf9ba3..ed9e2b98f8 100644
--- a/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs
+++ b/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs
@@ -214,13 +214,6 @@ impl pallet_uniques::WeightInfo for WeightInfo {
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- // Done by hand to satisfy master branch
- // This will be regenerated for the next release
- fn try_increment_id() -> Weight {
- (20_000_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
// Storage: Uniques Class (r:1 w:0)
// Storage: Uniques ClassMetadataOf (r:1 w:1)
fn clear_collection_metadata() -> Weight {
diff --git a/parachains/runtimes/assets/westmint/Cargo.toml b/parachains/runtimes/assets/westmint/Cargo.toml
index e9b6091a3c..477e414d95 100644
--- a/parachains/runtimes/assets/westmint/Cargo.toml
+++ b/parachains/runtimes/assets/westmint/Cargo.toml
@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = { version = "0.3.4", optional = true }
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
smallvec = "1.9.0"
# Substrate
diff --git a/parachains/runtimes/assets/westmint/src/lib.rs b/parachains/runtimes/assets/westmint/src/lib.rs
index 097dc3e25b..8a7953a6a3 100644
--- a/parachains/runtimes/assets/westmint/src/lib.rs
+++ b/parachains/runtimes/assets/westmint/src/lib.rs
@@ -733,6 +733,23 @@ impl_runtime_apis! {
}
}
+ impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi
+ for Runtime
+ {
+ fn query_call_info(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::RuntimeDispatchInfo {
+ TransactionPayment::query_call_info(call, len)
+ }
+ fn query_call_fee_details(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::FeeDetails {
+ TransactionPayment::query_call_fee_details(call, len)
+ }
+ }
+
impl cumulus_primitives_core::CollectCollationInfo for Runtime {
fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info(header)
diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs
index 66c0587c12..fd90132bf0 100644
--- a/parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs
+++ b/parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs
@@ -214,13 +214,6 @@ impl pallet_uniques::WeightInfo for WeightInfo {
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- // Done by hand to satisfy master branch
- // This will be regenerated for the next release
- fn try_increment_id() -> Weight {
- (20_000_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
- }
// Storage: Uniques Class (r:1 w:0)
// Storage: Uniques ClassMetadataOf (r:1 w:1)
fn clear_collection_metadata() -> Weight {
diff --git a/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml b/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
index 96db205d2e..f8d7453c96 100644
--- a/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
+++ b/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
@@ -9,7 +9,7 @@ description = "Polkadot Collectives Parachain Runtime"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
hex-literal = { version = "0.3.4", optional = true }
log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
smallvec = "1.6.1"
diff --git a/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
index 1a90e6128b..513d31f331 100644
--- a/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
+++ b/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
@@ -15,7 +15,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = { version = "0.3.4", optional = true }
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
smallvec = "1.9.0"
# Substrate
diff --git a/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
index 7483fb780f..7b9ae48d50 100644
--- a/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
+++ b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
@@ -477,6 +477,23 @@ impl_runtime_apis! {
}
}
+ impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi
+ for Runtime
+ {
+ fn query_call_info(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::RuntimeDispatchInfo {
+ TransactionPayment::query_call_info(call, len)
+ }
+ fn query_call_fee_details(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::FeeDetails {
+ TransactionPayment::query_call_fee_details(call, len)
+ }
+ }
+
impl cumulus_primitives_core::CollectCollationInfo for Runtime {
fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info(header)
diff --git a/parachains/runtimes/starters/seedling/Cargo.toml b/parachains/runtimes/starters/seedling/Cargo.toml
index 159211cf3b..430ef29a1f 100644
--- a/parachains/runtimes/starters/seedling/Cargo.toml
+++ b/parachains/runtimes/starters/seedling/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.14", default-features = false }
scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
# Substrate
frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -32,6 +32,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
cumulus-pallet-solo-to-para = { path = "../../../../pallets/solo-to-para", default-features = false }
parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachains-common = { path = "../../../common", default-features = false }
cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
[build-dependencies]
@@ -64,4 +65,5 @@ std = [
"cumulus-pallet-solo-to-para/std",
"cumulus-primitives-core/std",
"parachain-info/std",
+ "parachains-common/std",
]
diff --git a/parachains/runtimes/starters/seedling/src/lib.rs b/parachains/runtimes/starters/seedling/src/lib.rs
index 850f6bab34..3ba5fb8f75 100644
--- a/parachains/runtimes/starters/seedling/src/lib.rs
+++ b/parachains/runtimes/starters/seedling/src/lib.rs
@@ -52,6 +52,7 @@ pub use frame_support::{
StorageValue,
};
use frame_system::limits::{BlockLength, BlockWeights};
+use parachains_common::{AccountId, Signature};
#[cfg(any(feature = "std", test))]
pub use sp_runtime::BuildStorage;
pub use sp_runtime::{Perbill, Permill};
@@ -189,11 +190,6 @@ construct_runtime! {
}
}
-/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = sp_runtime::MultiSignature;
-/// Some way of identifying an account on the chain. We intentionally make it equivalent
-/// to the public key of our transaction signing scheme.
-pub type AccountId = <::Signer as sp_runtime::traits::IdentifyAccount>::AccountId;
/// Index of a transaction in the chain.
pub type Index = u32;
/// A hash of some data used by the chain.
diff --git a/parachains/runtimes/starters/shell/Cargo.toml b/parachains/runtimes/starters/shell/Cargo.toml
index 8210d567b2..6a351cb5c2 100644
--- a/parachains/runtimes/starters/shell/Cargo.toml
+++ b/parachains/runtimes/starters/shell/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
# Substrate
frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -39,6 +39,7 @@ cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = fals
cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachains-common = { path = "../../../common", default-features = false }
[build-dependencies]
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -73,6 +74,7 @@ std = [
"cumulus-primitives-core/std",
"cumulus-primitives-utility/std",
"parachain-info/std",
+ "parachains-common/std",
]
try-runtime = [
"frame-executive/try-runtime",
diff --git a/parachains/runtimes/starters/shell/src/lib.rs b/parachains/runtimes/starters/shell/src/lib.rs
index d08cebe47e..05570ed83d 100644
--- a/parachains/runtimes/starters/shell/src/lib.rs
+++ b/parachains/runtimes/starters/shell/src/lib.rs
@@ -59,6 +59,7 @@ pub use frame_support::{
StorageValue,
};
use frame_system::limits::{BlockLength, BlockWeights};
+use parachains_common::{AccountId, Signature};
#[cfg(any(feature = "std", test))]
pub use sp_runtime::BuildStorage;
pub use sp_runtime::{Perbill, Permill};
@@ -228,11 +229,6 @@ impl sp_runtime::traits::SignedExtension for DisallowSigned {
}
}
-/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = sp_runtime::MultiSignature;
-/// Some way of identifying an account on the chain. We intentionally make it equivalent
-/// to the public key of our transaction signing scheme.
-pub type AccountId = <::Signer as sp_runtime::traits::IdentifyAccount>::AccountId;
/// Index of a transaction in the chain.
pub type Index = u32;
/// A hash of some data used by the chain.
diff --git a/parachains/runtimes/testing/penpal/Cargo.toml b/parachains/runtimes/testing/penpal/Cargo.toml
index 81d582a4a2..168de41700 100644
--- a/parachains/runtimes/testing/penpal/Cargo.toml
+++ b/parachains/runtimes/testing/penpal/Cargo.toml
@@ -19,7 +19,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
hex-literal = { version = "0.3.4", optional = true }
log = { version = "0.4.16", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
smallvec = "1.9.0"
# Substrate
@@ -74,6 +74,7 @@ cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", defa
cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
parachain-info = { path = "../../../../parachains/pallets/parachain-info", default-features = false }
+parachains-common = { path = "../../../common", default-features = false }
[features]
default = [
diff --git a/parachains/runtimes/testing/penpal/src/lib.rs b/parachains/runtimes/testing/penpal/src/lib.rs
index faf12f783f..f0f2cb2a76 100644
--- a/parachains/runtimes/testing/penpal/src/lib.rs
+++ b/parachains/runtimes/testing/penpal/src/lib.rs
@@ -50,9 +50,9 @@ pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
- traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify},
+ traits::{AccountIdLookup, BlakeTwo256, Block as BlockT},
transaction_validity::{TransactionSource, TransactionValidity},
- ApplyExtrinsicResult, MultiSignature,
+ ApplyExtrinsicResult,
};
pub use sp_runtime::{traits::ConvertInto, MultiAddress, Perbill, Permill};
use sp_std::prelude::*;
@@ -70,16 +70,10 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
// XCM Imports
+use parachains_common::{AccountId, Signature};
use xcm::latest::prelude::BodyId;
use xcm_executor::XcmExecutor;
-/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = MultiSignature;
-
-/// Some way of identifying an account on the chain. We intentionally make it equivalent
-/// to the public key of our transaction signing scheme.
-pub type AccountId = <::Signer as IdentifyAccount>::AccountId;
-
/// Balance of an account.
pub type Balance = u128;
@@ -674,6 +668,23 @@ impl_runtime_apis! {
}
}
+ impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi
+ for Runtime
+ {
+ fn query_call_info(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::RuntimeDispatchInfo {
+ TransactionPayment::query_call_info(call, len)
+ }
+ fn query_call_fee_details(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::FeeDetails {
+ TransactionPayment::query_call_fee_details(call, len)
+ }
+ }
+
impl cumulus_primitives_core::CollectCollationInfo for Runtime {
fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info(header)
diff --git a/parachains/runtimes/testing/rococo-parachain/Cargo.toml b/parachains/runtimes/testing/rococo-parachain/Cargo.toml
index 40a506b023..2904940f34 100644
--- a/parachains/runtimes/testing/rococo-parachain/Cargo.toml
+++ b/parachains/runtimes/testing/rococo-parachain/Cargo.toml
@@ -9,7 +9,7 @@ description = "Simple runtime used by the rococo parachain(s)"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
# Substrate
frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/parachains/runtimes/testing/rococo-parachain/src/lib.rs
index 902120e2d3..4b00ff86c4 100644
--- a/parachains/runtimes/testing/rococo-parachain/src/lib.rs
+++ b/parachains/runtimes/testing/rococo-parachain/src/lib.rs
@@ -60,7 +60,7 @@ pub use sp_runtime::{Perbill, Permill};
use parachains_common::{
impls::{AssetsFrom, NonZeroIssuance},
- AssetId,
+ AccountId, AssetId, Signature,
};
use xcm_builder::{
AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, ConvertedConcreteId,
@@ -558,11 +558,6 @@ construct_runtime! {
}
}
-/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = sp_runtime::MultiSignature;
-/// Some way of identifying an account on the chain. We intentionally make it equivalent
-/// to the public key of our transaction signing scheme.
-pub type AccountId = <::Signer as sp_runtime::traits::IdentifyAccount>::AccountId;
/// Balance of an account.
pub type Balance = u128;
/// Index of a transaction in the chain.
@@ -717,6 +712,23 @@ impl_runtime_apis! {
}
}
+ impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi
+ for Runtime
+ {
+ fn query_call_info(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::RuntimeDispatchInfo {
+ TransactionPayment::query_call_info(call, len)
+ }
+ fn query_call_fee_details(
+ call: Call,
+ len: u32,
+ ) -> pallet_transaction_payment::FeeDetails {
+ TransactionPayment::query_call_fee_details(call, len)
+ }
+ }
+
impl cumulus_primitives_core::CollectCollationInfo for Runtime {
fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo {
ParachainSystem::collect_collation_info(header)
diff --git a/polkadot-parachain/Cargo.toml b/polkadot-parachain/Cargo.toml
index 42413b9f38..9822b10224 100644
--- a/polkadot-parachain/Cargo.toml
+++ b/polkadot-parachain/Cargo.toml
@@ -8,12 +8,12 @@ description = "Runs a polkadot parachain node which could be a collator."
[dependencies]
async-trait = "0.1.57"
-clap = { version = "3.2.16", features = ["derive", "deprecated"] }
+clap = { version = "3.2.17", features = ["derive", "deprecated"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
-futures = "0.3.21"
+futures = "0.3.23"
hex-literal = "0.3.4"
log = "0.4.17"
-serde = { version = "1.0.143", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
# Local
rococo-parachain-runtime = { path = "../parachains/runtimes/testing/rococo-parachain" }
@@ -59,6 +59,7 @@ sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "maste
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -91,10 +92,12 @@ substrate-build-script-utils = { git = "https://github.com/paritytech/substrate"
[dev-dependencies]
assert_cmd = "2.0"
-nix = "0.24"
+nix = "0.25"
tempfile = "3.3.0"
tokio = { version = "1.19.2", features = ["macros", "time", "parking_lot"] }
wait-timeout = "0.2"
+# purge_chain_works works with rococo-local and needs to allow this
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master", features = ["rococo-native"] }
[features]
default = []
diff --git a/polkadot-parachain/src/chain_spec/collectives.rs b/polkadot-parachain/src/chain_spec/collectives.rs
index f5737faf34..fcbc341d1d 100644
--- a/polkadot-parachain/src/chain_spec/collectives.rs
+++ b/polkadot-parachain/src/chain_spec/collectives.rs
@@ -18,8 +18,7 @@ use crate::chain_spec::{
get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
};
use cumulus_primitives_core::ParaId;
-use parachains_common::Balance as CollectivesBalance;
-use rococo_parachain_runtime::{AccountId, AuraId};
+use parachains_common::{AccountId, AuraId, Balance as CollectivesBalance};
use sc_service::ChainType;
use sp_core::sr25519;
diff --git a/polkadot-parachain/src/chain_spec/contracts.rs b/polkadot-parachain/src/chain_spec/contracts.rs
index de42636382..d7d2e9ea99 100644
--- a/polkadot-parachain/src/chain_spec/contracts.rs
+++ b/polkadot-parachain/src/chain_spec/contracts.rs
@@ -19,7 +19,7 @@ use crate::chain_spec::{
};
use cumulus_primitives_core::ParaId;
use hex_literal::hex;
-use rococo_parachain_runtime::{AccountId, AuraId};
+use parachains_common::{AccountId, AuraId};
use sc_service::ChainType;
use sp_core::{crypto::UncheckedInto, sr25519};
diff --git a/polkadot-parachain/src/chain_spec/mod.rs b/polkadot-parachain/src/chain_spec/mod.rs
index 4566861a64..30cff43b57 100644
--- a/polkadot-parachain/src/chain_spec/mod.rs
+++ b/polkadot-parachain/src/chain_spec/mod.rs
@@ -14,37 +14,24 @@
// You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see .
-use cumulus_primitives_core::ParaId;
-use hex_literal::hex;
-use rococo_parachain_runtime::{AccountId, AuraId, Signature};
+use parachains_common::{AccountId, Signature};
use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
-use sc_service::ChainType;
use serde::{Deserialize, Serialize};
-use sp_core::{crypto::UncheckedInto, sr25519, Pair, Public};
+use sp_core::{Pair, Public};
use sp_runtime::traits::{IdentifyAccount, Verify};
pub mod collectives;
pub mod contracts;
pub mod penpal;
+pub mod rococo_parachain;
pub mod seedling;
pub mod shell;
pub mod statemint;
-/// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec =
- sc_service::GenericChainSpec;
-
/// The default XCM version to set in genesis config.
const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
-/// Helper function to generate a crypto pair from seed
-pub fn get_from_seed(seed: &str) -> ::Public {
- TPublic::Pair::from_string(&format!("//{}", seed), None)
- .expect("static values are valid; qed")
- .public()
-}
-
-/// The extensions for the [`ChainSpec`].
+/// Generic extensions for Parachain ChainSpecs.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)]
#[serde(deny_unknown_fields)]
pub struct Extensions {
@@ -61,6 +48,13 @@ impl Extensions {
}
}
+/// Helper function to generate a crypto pair from seed
+pub fn get_from_seed(seed: &str) -> ::Public {
+ TPublic::Pair::from_string(&format!("//{}", seed), None)
+ .expect("static values are valid; qed")
+ .public()
+}
+
type AccountPublic = ::Signer;
/// Helper function to generate an account ID from seed
@@ -71,108 +65,9 @@ where
AccountPublic::from(get_from_seed::(seed)).into_account()
}
-pub fn get_chain_spec() -> ChainSpec {
- ChainSpec::from_genesis(
- "Local Testnet",
- "local_testnet",
- ChainType::Local,
- move || {
- testnet_genesis(
- get_account_id_from_seed::("Alice"),
- vec![get_from_seed::("Alice"), get_from_seed::("Bob")],
- vec![
- get_account_id_from_seed::("Alice"),
- get_account_id_from_seed::("Bob"),
- get_account_id_from_seed::("Charlie"),
- get_account_id_from_seed::("Dave"),
- get_account_id_from_seed::("Eve"),
- get_account_id_from_seed::("Ferdie"),
- get_account_id_from_seed::("Alice//stash"),
- get_account_id_from_seed::("Bob//stash"),
- get_account_id_from_seed::("Charlie//stash"),
- get_account_id_from_seed::("Dave//stash"),
- get_account_id_from_seed::("Eve//stash"),
- get_account_id_from_seed::("Ferdie//stash"),
- ],
- 1000.into(),
- )
- },
- Vec::new(),
- None,
- None,
- None,
- None,
- Extensions { relay_chain: "westend".into(), para_id: 1000 },
- )
-}
-
-pub fn staging_test_net() -> ChainSpec {
- ChainSpec::from_genesis(
- "Staging Testnet",
- "staging_testnet",
- ChainType::Live,
- move || {
- testnet_genesis(
- hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into(),
- vec![
- // $secret//one
- hex!["aad9fa2249f87a210a0f93400b7f90e47b810c6d65caa0ca3f5af982904c2a33"]
- .unchecked_into(),
- // $secret//two
- hex!["d47753f0cca9dd8da00c70e82ec4fc5501a69c49a5952a643d18802837c88212"]
- .unchecked_into(),
- ],
- vec![
- hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into()
- ],
- 1000.into(),
- )
- },
- Vec::new(),
- None,
- None,
- None,
- None,
- Extensions { relay_chain: "westend".into(), para_id: 1000 },
- )
-}
-
-fn testnet_genesis(
- root_key: AccountId,
- initial_authorities: Vec,
- endowed_accounts: Vec,
- id: ParaId,
-) -> rococo_parachain_runtime::GenesisConfig {
- rococo_parachain_runtime::GenesisConfig {
- system: rococo_parachain_runtime::SystemConfig {
- code: rococo_parachain_runtime::WASM_BINARY
- .expect("WASM binary was not build, please build it!")
- .to_vec(),
- },
- balances: rococo_parachain_runtime::BalancesConfig {
- balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
- },
- sudo: rococo_parachain_runtime::SudoConfig { key: Some(root_key) },
- parachain_info: rococo_parachain_runtime::ParachainInfoConfig { parachain_id: id },
- aura: rococo_parachain_runtime::AuraConfig { authorities: initial_authorities },
- aura_ext: Default::default(),
- parachain_system: Default::default(),
- polkadot_xcm: rococo_parachain_runtime::PolkadotXcmConfig {
- safe_xcm_version: Some(SAFE_XCM_VERSION),
- },
- }
-}
-
-/// Helper function to generate a crypto pair from seed
-pub fn get_public_from_seed(seed: &str) -> ::Public {
- TPublic::Pair::from_string(&format!("//{}", seed), None)
- .expect("static values are valid; qed")
- .public()
-}
-
/// Generate collator keys from seed.
///
/// This function's return type must always match the session keys of the chain in tuple format.
pub fn get_collator_keys_from_seed(seed: &str) -> ::Public {
- get_public_from_seed::(seed)
+ get_from_seed::(seed)
}
diff --git a/polkadot-parachain/src/chain_spec/penpal.rs b/polkadot-parachain/src/chain_spec/penpal.rs
index fb127e5168..bb40bbbf37 100644
--- a/polkadot-parachain/src/chain_spec/penpal.rs
+++ b/polkadot-parachain/src/chain_spec/penpal.rs
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see .
-use crate::chain_spec::{get_account_id_from_seed, Extensions};
+use crate::chain_spec::{
+ get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
+};
use cumulus_primitives_core::ParaId;
-// use rococo_parachain_runtime::{AuraId};
-use crate::chain_spec::{get_collator_keys_from_seed, SAFE_XCM_VERSION};
+use parachains_common::{AccountId, AuraId};
use sc_service::ChainType;
use sp_core::sr25519;
/// Specialized `ChainSpec` for the normal parachain runtime.
@@ -42,11 +43,11 @@ pub fn get_penpal_chain_spec(id: ParaId, relay_chain: &str) -> PenpalChainSpec {
vec![
(
get_account_id_from_seed::("Alice"),
- get_collator_keys_from_seed::("Alice"),
+ get_collator_keys_from_seed::("Alice"),
),
(
get_account_id_from_seed::("Bob"),
- get_collator_keys_from_seed::("Bob"),
+ get_collator_keys_from_seed::("Bob"),
),
],
vec![
@@ -79,8 +80,8 @@ pub fn get_penpal_chain_spec(id: ParaId, relay_chain: &str) -> PenpalChainSpec {
}
fn penpal_testnet_genesis(
- invulnerables: Vec<(penpal_runtime::AccountId, penpal_runtime::AuraId)>,
- endowed_accounts: Vec,
+ invulnerables: Vec<(AccountId, AuraId)>,
+ endowed_accounts: Vec,
id: ParaId,
) -> penpal_runtime::GenesisConfig {
penpal_runtime::GenesisConfig {
@@ -131,6 +132,6 @@ fn penpal_testnet_genesis(
/// Generate the session keys from individual elements.
///
/// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn penpal_session_keys(keys: penpal_runtime::AuraId) -> penpal_runtime::SessionKeys {
+pub fn penpal_session_keys(keys: AuraId) -> penpal_runtime::SessionKeys {
penpal_runtime::SessionKeys { aura: keys }
}
diff --git a/polkadot-parachain/src/chain_spec/rococo_parachain.rs b/polkadot-parachain/src/chain_spec/rococo_parachain.rs
new file mode 100644
index 0000000000..7aa0aeaac3
--- /dev/null
+++ b/polkadot-parachain/src/chain_spec/rococo_parachain.rs
@@ -0,0 +1,121 @@
+// Copyright 2022 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 .
+
+//! ChainSpecs dedicated to Rococo parachain setups (for testing and example purposes)
+
+use crate::chain_spec::{get_from_seed, Extensions, SAFE_XCM_VERSION};
+use cumulus_primitives_core::ParaId;
+use hex_literal::hex;
+use parachains_common::AccountId;
+use polkadot_service::chain_spec::get_account_id_from_seed;
+use rococo_parachain_runtime::AuraId;
+use sc_chain_spec::ChainType;
+use sp_core::{crypto::UncheckedInto, sr25519};
+
+pub type RococoParachainChainSpec =
+ sc_service::GenericChainSpec;
+
+pub fn rococo_parachain_local_config() -> RococoParachainChainSpec {
+ RococoParachainChainSpec::from_genesis(
+ "Rococo Parachain Local",
+ "local_testnet",
+ ChainType::Local,
+ move || {
+ testnet_genesis(
+ get_account_id_from_seed::("Alice"),
+ vec![get_from_seed::("Alice"), get_from_seed::("Bob")],
+ vec![
+ get_account_id_from_seed::("Alice"),
+ get_account_id_from_seed::("Bob"),
+ get_account_id_from_seed::("Charlie"),
+ get_account_id_from_seed::("Dave"),
+ get_account_id_from_seed::("Eve"),
+ get_account_id_from_seed::("Ferdie"),
+ get_account_id_from_seed::("Alice//stash"),
+ get_account_id_from_seed::("Bob//stash"),
+ get_account_id_from_seed::("Charlie//stash"),
+ get_account_id_from_seed::("Dave//stash"),
+ get_account_id_from_seed::("Eve//stash"),
+ get_account_id_from_seed::("Ferdie//stash"),
+ ],
+ 1000.into(),
+ )
+ },
+ Vec::new(),
+ None,
+ None,
+ None,
+ None,
+ Extensions { relay_chain: "rococo-local".into(), para_id: 1000 },
+ )
+}
+
+pub fn staging_rococo_parachain_local_config() -> RococoParachainChainSpec {
+ RococoParachainChainSpec::from_genesis(
+ "Staging Rococo Parachain Local",
+ "staging_testnet",
+ ChainType::Live,
+ move || {
+ testnet_genesis(
+ hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into(),
+ vec![
+ // $secret//one
+ hex!["aad9fa2249f87a210a0f93400b7f90e47b810c6d65caa0ca3f5af982904c2a33"]
+ .unchecked_into(),
+ // $secret//two
+ hex!["d47753f0cca9dd8da00c70e82ec4fc5501a69c49a5952a643d18802837c88212"]
+ .unchecked_into(),
+ ],
+ vec![
+ hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into()
+ ],
+ 1000.into(),
+ )
+ },
+ Vec::new(),
+ None,
+ None,
+ None,
+ None,
+ Extensions { relay_chain: "rococo-local".into(), para_id: 1000 },
+ )
+}
+
+pub(crate) fn testnet_genesis(
+ root_key: AccountId,
+ initial_authorities: Vec,
+ endowed_accounts: Vec,
+ id: ParaId,
+) -> rococo_parachain_runtime::GenesisConfig {
+ rococo_parachain_runtime::GenesisConfig {
+ system: rococo_parachain_runtime::SystemConfig {
+ code: rococo_parachain_runtime::WASM_BINARY
+ .expect("WASM binary was not build, please build it!")
+ .to_vec(),
+ },
+ balances: rococo_parachain_runtime::BalancesConfig {
+ balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
+ },
+ sudo: rococo_parachain_runtime::SudoConfig { key: Some(root_key) },
+ parachain_info: rococo_parachain_runtime::ParachainInfoConfig { parachain_id: id },
+ aura: rococo_parachain_runtime::AuraConfig { authorities: initial_authorities },
+ aura_ext: Default::default(),
+ parachain_system: Default::default(),
+ polkadot_xcm: rococo_parachain_runtime::PolkadotXcmConfig {
+ safe_xcm_version: Some(SAFE_XCM_VERSION),
+ },
+ }
+}
diff --git a/polkadot-parachain/src/chain_spec/seedling.rs b/polkadot-parachain/src/chain_spec/seedling.rs
index 75166a1b8f..2035c813bb 100644
--- a/polkadot-parachain/src/chain_spec/seedling.rs
+++ b/polkadot-parachain/src/chain_spec/seedling.rs
@@ -16,7 +16,7 @@
use crate::chain_spec::{get_account_id_from_seed, Extensions};
use cumulus_primitives_core::ParaId;
-use rococo_parachain_runtime::AccountId;
+use parachains_common::AccountId;
use sc_service::ChainType;
use sp_core::sr25519;
diff --git a/polkadot-parachain/src/chain_spec/statemint.rs b/polkadot-parachain/src/chain_spec/statemint.rs
index 800b7af8b9..e12a5d12e1 100644
--- a/polkadot-parachain/src/chain_spec/statemint.rs
+++ b/polkadot-parachain/src/chain_spec/statemint.rs
@@ -19,8 +19,7 @@ use crate::chain_spec::{
};
use cumulus_primitives_core::ParaId;
use hex_literal::hex;
-use parachains_common::{Balance as StatemintBalance, StatemintAuraId};
-use rococo_parachain_runtime::{AccountId, AuraId};
+use parachains_common::{AccountId, AuraId, Balance as StatemintBalance, StatemintAuraId};
use sc_service::ChainType;
use sp_core::{crypto::UncheckedInto, sr25519};
diff --git a/polkadot-parachain/src/command.rs b/polkadot-parachain/src/command.rs
index c7e96d3ebf..18050c037b 100644
--- a/polkadot-parachain/src/command.rs
+++ b/polkadot-parachain/src/command.rs
@@ -38,12 +38,15 @@ use sc_service::{
};
use sp_core::hexdisplay::HexDisplay;
use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
-use std::net::SocketAddr;
+use std::{net::SocketAddr, path::PathBuf};
-#[derive(Debug)]
+/// Helper enum that is used for better distinction of different parachain/runtime configuration
+/// (it is based/calculated on ChainSpec's ID attribute)
+#[derive(Debug, PartialEq, Default)]
enum Runtime {
- /// This is the default runtime (based on rococo)
- Generic,
+ /// This is the default runtime (actually based on rococo)
+ #[default]
+ Default,
Shell,
Seedling,
Statemint,
@@ -55,22 +58,30 @@ enum Runtime {
CollectivesWestend,
}
-trait ChainType {
+trait RuntimeResolver {
fn runtime(&self) -> Runtime;
}
-impl ChainType for dyn ChainSpec {
+impl RuntimeResolver for dyn ChainSpec {
fn runtime(&self) -> Runtime {
runtime(self.id())
}
}
-use sc_chain_spec::GenericChainSpec;
-impl ChainType
- for GenericChainSpec
-{
+/// Implementation, that can resolve [`Runtime`] from any json configuration file
+impl RuntimeResolver for PathBuf {
fn runtime(&self) -> Runtime {
- runtime(self.id())
+ #[derive(Debug, serde::Deserialize)]
+ struct EmptyChainSpecWithId {
+ id: String,
+ }
+
+ let file = std::fs::File::open(self).expect("Failed to open file");
+ let reader = std::io::BufReader::new(file);
+ let chain_spec: EmptyChainSpecWithId = sp_serializer::from_reader(reader)
+ .expect("Failed to read 'json' file with ChainSpec configuration");
+
+ runtime(&chain_spec.id)
}
}
@@ -97,32 +108,41 @@ fn runtime(id: &str) -> Runtime {
} else if id.starts_with("collectives-westend") {
Runtime::CollectivesWestend
} else {
- Runtime::Generic
+ log::warn!("No specific runtime was recognized for ChainSpec's id: '{}', so Runtime::default() will be used", id);
+ Runtime::default()
}
}
fn load_spec(id: &str) -> std::result::Result, String> {
let (id, _, para_id) = extract_parachain_id(id);
Ok(match id {
- "staging" => Box::new(chain_spec::staging_test_net()),
- "tick" => Box::new(chain_spec::ChainSpec::from_json_bytes(
- &include_bytes!("../../parachains/chain-specs/tick.json")[..],
- )?),
- "trick" => Box::new(chain_spec::ChainSpec::from_json_bytes(
- &include_bytes!("../../parachains/chain-specs/trick.json")[..],
- )?),
- "track" => Box::new(chain_spec::ChainSpec::from_json_bytes(
- &include_bytes!("../../parachains/chain-specs/track.json")[..],
- )?),
+ // - Defaul-like
+ "staging" =>
+ Box::new(chain_spec::rococo_parachain::staging_rococo_parachain_local_config()),
+ "tick" =>
+ Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
+ &include_bytes!("../../parachains/chain-specs/tick.json")[..],
+ )?),
+ "trick" =>
+ Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
+ &include_bytes!("../../parachains/chain-specs/trick.json")[..],
+ )?),
+ "track" =>
+ Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
+ &include_bytes!("../../parachains/chain-specs/track.json")[..],
+ )?),
+
+ // -- Starters
"shell" => Box::new(chain_spec::shell::get_shell_chain_spec()),
- // -- Statemint
"seedling" => Box::new(chain_spec::seedling::get_seedling_chain_spec()),
+
+ // -- Statemint
"statemint-dev" => Box::new(chain_spec::statemint::statemint_development_config()),
"statemint-local" => Box::new(chain_spec::statemint::statemint_local_config()),
// the chain spec as used for generating the upgrade genesis values
"statemint-genesis" => Box::new(chain_spec::statemint::statemint_config()),
// the shell-based chain spec as used for syncing
- "statemint" => Box::new(chain_spec::ChainSpec::from_json_bytes(
+ "statemint" => Box::new(chain_spec::statemint::StatemintChainSpec::from_json_bytes(
&include_bytes!("../../parachains/chain-specs/statemint.json")[..],
)?),
@@ -132,7 +152,7 @@ fn load_spec(id: &str) -> std::result::Result, String> {
// the chain spec as used for generating the upgrade genesis values
"statemine-genesis" => Box::new(chain_spec::statemint::statemine_config()),
// the shell-based chain spec as used for syncing
- "statemine" => Box::new(chain_spec::ChainSpec::from_json_bytes(
+ "statemine" => Box::new(chain_spec::statemint::StatemineChainSpec::from_json_bytes(
&include_bytes!("../../parachains/chain-specs/statemine.json")[..],
)?),
@@ -142,7 +162,7 @@ fn load_spec(id: &str) -> std::result::Result, String> {
// the chain spec as used for generating the upgrade genesis values
"westmint-genesis" => Box::new(chain_spec::statemint::westmint_config()),
// the shell-based chain spec as used for syncing
- "westmint" => Box::new(chain_spec::ChainSpec::from_json_bytes(
+ "westmint" => Box::new(chain_spec::statemint::WestmintChainSpec::from_json_bytes(
&include_bytes!("../../parachains/chain-specs/westmint.json")[..],
)?),
@@ -151,12 +171,14 @@ fn load_spec(id: &str) -> std::result::Result, String> {
Box::new(chain_spec::collectives::collectives_polkadot_development_config()),
"collectives-polkadot-local" =>
Box::new(chain_spec::collectives::collectives_polkadot_local_config()),
- "collectives-polkadot" => Box::new(chain_spec::ChainSpec::from_json_bytes(
- &include_bytes!("../../parachains/chain-specs/collectives-polkadot.json")[..],
- )?),
- "collectives-westend" => Box::new(chain_spec::ChainSpec::from_json_bytes(
- &include_bytes!("../../parachains/chain-specs/collectives-westend.json")[..],
- )?),
+ "collectives-polkadot" =>
+ Box::new(chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_bytes(
+ &include_bytes!("../../parachains/chain-specs/collectives-polkadot.json")[..],
+ )?),
+ "collectives-westend" =>
+ Box::new(chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_bytes(
+ &include_bytes!("../../parachains/chain-specs/collectives-westend.json")[..],
+ )?),
// -- Contracts on Rococo
"contracts-rococo-dev" =>
@@ -164,9 +186,12 @@ fn load_spec(id: &str) -> std::result::Result, String> {
"contracts-rococo-local" =>
Box::new(chain_spec::contracts::contracts_rococo_local_config()),
"contracts-rococo-genesis" => Box::new(chain_spec::contracts::contracts_rococo_config()),
- "contracts-rococo" => Box::new(chain_spec::ChainSpec::from_json_bytes(
- &include_bytes!("../../parachains/chain-specs/contracts-rococo.json")[..],
- )?),
+ "contracts-rococo" =>
+ Box::new(chain_spec::contracts::ContractsRococoChainSpec::from_json_bytes(
+ &include_bytes!("../../parachains/chain-specs/contracts-rococo.json")[..],
+ )?),
+
+ // -- Penpall
"penpal-kusama" => Box::new(chain_spec::penpal::get_penpal_chain_spec(
para_id.expect("Must specify parachain id"),
"kusama-local",
@@ -177,34 +202,35 @@ fn load_spec(id: &str) -> std::result::Result, String> {
)),
// -- Fallback (generic chainspec)
- "" => Box::new(chain_spec::get_chain_spec()),
+ "" => {
+ log::warn!("No ChainSpec.id specified, so using default one, based on rococo-parachain runtime");
+ Box::new(chain_spec::rococo_parachain::rococo_parachain_local_config())
+ },
// -- Loading a specific spec from disk
path => {
- let chain_spec = chain_spec::ChainSpec::from_json_file(path.into())?;
- match chain_spec.runtime() {
- Runtime::Statemint => Box::new(
- chain_spec::statemint::StatemintChainSpec::from_json_file(path.into())?,
- ),
- Runtime::Statemine => Box::new(
- chain_spec::statemint::StatemineChainSpec::from_json_file(path.into())?,
- ),
+ let path: PathBuf = path.into();
+ match path.runtime() {
+ Runtime::Statemint =>
+ Box::new(chain_spec::statemint::StatemintChainSpec::from_json_file(path)?),
+ Runtime::Statemine =>
+ Box::new(chain_spec::statemint::StatemineChainSpec::from_json_file(path)?),
Runtime::Westmint =>
- Box::new(chain_spec::statemint::WestmintChainSpec::from_json_file(path.into())?),
- Runtime::CollectivesPolkadot | Runtime::CollectivesWestend =>
- Box::new(chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_file(
- path.into(),
- )?),
- Runtime::Shell =>
- Box::new(chain_spec::shell::ShellChainSpec::from_json_file(path.into())?),
- Runtime::Seedling =>
- Box::new(chain_spec::seedling::SeedlingChainSpec::from_json_file(path.into())?),
- Runtime::ContractsRococo => Box::new(
- chain_spec::contracts::ContractsRococoChainSpec::from_json_file(path.into())?,
+ Box::new(chain_spec::statemint::WestmintChainSpec::from_json_file(path)?),
+ Runtime::CollectivesPolkadot | Runtime::CollectivesWestend => Box::new(
+ chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_file(path)?,
),
+ Runtime::Shell =>
+ Box::new(chain_spec::shell::ShellChainSpec::from_json_file(path)?),
+ Runtime::Seedling =>
+ Box::new(chain_spec::seedling::SeedlingChainSpec::from_json_file(path)?),
+ Runtime::ContractsRococo =>
+ Box::new(chain_spec::contracts::ContractsRococoChainSpec::from_json_file(path)?),
Runtime::Penpal(_para_id) =>
- Box::new(chain_spec::penpal::PenpalChainSpec::from_json_file(path.into())?),
- Runtime::Generic => Box::new(chain_spec),
+ Box::new(chain_spec::penpal::PenpalChainSpec::from_json_file(path)?),
+ Runtime::Default => Box::new(
+ chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_file(path)?,
+ ),
}
},
})
@@ -263,7 +289,7 @@ impl SubstrateCli for Cli {
2017
}
- fn load_spec(&self, id: &str) -> std::result::Result, String> {
+ fn load_spec(&self, id: &str) -> std::result::Result, String> {
load_spec(id)
}
@@ -278,7 +304,7 @@ impl SubstrateCli for Cli {
Runtime::Seedling => &seedling_runtime::VERSION,
Runtime::ContractsRococo => &contracts_rococo_runtime::VERSION,
Runtime::Penpal(_) => &penpal_runtime::VERSION,
- Runtime::Generic => &rococo_parachain_runtime::VERSION,
+ Runtime::Default => &rococo_parachain_runtime::VERSION,
}
}
}
@@ -314,7 +340,7 @@ impl SubstrateCli for RelayChainCli {
2017
}
- fn load_spec(&self, id: &str) -> std::result::Result, String> {
+ fn load_spec(&self, id: &str) -> std::result::Result, String> {
polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)
}
@@ -434,7 +460,7 @@ macro_rules! construct_async_run {
{ $( $code )* }.map(|v| (v, task_manager))
})
},
- Runtime::Penpal(_) | Runtime::Generic => {
+ Runtime::Penpal(_) | Runtime::Default => {
runner.async_run(|$config| {
let $components = new_partial::<
rococo_parachain_runtime::RuntimeApi,
@@ -700,7 +726,7 @@ pub fn run() -> Result<()> {
.await
.map(|r| r.0)
.map_err(Into::into),
- Runtime::Penpal(_) | Runtime::Generic =>
+ Runtime::Penpal(_) | Runtime::Default =>
crate::service::start_rococo_parachain_node(
config,
polkadot_config,
@@ -806,8 +832,8 @@ impl CliConfiguration for RelayChainCli {
self.base.base.transaction_pool(is_dev)
}
- fn state_cache_child_ratio(&self) -> Result> {
- self.base.base.state_cache_child_ratio()
+ fn trie_cache_maximum_size(&self) -> Result> {
+ self.base.base.trie_cache_maximum_size()
}
fn rpc_methods(&self) -> Result {
@@ -853,3 +879,118 @@ impl CliConfiguration for RelayChainCli {
self.base.base.node_name()
}
}
+
+#[cfg(test)]
+mod tests {
+ use crate::{
+ chain_spec::{get_account_id_from_seed, get_from_seed},
+ command::{Runtime, RuntimeResolver},
+ };
+ use sc_chain_spec::{ChainSpec, ChainSpecExtension, ChainSpecGroup, ChainType, Extension};
+ use serde::{Deserialize, Serialize};
+ use sp_core::sr25519;
+ use std::path::PathBuf;
+ use tempfile::TempDir;
+
+ #[derive(
+ Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension, Default,
+ )]
+ #[serde(deny_unknown_fields)]
+ pub struct Extensions1 {
+ pub attribute1: String,
+ pub attribute2: u32,
+ }
+
+ #[derive(
+ Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension, Default,
+ )]
+ #[serde(deny_unknown_fields)]
+ pub struct Extensions2 {
+ pub attribute_x: String,
+ pub attribute_y: String,
+ pub attribute_z: u32,
+ }
+
+ fn store_configuration(dir: &TempDir, spec: Box) -> PathBuf {
+ let raw_output = true;
+ let json = sc_service::chain_ops::build_spec(&*spec, raw_output)
+ .expect("Failed to build json string");
+ let mut cfg_file_path = dir.path().to_path_buf();
+ cfg_file_path.push(spec.id());
+ cfg_file_path.set_extension("json");
+ std::fs::write(&cfg_file_path, json).expect("Failed to write to json file");
+ cfg_file_path
+ }
+
+ pub type DummyChainSpec =
+ sc_service::GenericChainSpec;
+
+ pub fn create_default_with_extensions(
+ id: &str,
+ extension: E,
+ ) -> DummyChainSpec {
+ DummyChainSpec::from_genesis(
+ "Dummy local testnet",
+ id,
+ ChainType::Local,
+ move || {
+ crate::chain_spec::rococo_parachain::testnet_genesis(
+ get_account_id_from_seed::("Alice"),
+ vec![
+ get_from_seed::("Alice"),
+ get_from_seed::("Bob"),
+ ],
+ vec![get_account_id_from_seed::("Alice")],
+ 1000.into(),
+ )
+ },
+ Vec::new(),
+ None,
+ None,
+ None,
+ None,
+ extension,
+ )
+ }
+
+ #[test]
+ fn test_resolve_runtime_for_different_configuration_files() {
+ let temp_dir = tempfile::tempdir().expect("Failed to access tempdir");
+
+ let path = store_configuration(
+ &temp_dir,
+ Box::new(create_default_with_extensions("shell-1", Extensions1::default())),
+ );
+ assert_eq!(Runtime::Shell, path.runtime());
+
+ let path = store_configuration(
+ &temp_dir,
+ Box::new(create_default_with_extensions("shell-2", Extensions2::default())),
+ );
+ assert_eq!(Runtime::Shell, path.runtime());
+
+ let path = store_configuration(
+ &temp_dir,
+ Box::new(create_default_with_extensions("seedling", Extensions2::default())),
+ );
+ assert_eq!(Runtime::Seedling, path.runtime());
+
+ let path = store_configuration(
+ &temp_dir,
+ Box::new(crate::chain_spec::rococo_parachain::rococo_parachain_local_config()),
+ );
+ assert_eq!(Runtime::Default, path.runtime());
+
+ let path = store_configuration(
+ &temp_dir,
+ Box::new(crate::chain_spec::statemint::statemine_local_config()),
+ );
+ assert_eq!(Runtime::Statemine, path.runtime());
+
+ let path = store_configuration(
+ &temp_dir,
+ Box::new(crate::chain_spec::contracts::contracts_rococo_local_config()),
+ );
+ assert_eq!(Runtime::ContractsRococo, path.runtime());
+ }
+}
diff --git a/polkadot-parachain/src/service.rs b/polkadot-parachain/src/service.rs
index ea52f8d727..ae03e400b0 100644
--- a/polkadot-parachain/src/service.rs
+++ b/polkadot-parachain/src/service.rs
@@ -69,21 +69,6 @@ type HostFunctions = sp_io::SubstrateHostFunctions;
type HostFunctions =
(sp_io::SubstrateHostFunctions, frame_benchmarking::benchmarking::HostFunctions);
-/// Native executor instance.
-pub struct RococoParachainRuntimeExecutor;
-
-impl sc_executor::NativeExecutionDispatch for RococoParachainRuntimeExecutor {
- type ExtendHostFunctions = ();
-
- fn dispatch(method: &str, data: &[u8]) -> Option> {
- rococo_parachain_runtime::api::dispatch(method, data)
- }
-
- fn native_version() -> sc_executor::NativeVersion {
- rococo_parachain_runtime::native_version()
- }
-}
-
/// Native executor instance.
pub struct ShellRuntimeExecutor;
@@ -99,21 +84,6 @@ impl sc_executor::NativeExecutionDispatch for ShellRuntimeExecutor {
}
}
-/// Native executor instance.
-pub struct SeedlingRuntimeExecutor;
-
-impl sc_executor::NativeExecutionDispatch for SeedlingRuntimeExecutor {
- type ExtendHostFunctions = ();
-
- fn dispatch(method: &str, data: &[u8]) -> Option> {
- seedling_runtime::api::dispatch(method, data)
- }
-
- fn native_version() -> sc_executor::NativeVersion {
- seedling_runtime::native_version()
- }
-}
-
// Native Statemint executor instance.
pub struct StatemintRuntimeExecutor;
@@ -174,21 +144,6 @@ impl sc_executor::NativeExecutionDispatch for CollectivesPolkadotRuntimeExecutor
}
}
-/// Native Contracts on Rococo executor instance.
-pub struct ContractsRococoRuntimeExecutor;
-
-impl sc_executor::NativeExecutionDispatch for ContractsRococoRuntimeExecutor {
- type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-
- fn dispatch(method: &str, data: &[u8]) -> Option> {
- contracts_rococo_runtime::api::dispatch(method, data)
- }
-
- fn native_version() -> sc_executor::NativeVersion {
- contracts_rococo_runtime::native_version()
- }
-}
-
/// Starts a `ServiceBuilder` for a full service.
///
/// Use this macro if you don't actually need the full service, but just the builder in order to
diff --git a/primitives/timestamp/Cargo.toml b/primitives/timestamp/Cargo.toml
index 3b64f1bbfe..23d0f5a7db 100644
--- a/primitives/timestamp/Cargo.toml
+++ b/primitives/timestamp/Cargo.toml
@@ -7,7 +7,7 @@ description = "Provides timestamp related functionality for parachains."
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
-futures = "0.3.21"
+futures = "0.3.23"
# Substrate
sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/scripts/ci/changelog/templates/change.md.tera b/scripts/ci/changelog/templates/change.md.tera
index cb40496266..e545b4cec9 100644
--- a/scripts/ci/changelog/templates/change.md.tera
+++ b/scripts/ci/changelog/templates/change.md.tera
@@ -1,7 +1,7 @@
{# This macro shows ONE change #}
{%- macro change(c, cml="[C]", dot="[P]", sub="[S]") -%}
-{%- if c.meta.C and c.meta.C.value >= 7 -%}
+{%- if c.meta.C and c.meta.C.value >= 5 -%}
{%- set prio = " ‼️ HIGH" -%}
{%- elif c.meta.C and c.meta.C.value >= 3 -%}
{%- set prio = " ❗️ Medium" -%}
diff --git a/scripts/ci/changelog/templates/changes.md.tera b/scripts/ci/changelog/templates/changes.md.tera
index a6670a7ece..d691da0a53 100644
--- a/scripts/ci/changelog/templates/changes.md.tera
+++ b/scripts/ci/changelog/templates/changes.md.tera
@@ -14,7 +14,6 @@
{% include "changes_runtime.md.tera" %}
-{% include "runtimes.md.tera" -%}
{% endif %}
{% include "changes_misc.md.tera" %}
diff --git a/scripts/ci/changelog/templates/changes_misc.md.tera b/scripts/ci/changelog/templates/changes_misc.md.tera
index 7585eb8bc5..cf3b701f2c 100644
--- a/scripts/ci/changelog/templates/changes_misc.md.tera
+++ b/scripts/ci/changelog/templates/changes_misc.md.tera
@@ -7,7 +7,7 @@
{%- if pr.meta.B.value == 0 -%}
{#- We skip silent ones -#}
{%- else -%}
- {%- if pr.meta.B and pr.meta.B.value != 5 and pr.meta.B.value != 7 or pr.meta.C or not pr.meta.B %}
+ {%- if pr.meta.B and pr.meta.B.value != 5 or pr.meta.C or not pr.meta.B %}
{%- set_global misc_count = misc_count + 1 -%}
{%- endif -%}
{% endif -%}
@@ -27,7 +27,7 @@ There are other misc. changes. You can expand the list below to view them all.
{%- if pr.meta.B.value == 0 %}
{#- We skip silent ones -#}
{%- else -%}
- {%- if pr.meta.B and pr.meta.B.value != 5 and pr.meta.B.value != 7 or pr.meta.C or not pr.meta.B %}
+ {%- if pr.meta.B and pr.meta.B.value != 5 or pr.meta.C or not pr.meta.B %}
- {{ m_c::change(c=pr) }}
{%- endif -%}
{% endif -%}
diff --git a/scripts/ci/changelog/templates/changes_runtime.md.tera b/scripts/ci/changelog/templates/changes_runtime.md.tera
index 67da1ebbc3..9525d73935 100644
--- a/scripts/ci/changelog/templates/changes_runtime.md.tera
+++ b/scripts/ci/changelog/templates/changes_runtime.md.tera
@@ -5,12 +5,12 @@
{#- The changes are sorted by merge date -#}
{% for pr in changes | sort(attribute="merged_at") -%}
-{%- if pr.meta.B -%}
+{%- if pr.meta.B and pr.meta.X -%}
{%- if pr.meta.B.value == 0 -%}
{#- We skip silent ones -#}
{%- else -%}
-{%- if pr.meta.B.value == 7 and not pr.title is containing("ompanion") %}
+{%- if pr.meta.B.value == 1 and pr.meta.X.value == 1 and not pr.title is containing("ompanion") %}
- {{ m_c::change(c=pr) }}
{%- endif -%}
{%- endif -%}
diff --git a/scripts/ci/changelog/templates/high_priority.md.tera b/scripts/ci/changelog/templates/high_priority.md.tera
index e23bbae942..dd486a4e99 100644
--- a/scripts/ci/changelog/templates/high_priority.md.tera
+++ b/scripts/ci/changelog/templates/high_priority.md.tera
@@ -19,7 +19,7 @@
{%- endif -%}
{%- endfor -%}
-{%- if p >= 7 or host_fn_count > 0 -%}
+{%- if p >= 5 or host_fn_count > 0 -%}
{%- set prio = "‼️ HIGH" -%}
{%- set text = "This is a **high priority** release and you must upgrade as as soon as possible." -%}
{%- elif p >= 3 -%}
@@ -45,7 +45,7 @@ The changes motivating this priority level are:
{%- if pr.meta.C -%}
{%- if pr.meta.C.value == p %}
- {{ m_c::change(c=pr) }}
-{%- if pr.meta.B and pr.meta.B.value == 7 %}
+{%- if pr.meta.B and pr.meta.X and pr.meta.B.value == 1 and pr.meta.X.value == 1 %}
(RUNTIME)
{% endif %}
diff --git a/scripts/ci/changelog/templates/template.md.tera b/scripts/ci/changelog/templates/template.md.tera
index 1545951993..ba50fc439b 100644
--- a/scripts/ci/changelog/templates/template.md.tera
+++ b/scripts/ci/changelog/templates/template.md.tera
@@ -20,15 +20,14 @@ This release contains the changes from `{{ env.REF1 }}` to `{{ env.REF2 }}`.
{# we will force it to HIGH if at least one host function was detected. #}
{% include "host_functions.md.tera" -%}
+
+{% if env.RELEASE_TYPE and env.RELEASE_TYPE == "client" -%}
{% include "global_priority.md.tera" -%}
{% include "compiler.md.tera" -%}
-{% include "migrations-db.md.tera" -%}
-
-{% if env.RELEASE_TYPE and env.RELEASE_TYPE == "client" %}
+{% include "migrations-db.md.tera" %}
{% else %}
-{% include "migrations-runtime.md.tera" -%}
-
+{% include "migrations-runtime.md.tera" %}
{% include "runtimes.md.tera" -%}
{% endif %}
diff --git a/scripts/ci/github/check_labels.sh b/scripts/ci/github/check_labels.sh
index 12f07b3495..102b1a4b06 100755
--- a/scripts/ci/github/check_labels.sh
+++ b/scripts/ci/github/check_labels.sh
@@ -18,16 +18,15 @@ ensure_labels() {
# Must have one of the following labels
releasenotes_labels=(
'B0-silent'
- 'B1-releasenotes'
- 'B7-runtimenoteworthy'
+ 'B1-note_worthy'
)
# Must be an ordered list of priorities, lowest first
priority_labels=(
- 'C1-low 📌'
- 'C3-medium 📣'
- 'C7-high ❗️'
- 'C9-critical ‼️'
+ 'C1-low'
+ 'C3-medium'
+ 'C5-high'
+ 'C7-critical'
)
audit_labels=(
@@ -38,6 +37,13 @@ audit_labels=(
'D9-needsaudit 👮'
)
+x_labels=(
+ 'X0-node'
+ 'X1-runtime'
+ 'X2-API'
+ 'X9-misc'
+)
+
echo "[+] Checking release notes (B) labels for $CI_COMMIT_BRANCH"
if ensure_labels "${releasenotes_labels[@]}"; then
echo "[+] Release notes label detected. All is well."
@@ -46,6 +52,16 @@ else
exit 1
fi
+if has_label "$repo" "$pr" 'B1-note_worthy'; then
+ echo "[+] B1-note_worthy is chosen. Checking that there X-labels for $CI_COMMIT_BRANCH"
+ if ensure_labels "${x_labels[@]}"; then
+ echo "[+] X-label detected. All is well."
+ else
+ echo "[!] X-label not detected. Please add one of: ${x_labels[*]}"
+ exit 1
+ fi
+fi
+
echo "[+] Checking release priority (C) labels for $CI_COMMIT_BRANCH"
if ensure_labels "${priority_labels[@]}"; then
echo "[+] Release priority label detected. All is well."
diff --git a/test/relay-sproof-builder/src/lib.rs b/test/relay-sproof-builder/src/lib.rs
index 36b091eb7e..1faa37a147 100644
--- a/test/relay-sproof-builder/src/lib.rs
+++ b/test/relay-sproof-builder/src/lib.rs
@@ -102,7 +102,7 @@ impl RelayStateSproofBuilder {
) -> (polkadot_primitives::v2::Hash, sp_state_machine::StorageProof) {
let (db, root) = MemoryDB::>::default_with_root();
let state_version = Default::default(); // for test using default.
- let mut backend = sp_state_machine::TrieBackend::new(db, root);
+ let mut backend = sp_state_machine::TrieBackendBuilder::new(db, root).build();
let mut relevant_keys = Vec::new();
{
diff --git a/test/runtime/Cargo.toml b/test/runtime/Cargo.toml
index 69808cf2ac..42b78f935a 100644
--- a/test/runtime/Cargo.toml
+++ b/test/runtime/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.143", optional = true, features = ["derive"] }
+serde = { version = "1.0.144", optional = true, features = ["derive"] }
# Substrate
frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml
index d55b1ba456..26c9401d31 100644
--- a/test/service/Cargo.toml
+++ b/test/service/Cargo.toml
@@ -10,12 +10,12 @@ path = "src/main.rs"
[dependencies]
async-trait = "0.1.57"
-clap = { version = "3.2.16", features = ["derive", "deprecated"] }
+clap = { version = "3.2.17", features = ["derive", "deprecated"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
criterion = { version = "0.3.6", features = [ "async_tokio" ] }
jsonrpsee = { version = "0.15.1", features = ["server"] }
rand = "0.8.5"
-serde = { version = "1.0.143", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
tokio = { version = "1.19.2", features = ["macros"] }
tracing = "0.1.36"
url = "2.2.2"
@@ -72,7 +72,7 @@ cumulus-test-relay-validation-worker-provider = { path = "../relay-validation-wo
cumulus-test-runtime = { path = "../runtime" }
[dev-dependencies]
-futures = "0.3.21"
+futures = "0.3.23"
portpicker = "0.1.1"
# Polkadot dependencies
diff --git a/test/service/src/cli.rs b/test/service/src/cli.rs
index f8c4fecb03..4306516087 100644
--- a/test/service/src/cli.rs
+++ b/test/service/src/cli.rs
@@ -191,8 +191,8 @@ impl CliConfiguration for RelayChainCli {
self.base.base.transaction_pool(is_dev)
}
- fn state_cache_child_ratio(&self) -> CliResult> {
- self.base.base.state_cache_child_ratio()
+ fn trie_cache_maximum_size(&self) -> CliResult> {
+ self.base.base.trie_cache_maximum_size()
}
fn rpc_methods(&self) -> CliResult {
@@ -288,9 +288,16 @@ impl SubstrateCli for TestCollatorCli {
2017
}
- fn load_spec(&self, _: &str) -> std::result::Result, String> {
- Ok(Box::new(cumulus_test_service::get_chain_spec(ParaId::from(self.parachain_id)))
- as Box<_>)
+ fn load_spec(&self, id: &str) -> std::result::Result, String> {
+ Ok(match id {
+ "" => Box::new(cumulus_test_service::get_chain_spec(ParaId::from(self.parachain_id)))
+ as Box<_>,
+ path => {
+ let chain_spec =
+ cumulus_test_service::chain_spec::ChainSpec::from_json_file(path.into())?;
+ Box::new(chain_spec)
+ },
+ })
}
fn native_runtime_version(_: &Box) -> &'static RuntimeVersion {
diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs
index 28c52ac8f7..9132983e3e 100644
--- a/test/service/src/lib.rs
+++ b/test/service/src/lib.rs
@@ -18,7 +18,7 @@
#![warn(missing_docs)]
-mod chain_spec;
+pub mod chain_spec;
mod genesis;
use std::{
@@ -650,8 +650,7 @@ pub fn node_config(
keystore: KeystoreConfig::InMemory,
keystore_remote: Default::default(),
database: DatabaseSource::RocksDb { path: root.join("db"), cache_size: 128 },
- state_cache_size: 67108864,
- state_cache_child_ratio: None,
+ trie_cache_maximum_size: Some(64 * 1024 * 1024),
state_pruning: Some(PruningMode::ArchiveAll),
blocks_pruning: BlocksPruning::All,
chain_spec: spec,
diff --git a/test/service/src/main.rs b/test/service/src/main.rs
index fadbd3539c..b87a8ed191 100644
--- a/test/service/src/main.rs
+++ b/test/service/src/main.rs
@@ -16,7 +16,7 @@
mod cli;
-use std::sync::Arc;
+use std::{io::Write, sync::Arc};
use cli::{RelayChainCli, Subcommand, TestCollatorCli};
use cumulus_client_cli::generate_genesis_block;
@@ -43,14 +43,31 @@ fn main() -> Result<(), sc_cli::Error> {
let runner = cli.create_runner(cmd)?;
runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
},
- Some(Subcommand::ExportGenesisState(cmd)) => {
- let runner = cli.create_runner(cmd)?;
- runner.sync_run(|_config| {
- let parachain_id = ParaId::from(cmd.parachain_id);
- let spec = cumulus_test_service::get_chain_spec(parachain_id);
- let state_version = cumulus_test_service::runtime::VERSION.state_version();
- cmd.base.run::(&spec, state_version)
- })
+
+ Some(Subcommand::ExportGenesisState(params)) => {
+ let mut builder = sc_cli::LoggerBuilder::new("");
+ builder.with_profiling(sc_tracing::TracingReceiver::Log, "");
+ let _ = builder.init();
+
+ let spec =
+ cli.load_spec(¶ms.base.shared_params.chain.clone().unwrap_or_default())?;
+ let state_version = cumulus_test_service::runtime::VERSION.state_version();
+
+ let block: parachains_common::Block = generate_genesis_block(&*spec, state_version)?;
+ let raw_header = block.header().encode();
+ let output_buf = if params.base.raw {
+ raw_header
+ } else {
+ format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes()
+ };
+
+ if let Some(output) = ¶ms.base.output {
+ std::fs::write(output, output_buf)?;
+ } else {
+ std::io::stdout().write_all(&output_buf)?;
+ }
+
+ Ok(())
},
Some(Subcommand::ExportGenesisWasm(cmd)) => {
let runner = cli.create_runner(cmd)?;
@@ -106,7 +123,7 @@ fn main() -> Result<(), sc_cli::Error> {
if config.role.is_authority() { "yes" } else { "no" }
);
- let collator_key = Some(CollatorPair::generate().0);
+ let collator_key = config.role.is_authority().then(|| CollatorPair::generate().0);
let consensus = cli
.use_null_consensus
diff --git a/zombienet_tests/0001-sync_blocks_from_tip_without_connected_collator.feature b/zombienet_tests/0001-sync_blocks_from_tip_without_connected_collator.feature
index 6f84041c07..68620d03ab 100644
--- a/zombienet_tests/0001-sync_blocks_from_tip_without_connected_collator.feature
+++ b/zombienet_tests/0001-sync_blocks_from_tip_without_connected_collator.feature
@@ -1,4 +1,4 @@
-Description: Small Network test
+Description: Sync blocks from tip without connected collator test
Network: ./0001-sync_blocks_from_tip_without_connected_collator.toml
Creds: config
@@ -7,11 +7,9 @@ alice: is up
bob: is up
charlie: is up
dave: is up
-ferdie: is up
-eve: is up
alice: parachain 2000 is registered within 225 seconds
alice: parachain 2000 block height is at least 10 within 250 seconds
ferdie: reports block height is at least 12 within 250 seconds
-eve: reports block height is at least 12 within 250 seconds
+eve: reports block height is at least 12 within 250 seconds
\ No newline at end of file
diff --git a/zombienet_tests/0001-sync_blocks_from_tip_without_connected_collator.toml b/zombienet_tests/0001-sync_blocks_from_tip_without_connected_collator.toml
index 8f2d8a3a8c..c0d49b3129 100644
--- a/zombienet_tests/0001-sync_blocks_from_tip_without_connected_collator.toml
+++ b/zombienet_tests/0001-sync_blocks_from_tip_without_connected_collator.toml
@@ -1,5 +1,5 @@
[relaychain]
-default_image = "docker.io/paritypr/polkadot-debug:master"
+default_image = "{{RELAY_IMAGE}}"
default_command = "polkadot"
default_args = [ "-lparachain=debug" ]
@@ -11,9 +11,7 @@ chain = "rococo-local"
[[relaychain.nodes]]
name = "bob"
- image = "docker.io/paritypr/polkadot-debug:5236-0.9.18-c55660e9-be16bd72"
validator = true
- args = ["--database=paritydb-experimental"]
[[parachains]]
id = 2000
@@ -23,30 +21,30 @@ cumulus_based = true
[[parachains.collators]]
name = "charlie"
validator = true
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
args = ["-lparachain=debug"]
# run dave as parachain full node
[[parachains.collators]]
name = "dave"
validator = false
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
args = ["-lparachain=debug"]
# run eve as parachain full node that is only connected to dave
[[parachains.collators]]
name = "eve"
validator = false
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
- args = ["--reserved-only", "--reserved-nodes {{'dave'|zombie}}"]
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["--reserved-only", "--reserved-nodes {{'dave'|zombie('multiAddress')}}"]
# run ferdie as parachain full node that is only connected to dave
[[parachains.collators]]
name = "ferdie"
validator = false
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
- args = ["--reserved-only", "--reserved-nodes {{'dave'|zombie}}"]
\ No newline at end of file
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["--reserved-only", "--reserved-nodes {{'dave'|zombie('multiAddress')}}", "--relay-chain-rpc-url {{'alice'|zombie('wsUri')}}"]
diff --git a/zombienet_tests/0002-pov_recovery.feature b/zombienet_tests/0002-pov_recovery.feature
index 5f33c5ff4a..fa9836e264 100644
--- a/zombienet_tests/0002-pov_recovery.feature
+++ b/zombienet_tests/0002-pov_recovery.feature
@@ -1,4 +1,4 @@
-Description: Small Network test
+Description: PoV recovery test
Network: ./0002-pov_recovery.toml
Creds: config
diff --git a/zombienet_tests/0002-pov_recovery.toml b/zombienet_tests/0002-pov_recovery.toml
index 5913cf8275..fc62d94595 100644
--- a/zombienet_tests/0002-pov_recovery.toml
+++ b/zombienet_tests/0002-pov_recovery.toml
@@ -1,5 +1,5 @@
[relaychain]
-default_image = "docker.io/paritypr/polkadot-debug:master"
+default_image = "{{RELAY_IMAGE}}"
default_command = "polkadot"
default_args = [ "-lparachain=debug" ]
@@ -11,9 +11,7 @@ chain = "rococo-local"
[[relaychain.nodes]]
name = "bob"
- image = "docker.io/paritypr/polkadot-debug:5236-0.9.18-c55660e9-be16bd72"
validator = true
- args = ["--database=paritydb-experimental"]
[[parachains]]
id = 2000
@@ -23,8 +21,8 @@ cumulus_based = true
[[parachains.collators]]
name = "charlie"
validator = true
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
args = ["-lparachain=debug"]
# Run dave as parachain collator and eve as parachain full node
@@ -33,14 +31,14 @@ cumulus_based = true
[[parachains.collators]]
name = "dave"
validator = true
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
- args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie}}", "--use-null-consensus", "--disable-block-announcements"]
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie('multiAddress')}}", "--use-null-consensus", "--disable-block-announcements"]
# run eve as parachain full node that is only connected to dave
[[parachains.collators]]
name = "eve"
validator = false
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
- args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie}}", "--use-null-consensus", "--disable-block-announcements"]
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie('multiAddress')}}", "--use-null-consensus", "--disable-block-announcements"]
diff --git a/zombienet_tests/0003-test_full_node_catching_up.feature b/zombienet_tests/0003-full_node_catching_up.feature
similarity index 75%
rename from zombienet_tests/0003-test_full_node_catching_up.feature
rename to zombienet_tests/0003-full_node_catching_up.feature
index f7e5e4df3a..de8353bb13 100644
--- a/zombienet_tests/0003-test_full_node_catching_up.feature
+++ b/zombienet_tests/0003-full_node_catching_up.feature
@@ -1,8 +1,7 @@
-Description: Small Network test
-Network: ./0003-test_full_node_catching_up.toml
+Description: Full node catching up test
+Network: ./0003-full_node_catching_up.toml
Creds: config
-
alice: is up
bob: is up
charlie: is up
diff --git a/zombienet_tests/0003-test_full_node_catching_up.toml b/zombienet_tests/0003-full_node_catching_up.toml
similarity index 65%
rename from zombienet_tests/0003-test_full_node_catching_up.toml
rename to zombienet_tests/0003-full_node_catching_up.toml
index 59ec912181..48ce352975 100644
--- a/zombienet_tests/0003-test_full_node_catching_up.toml
+++ b/zombienet_tests/0003-full_node_catching_up.toml
@@ -1,5 +1,5 @@
[relaychain]
-default_image = "docker.io/paritypr/polkadot-debug:master"
+default_image = "{{RELAY_IMAGE}}"
default_command = "polkadot"
default_args = [ "-lparachain=debug" ]
@@ -11,9 +11,7 @@ chain = "rococo-local"
[[relaychain.nodes]]
name = "bob"
- image = "docker.io/paritypr/polkadot-debug:5236-0.9.18-c55660e9-be16bd72"
validator = true
- args = ["--database=paritydb-experimental"]
[[parachains]]
id = 2000
@@ -23,22 +21,22 @@ cumulus_based = true
[[parachains.collators]]
name = "charlie"
validator = true
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
args = ["-lparachain=debug"]
# run cumulus dave (a parachain full node) and wait for it to sync some blocks
[[parachains.collators]]
name = "dave"
validator = false
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
- args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie}}"]
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie('multiAddress')}}"]
# run cumulus eve (a parachain full node) and wait for it to sync some blocks
[[parachains.collators]]
name = "eve"
validator = false
- image = "docker.io/parity/polkadot-collator:latest"
- command = "test-collator"
- args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie}}"]
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie('multiAddress')}}", "--relay-chain-rpc-url {{'alice'|zombie('wsUri')}}"]
diff --git a/zombienet_tests/0004-runtime_upgrade.feature b/zombienet_tests/0004-runtime_upgrade.feature
new file mode 100644
index 0000000000..eca3cb3366
--- /dev/null
+++ b/zombienet_tests/0004-runtime_upgrade.feature
@@ -0,0 +1,13 @@
+Description: Runtime Upgrade test
+Network: ./0004-runtime_upgrade.toml
+Creds: config
+
+alice: is up
+bob: is up
+charlie: is up
+dave: is up
+alice: parachain 2000 is registered within 225 seconds
+charlie: reports block height is at least 5 within 250 seconds
+charlie: parachain 2000 perform upgrade with /tmp/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm within 200 seconds
+dave: reports block height is at least 20 within 250 seconds
+dave: js-script ./runtime_upgrade.js within 200 seconds
diff --git a/zombienet_tests/0004-runtime_upgrade.toml b/zombienet_tests/0004-runtime_upgrade.toml
new file mode 100644
index 0000000000..fbf0dfc691
--- /dev/null
+++ b/zombienet_tests/0004-runtime_upgrade.toml
@@ -0,0 +1,33 @@
+[relaychain]
+default_image = "{{RELAY_IMAGE}}"
+default_command = "polkadot"
+default_args = [ "-lparachain=debug" ]
+
+chain = "rococo-local"
+
+ [[relaychain.nodes]]
+ name = "alice"
+ validator = true
+
+ [[relaychain.nodes]]
+ name = "bob"
+ validator = true
+
+[[parachains]]
+id = 2000
+cumulus_based = true
+
+ # run charlie as parachain collator
+ [[parachains.collators]]
+ name = "charlie"
+ validator = true
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["-lparachain=debug"]
+
+ # Run dave as parachain full node
+ [[parachains.collators]]
+ name = "dave"
+ validator = false
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
diff --git a/zombienet_tests/0005-migrate_solo_to_para.feature b/zombienet_tests/0005-migrate_solo_to_para.feature
new file mode 100644
index 0000000000..c546e49d1c
--- /dev/null
+++ b/zombienet_tests/0005-migrate_solo_to_para.feature
@@ -0,0 +1,13 @@
+Description: Migrate solo to para
+Network: ./0005-migrate_solo_to_para.toml
+Creds: config
+
+alice: is up
+bob: is up
+dave: is up
+eve: is up
+alice: parachain 2000 is registered within 225 seconds
+alice: reports block height is at least 10 within 250 seconds
+alice: parachain 2000 block height is at least 10 within 250 seconds
+eve: reports block height is 0 within 20 seconds
+dave: js-script ./migrate_solo_to_para.js with "dave,2000-1,eve" within 200 seconds
diff --git a/zombienet_tests/0005-migrate_solo_to_para.toml b/zombienet_tests/0005-migrate_solo_to_para.toml
new file mode 100644
index 0000000000..f98c0e6f25
--- /dev/null
+++ b/zombienet_tests/0005-migrate_solo_to_para.toml
@@ -0,0 +1,45 @@
+[relaychain]
+default_image = "{{RELAY_IMAGE}}"
+default_command = "polkadot"
+default_args = [ "-lparachain=debug" ]
+
+chain = "rococo-local"
+
+ [[relaychain.nodes]]
+ name = "alice"
+ validator = true
+
+ [[relaychain.nodes]]
+ name = "bob"
+ validator = true
+
+
+[[parachains]]
+id = 2000
+cumulus_based = true
+
+ # run the solo chain (in our case this is also already a parachain, but as it has a different genesis it will not produce any blocks.)
+ [[parachains.collators]]
+ name = "dave"
+ validator = true
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["-lparachain=debug"]
+
+[[parachains]]
+id = 2000
+cumulus_based = true
+add_to_genesis = false
+register_para = false
+# Set some random value in the genesis state to create a different genesis hash.
+[parachains.genesis.runtime.runtime_genesis_config.sudo]
+key = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty"
+
+ # run the parachain that will be used to return the header of the solo chain.
+ [[parachains.collators]]
+ name = "eve"
+ validator = true
+ add_to_bootnodes = true
+ image = "{{COL_IMAGE}}"
+ command = "test-parachain"
+ args = ["-lparachain=debug"]
diff --git a/zombienet_tests/migrate_solo_to_para.js b/zombienet_tests/migrate_solo_to_para.js
new file mode 100644
index 0000000000..c43e36e837
--- /dev/null
+++ b/zombienet_tests/migrate_solo_to_para.js
@@ -0,0 +1,57 @@
+const assert = require("assert");
+const polkadotApi = require("@polkadot/api");
+const utilCrypto = require("@polkadot/util-crypto");
+const fs = require("fs").promises;
+
+async function connect(apiUrl, types) {
+ const provider = new polkadotApi.WsProvider(apiUrl);
+ const api = new polkadotApi.ApiPromise({ provider, types });
+ await api.isReady;
+ return api;
+}
+
+async function run(nodeName, networkInfo, args) {
+ const [paraNode, partialPath, soloNode ] = args;
+ const {wsUri, userDefinedTypes} = networkInfo.nodesByName[paraNode];
+ const {wsUri: wsUri_solo, userDefinedTypes: userDefinedTypes_solo } = networkInfo.nodesByName[soloNode];
+ const para = await connect(wsUri, userDefinedTypes);
+ const solo = await connect(wsUri_solo, userDefinedTypes_solo);
+
+ await utilCrypto.cryptoWaitReady();
+
+ // account to submit tx
+ const keyring = new polkadotApi.Keyring({ type: "sr25519" });
+ const alice = keyring.addFromUri("//Alice");
+
+ // get genesis to update
+ const filePath = `${networkInfo.tmpDir}/${partialPath}/genesis-state`;
+ const customHeader = await fs.readFile(filePath);
+
+ // get current header
+ await para.tx.testPallet.setCustomValidationHeadData(customHeader.toString()).signAndSend(alice);
+
+ let parachain_best;
+ let count = 0;
+
+ assertParachainBest = async (parachain_best) => {
+ const current = await para.rpc.chain.getHeader();
+ assert.equal(parachain_best.toHuman().number, current.toHuman().number, "parachain should not produce more blocks");
+ }
+
+
+ await new Promise( async (resolve, reject) => {
+ const unsubscribe = await solo.rpc.chain.subscribeNewHeads(async (header) => {
+ console.log(`Solo chain is at block: #${header.number}`);
+ count++;
+ if(count === 2) parachain_best = await para.rpc.chain.getHeader();
+
+ if(count > 4) {
+ unsubscribe();
+ await assertParachainBest(parachain_best);
+ resolve();
+ }
+ });
+ });
+}
+
+module.exports = { run }
\ No newline at end of file
diff --git a/zombienet_tests/runtime_upgrade.js b/zombienet_tests/runtime_upgrade.js
new file mode 100644
index 0000000000..7692d3cef3
--- /dev/null
+++ b/zombienet_tests/runtime_upgrade.js
@@ -0,0 +1,24 @@
+const assert = require("assert");
+
+async function run(nodeName, networkInfo, args) {
+ const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName];
+ const api = await zombie.connect(wsUri, userDefinedTypes);
+
+ // get blockhash/runtimeVersion at block 1
+ const hashAtBlock1 = await api.rpc.chain.getBlockHash(1);
+ const versionAtBlock1 = await api.rpc.state.getRuntimeVersion(hashAtBlock1.toHuman());
+
+ // get blockhash/runtimeVersion at current head
+ const currentHeader = await api.rpc.chain.getHeader();
+ const hashAtCurrent = await api.rpc.chain.getBlockHash(currentHeader.number.toHuman());
+ const versionAtCurrent = await api.rpc.state.getRuntimeVersion(hashAtCurrent.toHuman());
+
+ const oldVersionIncremented = parseInt(versionAtBlock1.specVersion.toHuman(),10) + 1;
+ console.log("current", versionAtCurrent.specVersion.toHuman());
+ console.log("oldVersionIncremented", oldVersionIncremented);
+
+ // 2 == 2
+ assert.equal( oldVersionIncremented, versionAtCurrent.specVersion.toHuman(), "Running version should be the incremented version");
+}
+
+module.exports = { run }
\ No newline at end of file