diff --git a/.github/workflows/release-bot.yml b/.github/workflows/release-bot.yml
new file mode 100644
index 0000000000000000000000000000000000000000..08aa94417c047d4e93645e4b6d0949ee2df29777
--- /dev/null
+++ b/.github/workflows/release-bot.yml
@@ -0,0 +1,18 @@
+name: Pushes release updates to a pre-defined Matrix room
+on:
+ release:
+ types:
+ - edited
+ - prereleased
+ - published
+jobs:
+ ping_matrix:
+ runs-on: ubuntu-latest
+ steps:
+ - name: send message
+ uses: s3krit/matrix-message-action@v0.0.2
+ with:
+ room_id: ${{ secrets.MATRIX_ROOM_ID }}
+ access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
+ message: "**${{github.event.repository.full_name}}:** A release has been ${{github.event.action}}
Release version [${{github.event.release.tag_name}}](${{github.event.release.html_url}})
***Description:***
${{github.event.release.body}}
"
+ server: "matrix.parity.io"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62a6c2de32ddfa86fdbe6736737f7f0f3dc1768d..98cf4dd1d8c4f6109f2402ee44c890405dbdf968 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,21 @@
# pipelines can be triggered manually in the web
# setting DEPLOY_TAG will only deploy the tagged image
+# SAMPLE JOB TEMPLATE - This is not a complete example but is enough to build a
+# simple CI job. For full documentation, visit https://docs.gitlab.com/ee/ci/yaml/
+#
+# my-example-job:
+# stage: test # One of the stages listed below this job (required)
+# image: parity/tools:latest # Any docker image (required)
+# allow_failure: true # Allow the pipeline to continue if this job fails (default: false)
+# dependencies:
+# - build-rust-doc-release # Any jobs that are required to run before this job (optional)
+# variables:
+# MY_ENVIRONMENT_VARIABLE: "some useful value" # Environment variables passed to the job (optional)
+# script:
+# - echo "List of shell commands to run in your job"
+# - echo "You can also just specify a script here, like so:"
+# - ./.maintain/gitlab/my_amazing_script.sh
stages:
- test
@@ -22,6 +37,9 @@ variables:
CI_SERVER_NAME: "GitLab CI"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
+ # FIXME set to release
+ CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.8"
+ CARGO_UNLEASH_PKG_DEF: "--skip node node-* pallet-template pallet-example pallet-example-* subkey chain-spec-builder"
.collect-artifacts: &collect-artifacts
@@ -86,6 +104,16 @@ check-runtime:
interruptible: true
allow_failure: true
+check-signed-tag:
+ stage: test
+ image: parity/tools:latest
+ <<: *kubernetes-build
+ only:
+ - tags
+ - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+ script:
+ - ./.maintain/gitlab/check_signed.sh
+ allow_failure: false
check-line-width:
stage: test
@@ -160,6 +188,16 @@ test-dependency-rules:
script:
- .maintain/ensure-deps.sh
+unleash-check:
+ stage: test
+ <<: *docker-env
+ only:
+ - master
+ - tags
+ script:
+ - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
+ - cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
+
test-frame-staking:
stage: test
<<: *docker-env
@@ -327,8 +365,9 @@ check_warnings:
- $DEPLOY_TAG
variables:
GIT_STRATEGY: none
- dependencies:
- - test-linux-stable
+ needs:
+ - job: test-linux-stable
+ artifacts: true
script:
- if [ -s ${CI_COMMIT_SHORT_SHA}_warnings.log ]; then
cat ${CI_COMMIT_SHORT_SHA}_warnings.log;
@@ -336,7 +375,6 @@ check_warnings:
else
echo "___No warnings___";
fi
- allow_failure: true
# Nightly check whether Polkadot 'master' branch builds.
check_polkadot:
@@ -524,7 +562,28 @@ publish-gh-doc:
after_script:
- rm -vrf ${HOME}/.gitconfig
+publish-draft-release:
+ stage: publish
+ image: parity/tools:latest
+ only:
+ - tags
+ - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+ script:
+ - ./.maintain/gitlab/publish_draft_release.sh
+ interruptible: true
+ allow_failure: true
+publish-to-crates-io:
+ stage: publish
+ <<: *docker-env
+ only:
+ - tags
+ - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
+ script:
+ - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
+ - cargo unleash em-dragons --no-check ${CARGO_UNLEASH_PKG_DEF}
+ interruptible: true
+ allow_failure: true
.deploy-template: &deploy
stage: kubernetes
diff --git a/.maintain/Dockerfile b/.maintain/Dockerfile
index 7cba85c544afc2c8cc1ff56401b2172a01d30364..2fc1532aa2837b3314eaf17a907ca765d33c85b5 100644
--- a/.maintain/Dockerfile
+++ b/.maintain/Dockerfile
@@ -1,7 +1,7 @@
# Note: We don't use Alpine and its packaged Rust/Cargo because they're too often out of date,
# preventing them from being used to build Substrate/Polkadot.
-FROM phusion/baseimage:0.10.2 as builder
+FROM phusion/baseimage:0.11 as builder
LABEL maintainer="chevdor@gmail.com"
LABEL description="This is the build stage for Substrate. Here we create the binary."
@@ -20,13 +20,12 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
export PATH="$PATH:$HOME/.cargo/bin" && \
rustup toolchain install nightly && \
rustup target add wasm32-unknown-unknown --toolchain nightly && \
- rustup default nightly && \
rustup default stable && \
cargo build "--$PROFILE"
# ===== SECOND STAGE ======
-FROM phusion/baseimage:0.10.2
+FROM phusion/baseimage:0.11
LABEL maintainer="chevdor@gmail.com"
LABEL description="This is the 2nd stage: a very small image where we copy the Substrate binary."
ARG PROFILE=release
@@ -34,9 +33,10 @@ ARG PROFILE=release
RUN mv /usr/share/ca* /tmp && \
rm -rf /usr/share/* && \
mv /tmp/ca-certificates /usr/share/ && \
- mkdir -p /root/.local/share/Polkadot && \
- ln -s /root/.local/share/Polkadot /data && \
- useradd -m -u 1000 -U -s /bin/sh -d /substrate substrate
+ useradd -m -u 1000 -U -s /bin/sh -d /substrate substrate && \
+ mkdir -p /substrate/.local/share/substrate && \
+ chown -R substrate:substrate /substrate/.local && \
+ ln -s /substrate/.local/share/substrate /data
COPY --from=builder /substrate/target/$PROFILE/substrate /usr/local/bin
@@ -49,7 +49,7 @@ RUN rm -rf /usr/lib/python* && \
rm -rf /usr/bin /usr/sbin /usr/share/man
USER substrate
-EXPOSE 30333 9933 9944
+EXPOSE 30333 9933 9944 9615
VOLUME ["/data"]
CMD ["/usr/local/bin/substrate"]
diff --git a/.maintain/gitlab/check_runtime.sh b/.maintain/gitlab/check_runtime.sh
index 8c0720843803b61e2e2c71649c531f3d858eb57b..c7ce7d5f282d1ba2cbca54893608172c889d3404 100755
--- a/.maintain/gitlab/check_runtime.sh
+++ b/.maintain/gitlab/check_runtime.sh
@@ -54,9 +54,9 @@ fi
# consensus-critical logic that has changed. the runtime wasm blobs must be
# rebuilt.
-add_spec_version="$(git diff origin/master...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+add_spec_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
| sed -n -r "s/^\+[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
-sub_spec_version="$(git diff origin/master...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+sub_spec_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
| sed -n -r "s/^\-[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
@@ -79,9 +79,9 @@ else
# check for impl_version updates: if only the impl versions changed, we assume
# there is no consensus-critical logic that has changed.
- add_impl_version="$(git diff origin/master...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+ add_impl_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
| sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
- sub_impl_version="$(git diff origin/master...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+ sub_impl_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
| sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
diff --git a/.maintain/gitlab/check_signed.sh b/.maintain/gitlab/check_signed.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7c4cc47baba38fa41214ed0fefc7e09b75a69e7d
--- /dev/null
+++ b/.maintain/gitlab/check_signed.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# shellcheck source=lib.sh
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/lib.sh"
+
+version="$CI_COMMIT_TAG"
+
+echo '[+] Checking tag has been signed'
+check_tag "paritytech/substrate" "$version"
+case $? in
+ 0) echo '[+] Tag found and has been signed'; exit 0
+ ;;
+ 1) echo '[!] Tag found but has not been signed. Aborting release.'; exit 1
+ ;;
+ 2) echo '[!] Tag not found. Aborting release.'; exit 1
+esac
diff --git a/.maintain/gitlab/lib.sh b/.maintain/gitlab/lib.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c8b2d73e6097f42fd6590b5e3d78c537dc620028
--- /dev/null
+++ b/.maintain/gitlab/lib.sh
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+api_base="https://api.github.com/repos"
+
+# Function to take 2 git tags/commits and get any lines from commit messages
+# that contain something that looks like a PR reference: e.g., (#1234)
+sanitised_git_logs(){
+ git --no-pager log --pretty=format:"%s" "$1..$2" |
+ # Only find messages referencing a PR
+ grep -E '\(#[0-9]+\)' |
+ # Strip any asterisks
+ sed 's/^* //g' |
+ # And add them all back
+ sed 's/^/* /g'
+}
+
+# Returns the last published release on github
+# repo: 'organization/repo'
+# Usage: last_github_release "$repo"
+last_github_release(){
+ curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" \
+ -s "$api_base/$1/releases/latest" | jq '.tag_name'
+}
+
+# Checks whether a tag on github has been verified
+# repo: 'organization/repo'
+# tagver: 'v1.2.3'
+# Usage: check_tag $repo $tagver
+check_tag () {
+ repo=$1
+ tagver=$2
+ tag_out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver")
+ tag_sha=$(echo "$tag_out" | jq -r .object.sha)
+ object_url=$(echo "$tag_out" | jq -r .object.url)
+ if [ "$tag_sha" = "null" ]; then
+ return 2
+ fi
+ verified_str=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$object_url" | jq -r .verification.verified)
+ if [ "$verified_str" = "true" ]; then
+ # Verified, everything is good
+ return 0
+ else
+ # Not verified. Bad juju.
+ return 1
+ fi
+}
+
+# Checks whether a given PR has a given label.
+# repo: 'organization/repo'
+# pr_id: 12345
+# label: B1-silent
+# Usage: has_label $repo $pr_id $label
+has_label(){
+ repo="$1"
+ pr_id="$2"
+ label="$3"
+ out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$repo/pulls/$pr_id")
+ [ -n "$(echo "$out" | jq ".labels | .[] | select(.name==\"$label\")")" ]
+}
+
+# Formats a message into a JSON string for posting to Matrix
+# message: 'any plaintext message'
+# formatted_message: 'optional message formatted in html'
+# Usage: structure_message $content $formatted_content (optional)
+structure_message() {
+ if [ -z "$2" ]; then
+ body=$(jq -Rs --arg body "$1" '{"msgtype": "m.text", $body}' < /dev/null)
+ else
+ body=$(jq -Rs --arg body "$1" --arg formatted_body "$2" '{"msgtype": "m.text", $body, "format": "org.matrix.custom.html", $formatted_body}' < /dev/null)
+ fi
+ echo "$body"
+}
+
+# Post a message to a matrix room
+# body: '{body: "JSON string produced by structure_message"}'
+# room_id: !fsfSRjgjBWEWffws:matrix.parity.io
+# access_token: see https://matrix.org/docs/guides/client-server-api/
+# Usage: send_message $body (json formatted) $room_id $access_token
+send_message() {
+curl -XPOST -d "$1" "https://matrix.parity.io/_matrix/client/r0/rooms/$2/send/m.room.message?access_token=$3"
+}
diff --git a/.maintain/gitlab/publish_draft_release.sh b/.maintain/gitlab/publish_draft_release.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4f73575f5bbaf836d7e07cb43c7fd1c1173858da
--- /dev/null
+++ b/.maintain/gitlab/publish_draft_release.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+# shellcheck source=lib.sh
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/lib.sh"
+
+# Substrate labels for PRs we want to include in the release notes
+labels=(
+ 'B1-runtimenoteworthy'
+ 'B1-clientnoteworthy'
+ 'B1-apinoteworthy'
+)
+
+version="$CI_COMMIT_TAG"
+
+# Note that this is not the last *tagged* version, but the last *published* version
+last_version=$(last_github_release 'paritytech/substrate')
+echo "[+] Version: $version; Previous version: $last_version"
+
+all_changes="$(sanitised_git_logs "$last_version" "$version")"
+labelled_changes=""
+echo "[+] Iterating through $(wc -l <<< "$all_changes") changes to find labelled PRs"
+while IFS= read -r line; do
+ pr_id=$(echo "$line" | sed -E 's/.*#([0-9]+)\)$/\1/')
+
+ # Skip if the PR has the silent label - this allows us to skip a few requests
+ if has_label 'paritytech/substrate' "$pr_id" 'B0-silent'; then
+ continue
+ fi
+ for label in "${labels[@]}"; do
+ if has_label 'paritytech/substrate' "$pr_id" "$label"; then
+ labelled_changes="$labelled_changes
+$line"
+ fi
+ done
+done <<< "$all_changes"
+
+
+release_text="Substrate $version
+-----------------
+$labelled_changes"
+
+echo "[+] Release text generated: "
+echo "$release_text"
+
+echo "[+] Pushing release to github"
+# Create release on github
+release_name="Substrate $version"
+data=$(jq -Rs --arg version "$version" \
+ --arg release_name "$release_name" \
+ --arg release_text "$release_text" \
+'{
+ "tag_name": $version,
+ "target_commitish": "master",
+ "name": $release_name,
+ "body": $release_text,
+ "draft": true,
+ "prerelease": false
+}' < /dev/null)
+
+out=$(curl -s -X POST --data "$data" -H "Authorization: token $GITHUB_RELEASE_TOKEN" "$api_base/paritytech/substrate/releases")
+
+html_url=$(echo "$out" | jq -r .html_url)
+
+if [ "$html_url" == "null" ]
+then
+ echo "[!] Something went wrong posting:"
+ echo "$out"
+else
+ echo "[+] Release draft created: $html_url"
+fi
+
+echo '[+] Sending draft release URL to Matrix'
+
+msg_body=$(cat <Release pipeline for Substrate $version complete.
+Draft release created: $html_url
+EOF
+)
+send_message "$(structure_message "$msg_body" "$formatted_msg_body")" "$MATRIX_ROOM_ID" "$MATRIX_ACCESS_TOKEN"
+
+echo "[+] Done! Maybe the release worked..."
diff --git a/.maintain/sentry-node/docker-compose.yml b/.maintain/sentry-node/docker-compose.yml
index 0ca42613b4576e4405d14c78e154fc8ed6b614b1..db835b057969642c9da77a4bde57c3178745bbd3 100644
--- a/.maintain/sentry-node/docker-compose.yml
+++ b/.maintain/sentry-node/docker-compose.yml
@@ -26,6 +26,7 @@ services:
validator-a:
ports:
- "9944:9944"
+ - "9615:9615"
volumes:
- ../../target/release/substrate:/usr/local/bin/substrate
image: parity/substrate
@@ -58,6 +59,7 @@ services:
- "--no-telemetry"
- "--rpc-cors"
- "all"
+ - "--prometheus-external"
sentry-a:
image: parity/substrate
diff --git a/Cargo.lock b/Cargo.lock
index 31f97911f2b4a9dedb038301e37f263603302c64..d8b8071c883c71f4ed7eeee1090e622d7b41b8d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -61,9 +61,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "0.7.8"
+version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811"
+checksum = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec"
dependencies = [
"memchr",
]
@@ -146,7 +146,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
dependencies = [
- "quote 1.0.2",
+ "quote",
"syn",
]
@@ -212,7 +212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce6977f57fa68da77ffe5542950d47e9c23d65f5bc7cb0a9f8700996913eec7"
dependencies = [
"futures 0.3.4",
- "rustls",
+ "rustls 0.16.0",
"webpki",
"webpki-roots 0.17.0",
]
@@ -242,9 +242,9 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
[[package]]
name = "backtrace"
-version = "0.3.43"
+version = "0.3.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f"
+checksum = "e4036b9bf40f3cf16aba72a3d65e8a520fc4bafcdc7079aea8f848c58c5b5536"
dependencies = [
"backtrace-sys",
"cfg-if",
@@ -305,25 +305,26 @@ dependencies = [
[[package]]
name = "bindgen"
-version = "0.49.4"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c07087f3d5731bf3fb375a81841b99597e25dc11bd3bc72d16d43adf6624a6e"
+checksum = "99de13bb6361e01e493b3db7928085dcc474b7ba4f5481818e53a89d76b8393f"
dependencies = [
"bitflags",
"cexpr",
"cfg-if",
"clang-sys",
"clap",
- "env_logger 0.6.2",
- "fxhash",
+ "env_logger 0.7.1",
"lazy_static",
+ "lazycell",
"log 0.4.8",
"peeking_take_while",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
+ "proc-macro2",
+ "quote",
"regex",
+ "rustc-hash",
"shlex",
- "which 2.0.1",
+ "which",
]
[[package]]
@@ -421,37 +422,6 @@ dependencies = [
"slab",
]
-[[package]]
-name = "browser-utils"
-version = "0.8.0"
-dependencies = [
- "chrono",
- "clear_on_drop",
- "console_error_panic_hook",
- "console_log",
- "futures 0.1.29",
- "futures 0.3.4",
- "futures-timer 3.0.1",
- "js-sys",
- "kvdb-web",
- "libp2p",
- "log 0.4.8",
- "rand 0.6.5",
- "rand 0.7.3",
- "sc-chain-spec",
- "sc-informant",
- "sc-network",
- "sc-service",
- "wasm-bindgen",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "bs58"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c95ee6bba9d950218b6cc910cf62bc9e0a171d0f4537e3627b0f54d08549b188"
-
[[package]]
name = "bs58"
version = "0.3.0"
@@ -597,7 +567,7 @@ dependencies = [
[[package]]
name = "chain-spec-builder"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"ansi_term 0.12.1",
"node-cli",
@@ -725,7 +695,17 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
dependencies = [
- "core-foundation-sys",
+ "core-foundation-sys 0.6.2",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
+dependencies = [
+ "core-foundation-sys 0.7.0",
"libc",
]
@@ -736,26 +716,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
[[package]]
-name = "cranelift-bforest"
-version = "0.58.0"
+name = "core-foundation-sys"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0f53d59dc9ab1c8ab68c991d8406b52b7a0aab0b15b05a3a6895579c4e5dd9"
+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
+
+[[package]]
+name = "cranelift-bforest"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0381a794836fb994c47006465d46d46be072483b667f36013d993b9895117fee"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"byteorder 1.3.4",
"cranelift-bforest",
"cranelift-codegen-meta",
"cranelift-codegen-shared",
"cranelift-entity",
- "gimli 0.20.0",
+ "gimli",
"log 0.4.8",
"serde",
"smallvec 1.2.0",
@@ -765,9 +749,8 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "208c3c8d82bfef32a534c5020c6cfc3bc92f41388f1246b7bb98cf543331abaa"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-codegen-shared",
"cranelift-entity",
@@ -775,24 +758,21 @@ dependencies = [
[[package]]
name = "cranelift-codegen-shared"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea048c456a517e56fd6df8f0e3947922897e6e6f61fbc5eb557a36c7b8ff6394"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
[[package]]
name = "cranelift-entity"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8c7ed50812194c9e9de1fa39c77b39fc9ab48173d5e7ee88b25b6a8953e9b8"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21ceb931d9f919731df1b1ecdc716b5c66384b413a7f95909d1f45441ab9bef5"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-codegen",
"log 0.4.8",
@@ -802,9 +782,8 @@ dependencies = [
[[package]]
name = "cranelift-native"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "564ee82268bc25b914fcf331edfc2452f2d9ca34f976b187b4ca668beba250c8"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-codegen",
"raw-cpuid",
@@ -813,9 +792,8 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de63e2271b374be5b07f359184e2126a08fb24d24a740cbc178b7e0107ddafa5"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -823,7 +801,7 @@ dependencies = [
"log 0.4.8",
"serde",
"thiserror",
- "wasmparser 0.48.2",
+ "wasmparser",
]
[[package]]
@@ -910,33 +888,36 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.4.0"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
+checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
dependencies = [
"crossbeam-utils",
+ "maybe-uninit",
]
[[package]]
name = "crossbeam-deque"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
+ "maybe-uninit",
]
[[package]]
name = "crossbeam-epoch"
-version = "0.8.0"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
dependencies = [
- "autocfg 0.1.7",
+ "autocfg 1.0.0",
"cfg-if",
"crossbeam-utils",
"lazy_static",
+ "maybe-uninit",
"memoffset",
"scopeguard",
]
@@ -953,11 +934,11 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
dependencies = [
- "autocfg 0.1.7",
+ "autocfg 1.0.0",
"cfg-if",
"lazy_static",
]
@@ -993,9 +974,9 @@ dependencies = [
[[package]]
name = "csv-core"
-version = "0.1.6"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
dependencies = [
"memchr",
]
@@ -1011,11 +992,11 @@ dependencies = [
[[package]]
name = "ctor"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc"
+checksum = "47c5e5ac752e18207b12e16b10631ae5f7f68f8805f335f9b817ead83d9ffce1"
dependencies = [
- "quote 1.0.2",
+ "quote",
"syn",
]
@@ -1067,18 +1048,18 @@ dependencies = [
[[package]]
name = "data-encoding"
-version = "2.1.2"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f47ca1860a761136924ddd2422ba77b2ea54fe8cc75b9040804a0d9d32ad97"
+checksum = "11c0346158a19b3627234e15596f5e465c360fcdb97d817bcb255e0510f5a788"
[[package]]
name = "derive_more"
-version = "0.99.2"
+version = "0.99.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8"
+checksum = "a806e96c59a76a5ba6e18735b6cf833344671e61e7863f2edb5c518ea2cac95c"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -1168,8 +1149,8 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecf634c5213044b8d54a46dd282cf5dd1f86bb5cb53e92c409cb4680a7fb9894"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -1247,6 +1228,33 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "ethbloom"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32cfe1c169414b709cf28aa30c74060bdb830a03a8ba473314d079ac79d80a5f"
+dependencies = [
+ "crunchy",
+ "fixed-hash",
+ "impl-rlp",
+ "impl-serde 0.2.3",
+ "tiny-keccak 1.5.0",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba744248e3553a393143d5ebb68939fc3a4ec0c22a269682535f5ffe7fed728c"
+dependencies = [
+ "ethbloom",
+ "fixed-hash",
+ "impl-rlp",
+ "impl-serde 0.2.3",
+ "primitive-types",
+ "uint",
+]
+
[[package]]
name = "evm"
version = "0.15.0"
@@ -1320,9 +1328,9 @@ dependencies = [
[[package]]
name = "failure"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
+checksum = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b"
dependencies = [
"backtrace",
"failure_derive",
@@ -1330,12 +1338,12 @@ dependencies = [
[[package]]
name = "failure_derive"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
+checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
"synstructure",
]
@@ -1441,24 +1449,28 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fork-tree"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
]
[[package]]
name = "frame-benchmarking"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
+ "frame-support",
+ "frame-system",
"parity-scale-codec",
"sp-api",
+ "sp-io",
+ "sp-runtime",
"sp-runtime-interface",
"sp-std",
]
[[package]]
name = "frame-benchmarking-cli"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-benchmarking",
"parity-scale-codec",
@@ -1468,12 +1480,13 @@ dependencies = [
"sc-executor",
"sc-service",
"sp-runtime",
+ "sp-state-machine",
"structopt",
]
[[package]]
name = "frame-executive"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -1491,7 +1504,7 @@ dependencies = [
[[package]]
name = "frame-metadata"
-version = "11.0.0"
+version = "11.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"serde",
@@ -1501,7 +1514,7 @@ dependencies = [
[[package]]
name = "frame-support"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"bitmask",
"frame-metadata",
@@ -1526,37 +1539,37 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support-procedural-tools",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "frame-support-procedural-tools"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "frame-support-procedural-tools-derive"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "frame-support-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -1572,7 +1585,7 @@ dependencies = [
[[package]]
name = "frame-system"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"criterion 0.2.11",
"frame-support",
@@ -1590,7 +1603,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -1749,8 +1762,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
dependencies = [
"proc-macro-hack",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -1774,9 +1787,9 @@ checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6"
[[package]]
name = "futures-timer"
-version = "3.0.1"
+version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de1a2b2a2a33d9e60e17980b60ee061eeaae96a5abe9121db0fdb9af167a1c5"
+checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
dependencies = [
"gloo-timers",
"send_wrapper 0.4.0",
@@ -1827,15 +1840,6 @@ dependencies = [
"pin-project",
]
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder 1.3.4",
-]
-
[[package]]
name = "gcc"
version = "0.3.55"
@@ -1885,27 +1889,18 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "gimli"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00"
-dependencies = [
- "arrayvec 0.4.12",
- "byteorder 1.3.4",
- "fallible-iterator",
- "indexmap",
- "stable_deref_trait",
-]
-
[[package]]
name = "gimli"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81dd6190aad0f05ddbbf3245c54ed14ca4aa6dd32f22312b70d8f168c3e3e633"
dependencies = [
+ "arrayvec 0.5.1",
"byteorder 1.3.4",
+ "fallible-iterator",
"indexmap",
+ "smallvec 1.2.0",
+ "stable_deref_trait",
]
[[package]]
@@ -1990,7 +1985,7 @@ dependencies = [
"indexmap",
"log 0.4.8",
"slab",
- "tokio 0.2.11",
+ "tokio 0.2.12",
"tokio-util",
]
@@ -2009,12 +2004,6 @@ dependencies = [
"crunchy",
]
-[[package]]
-name = "hashbrown"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
-
[[package]]
name = "hashbrown"
version = "0.6.3"
@@ -2036,18 +2025,18 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.1.6"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
dependencies = [
"libc",
]
[[package]]
name = "hex"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76cdda6bf525062a0c9e8f14ee2b37935c86b8efb6c8b69b3c83dfb518a914af"
+checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
[[package]]
name = "hex-literal"
@@ -2216,24 +2205,25 @@ dependencies = [
"net2",
"pin-project",
"time",
- "tokio 0.2.11",
+ "tokio 0.2.12",
"tower-service",
"want 0.3.0",
]
[[package]]
name = "hyper-rustls"
-version = "0.19.1"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ea6215c7314d450ee45970ab8b3851ab447a0e6bafdd19e31b20a42dbb7faf"
+checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
dependencies = [
"bytes 0.5.4",
"ct-logs",
"futures-util",
"hyper 0.13.2",
- "rustls",
+ "log 0.4.8",
+ "rustls 0.17.0",
"rustls-native-certs",
- "tokio 0.2.11",
+ "tokio 0.2.12",
"tokio-rustls",
"webpki",
]
@@ -2315,8 +2305,8 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -2438,8 +2428,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058"
dependencies = [
"proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -2620,9 +2610,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
[[package]]
name = "libc"
-version = "0.2.66"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
[[package]]
name = "libloading"
@@ -2636,9 +2626,9 @@ dependencies = [
[[package]]
name = "libp2p"
-version = "0.16.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a58becf0b9585fcfbb8215bbe6e6ac187fcc180fd1026925ca180c845aa5a6e8"
+checksum = "bba17ee9cac4bb89de5812159877d9b4f0a993bf41697a5a875940cd1eb71f24"
dependencies = [
"bytes 0.5.4",
"futures 0.3.4",
@@ -2664,8 +2654,8 @@ dependencies = [
"libp2p-wasm-ext",
"libp2p-websocket",
"libp2p-yamux",
- "parity-multiaddr 0.7.2",
- "parity-multihash 0.2.3",
+ "parity-multiaddr",
+ "parity-multihash",
"parking_lot 0.10.0",
"pin-project",
"smallvec 1.2.0",
@@ -2679,17 +2669,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b874594c4b29de1a29f27871feba8e6cd13aa54a8a1e8f8c7cf3dfac5ca287c"
dependencies = [
"asn1_der",
- "bs58 0.3.0",
+ "bs58",
"ed25519-dalek",
"fnv",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"lazy_static",
"libsecp256k1",
"log 0.4.8",
"multistream-select",
- "parity-multiaddr 0.7.2",
- "parity-multihash 0.2.3",
+ "parity-multiaddr",
+ "parity-multihash",
"parking_lot 0.10.0",
"pin-project",
"prost",
@@ -2700,7 +2690,7 @@ dependencies = [
"sha2",
"smallvec 1.2.0",
"thiserror",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
"void",
"zeroize 1.1.0",
]
@@ -2711,7 +2701,7 @@ version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d472e9d522f588805c77801de10b957be84e10f019ca5f869fa1825b15ea9b"
dependencies = [
- "quote 1.0.2",
+ "quote",
"syn",
]
@@ -2769,13 +2759,13 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log 0.4.8",
- "lru 0.4.3",
+ "lru",
"prost",
"prost-build",
"rand 0.7.3",
"sha2",
"smallvec 1.2.0",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
"wasm-timer",
]
@@ -2797,9 +2787,9 @@ dependencies = [
[[package]]
name = "libp2p-kad"
-version = "0.16.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2efcff2af085e8181c421f68fe9c2b0a067379d146731925b3ac8f8e605c458"
+checksum = "464dc8412978d40f0286be72ed9ab5e0e1386a4a06e7f174526739b5c3c1f041"
dependencies = [
"arrayvec 0.5.1",
"bytes 0.5.4",
@@ -2810,14 +2800,14 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log 0.4.8",
- "parity-multihash 0.2.3",
+ "parity-multihash",
"prost",
"prost-build",
"rand 0.7.3",
"sha2",
"smallvec 1.2.0",
"uint",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
"void",
"wasm-timer",
]
@@ -2857,16 +2847,16 @@ dependencies = [
"libp2p-core",
"log 0.4.8",
"parking_lot 0.10.0",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
]
[[package]]
name = "libp2p-noise"
-version = "0.16.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac7d33809afdf6794f09fdb2f9f94e1550ae230be5bae6430a078eb96fc9e5a6"
+checksum = "b15a8a3d71f898beb6f854c8aae27aa1d198e0d1f2e49412261c2d90ef39675a"
dependencies = [
- "curve25519-dalek 1.2.3",
+ "curve25519-dalek 2.0.0",
"futures 0.3.4",
"lazy_static",
"libp2p-core",
@@ -2877,7 +2867,7 @@ dependencies = [
"sha2",
"snow",
"static_assertions",
- "x25519-dalek 0.5.2",
+ "x25519-dalek",
"zeroize 1.1.0",
]
@@ -2910,7 +2900,7 @@ dependencies = [
"prost",
"prost-build",
"rw-stream-sink",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
"void",
]
@@ -2930,9 +2920,9 @@ dependencies = [
[[package]]
name = "libp2p-secio"
-version = "0.16.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec00eb9a3404ed76a0e14f637edcaa7f2b4a27a16884da4a56f2f21e166c2843"
+checksum = "1219e9ecb4945d7331a05f5ffe96a1f6e28051bfa1223d4c60353c251de0354e"
dependencies = [
"aes-ctr",
"ctr",
@@ -2960,9 +2950,9 @@ dependencies = [
[[package]]
name = "libp2p-swarm"
-version = "0.16.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e9f4fb84a4bfe3d3a361c1fbcd4af017ba68f0a46a77bfbcc48bf8a456d6ef"
+checksum = "275471e7c0e88ae004660866cd54f603bd8bd1f4caef541a27f50dd8640c4d4c"
dependencies = [
"futures 0.3.4",
"libp2p-core",
@@ -2980,7 +2970,7 @@ checksum = "f9e80ad4e3535345f3d666554ce347d3100453775611c05c60786bf9a1747a10"
dependencies = [
"async-std",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"get_if_addrs",
"ipnet",
"libp2p-core",
@@ -3001,9 +2991,9 @@ dependencies = [
[[package]]
name = "libp2p-wasm-ext"
-version = "0.16.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39703653caa36f4afd0def39cc49a3ac0fa1d4289ca1802e417af03e4f5ef950"
+checksum = "923581c055bc4b8c5f42d4ce5ef43e52fe5216f1ea4bc26476cb8a966ce6220b"
dependencies = [
"futures 0.3.4",
"js-sys",
@@ -3026,7 +3016,7 @@ dependencies = [
"libp2p-core",
"log 0.4.8",
"quicksink",
- "rustls",
+ "rustls 0.16.0",
"rw-stream-sink",
"soketto",
"url 2.1.1",
@@ -3036,9 +3026,9 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
-version = "0.16.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f72aa5a7273c29c6eaea09108a49feaefc7456164863f64f86a193f9e78a4b7f"
+checksum = "9dac30de24ccde0e67f363d71a125c587bbe6589503f664947e9b084b68a34f1"
dependencies = [
"futures 0.3.4",
"libp2p-core",
@@ -3049,9 +3039,9 @@ dependencies = [
[[package]]
name = "librocksdb-sys"
-version = "6.2.4"
+version = "6.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0785e816e1e11e7599388a492c61ef80ddc2afc91e313e61662cce537809be"
+checksum = "4e3b727e2dd20ec2fb7ed93f23d9fd5328a0871185485ebdaff007b47d3e27e4"
dependencies = [
"bindgen",
"cc",
@@ -3129,22 +3119,13 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "lru"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8f669d42c72d18514dfca8115689c5f6370a17d980cb5bd777a67f404594c8"
-dependencies = [
- "hashbrown 0.5.0",
-]
-
[[package]]
name = "lru"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237"
dependencies = [
- "hashbrown 0.6.3",
+ "hashbrown",
]
[[package]]
@@ -3170,12 +3151,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
[[package]]
name = "memchr"
-version = "2.3.0"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
-dependencies = [
- "libc",
-]
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
[[package]]
name = "memoffset"
@@ -3194,7 +3172,7 @@ checksum = "198831fe8722331a395bc199a5d08efbc197497ef354cb4c77b969c02ffc0fc4"
dependencies = [
"ahash",
"hash-db",
- "hashbrown 0.6.3",
+ "hashbrown",
"parity-util-mem",
]
@@ -3311,7 +3289,7 @@ dependencies = [
"log 0.4.8",
"smallvec 1.2.0",
"tokio-io",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
]
[[package]]
@@ -3336,8 +3314,8 @@ dependencies = [
"openssl-probe",
"openssl-sys",
"schannel",
- "security-framework",
- "security-framework-sys",
+ "security-framework 0.3.4",
+ "security-framework-sys 0.3.3",
"tempfile",
]
@@ -3367,10 +3345,9 @@ dependencies = [
[[package]]
name = "node-cli"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"assert_cmd",
- "browser-utils",
"frame-benchmarking-cli",
"frame-support",
"frame-system",
@@ -3414,6 +3391,7 @@ dependencies = [
"sc-tracing",
"sc-transaction-pool",
"serde",
+ "serde_json",
"sp-authority-discovery",
"sp-consensus",
"sp-consensus-babe",
@@ -3427,6 +3405,7 @@ dependencies = [
"sp-timestamp",
"sp-transaction-pool",
"structopt",
+ "substrate-browser-utils",
"substrate-build-script-utils",
"tempfile",
"tracing",
@@ -3437,7 +3416,7 @@ dependencies = [
[[package]]
name = "node-executor"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"criterion 0.3.1",
"frame-benchmarking",
@@ -3459,6 +3438,7 @@ dependencies = [
"sc-executor",
"sp-application-crypto",
"sp-core",
+ "sp-externalities",
"sp-io",
"sp-runtime",
"sp-state-machine",
@@ -3470,7 +3450,7 @@ dependencies = [
[[package]]
name = "node-inspect"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"log 0.4.8",
@@ -3486,7 +3466,7 @@ dependencies = [
[[package]]
name = "node-primitives"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"pretty_assertions",
"sp-core",
@@ -3496,7 +3476,7 @@ dependencies = [
[[package]]
name = "node-rpc"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"jsonrpc-core",
"node-primitives",
@@ -3519,7 +3499,7 @@ dependencies = [
[[package]]
name = "node-rpc-client"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"env_logger 0.7.1",
"futures 0.1.29",
@@ -3532,7 +3512,7 @@ dependencies = [
[[package]]
name = "node-runtime"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-benchmarking",
"frame-executive",
@@ -3594,7 +3574,7 @@ dependencies = [
[[package]]
name = "node-template"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"futures 0.3.4",
"log 0.4.8",
@@ -3602,6 +3582,7 @@ dependencies = [
"sc-basic-authorship",
"sc-cli",
"sc-client",
+ "sc-client-api",
"sc-consensus-aura",
"sc-executor",
"sc-finality-grandpa",
@@ -3622,7 +3603,7 @@ dependencies = [
[[package]]
name = "node-template-runtime"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-executive",
"frame-support",
@@ -3630,7 +3611,6 @@ dependencies = [
"pallet-aura",
"pallet-balances",
"pallet-grandpa",
- "pallet-indices",
"pallet-randomness-collective-flip",
"pallet-sudo",
"pallet-template",
@@ -3655,7 +3635,7 @@ dependencies = [
[[package]]
name = "node-testing"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"criterion 0.3.1",
"frame-support",
@@ -3676,6 +3656,7 @@ dependencies = [
"pallet-transaction-payment",
"pallet-treasury",
"parity-scale-codec",
+ "sc-block-builder",
"sc-cli",
"sc-client",
"sc-client-api",
@@ -3694,16 +3675,17 @@ dependencies = [
"sp-runtime",
"sp-timestamp",
"substrate-test-client",
- "tempdir",
+ "tempfile",
"wabt",
]
[[package]]
name = "node-transaction-factory"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"log 0.4.8",
"parity-scale-codec",
+ "sc-block-builder",
"sc-cli",
"sc-client",
"sc-client-api",
@@ -3738,6 +3720,15 @@ dependencies = [
"version_check 0.1.5",
]
+[[package]]
+name = "ntapi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26e041cd983acbc087e30fcba770380cfa352d0e392e175b2344ebaf7ea0602"
+dependencies = [
+ "winapi 0.3.8",
+]
+
[[package]]
name = "num-bigint"
version = "0.2.6"
@@ -3790,6 +3781,20 @@ dependencies = [
"libc",
]
+[[package]]
+name = "object"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea44a4fd660ab0f38434934ca0212e90fbeaaee54126ef20a3451c30c95bafae"
+dependencies = [
+ "flate2",
+ "goblin",
+ "parity-wasm 0.41.0",
+ "scroll",
+ "target-lexicon",
+ "uuid",
+]
+
[[package]]
name = "ole32-sys"
version = "0.2.0"
@@ -3865,16 +3870,16 @@ dependencies = [
[[package]]
name = "owning_ref"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
+checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
dependencies = [
"stable_deref_trait",
]
[[package]]
name = "pallet-assets"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3888,7 +3893,7 @@ dependencies = [
[[package]]
name = "pallet-aura"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3910,7 +3915,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3928,7 +3933,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3944,7 +3949,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3969,7 +3974,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3983,9 +3988,23 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-benchmark"
+version = "2.0.0-alpha.3"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "serde",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-collective"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4001,7 +4020,7 @@ dependencies = [
[[package]]
name = "pallet-contracts"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"assert_matches",
"frame-support",
@@ -4026,7 +4045,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-primitives"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -4035,7 +4054,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -4054,7 +4073,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc-runtime-api"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"pallet-contracts-primitives",
"parity-scale-codec",
@@ -4065,7 +4084,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4082,7 +4101,7 @@ dependencies = [
[[package]]
name = "pallet-elections"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4098,7 +4117,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4116,7 +4135,7 @@ dependencies = [
[[package]]
name = "pallet-evm"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"evm",
"frame-support",
@@ -4136,8 +4155,9 @@ dependencies = [
[[package]]
name = "pallet-example"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"pallet-balances",
@@ -4149,9 +4169,24 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-example-offchain-worker"
+version = "2.0.0-alpha.3"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "serde",
+ "serde_json",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-finality-tracker"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4168,7 +4203,7 @@ dependencies = [
[[package]]
name = "pallet-generic-asset"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4182,7 +4217,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4200,7 +4235,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -4217,7 +4252,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4235,7 +4270,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4251,7 +4286,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4265,7 +4300,7 @@ dependencies = [
[[package]]
name = "pallet-nicks"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4280,7 +4315,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4296,7 +4331,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4310,7 +4345,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"enumflags2",
"frame-support",
@@ -4326,7 +4361,7 @@ dependencies = [
[[package]]
name = "pallet-scored-pool"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4341,7 +4376,7 @@ dependencies = [
[[package]]
name = "pallet-session"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4361,7 +4396,7 @@ dependencies = [
[[package]]
name = "pallet-society"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4377,7 +4412,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4400,18 +4435,18 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"sp-runtime",
"syn",
]
[[package]]
name = "pallet-sudo"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4425,7 +4460,7 @@ dependencies = [
[[package]]
name = "pallet-template"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4438,7 +4473,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4456,7 +4491,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4471,7 +4506,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -4488,7 +4523,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -4501,7 +4536,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4516,7 +4551,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4531,9 +4566,10 @@ dependencies = [
[[package]]
name = "pallet-vesting"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"enumflags2",
+ "frame-benchmarking",
"frame-support",
"frame-system",
"hex-literal",
@@ -4555,55 +4591,22 @@ checksum = "0c276d76c5333b8c2579e02d49a06733a55b8282d2d9b13e8d53b6406bd7e30a"
[[package]]
name = "parity-multiaddr"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045b3c7af871285146300da35b1932bb6e4639b66c7c98e85d06a32cbc4e8fa7"
-dependencies = [
- "arrayref",
- "bs58 0.2.5",
- "byteorder 1.3.4",
- "bytes 0.4.12",
- "data-encoding",
- "parity-multihash 0.1.3",
- "percent-encoding 1.0.1",
- "serde",
- "unsigned-varint 0.2.3",
- "url 1.7.2",
-]
-
-[[package]]
-name = "parity-multiaddr"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26df883298bc3f4e92528b4c5cc9f806b791955b136da3e5e939ed9de0fd958b"
+checksum = "f77055f9e81921a8cc7bebeb6cded3d128931d51f1e3dd6251f0770a6d431477"
dependencies = [
"arrayref",
- "bs58 0.3.0",
+ "bs58",
"byteorder 1.3.4",
"data-encoding",
- "parity-multihash 0.2.3",
+ "parity-multihash",
"percent-encoding 2.1.0",
"serde",
"static_assertions",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
"url 2.1.1",
]
-[[package]]
-name = "parity-multihash"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3a17dc27848fd99e4f87eb0f8c9baba6ede0a6d555400c850ca45254ef4ce3"
-dependencies = [
- "blake2",
- "bytes 0.4.12",
- "rand 0.6.5",
- "sha-1",
- "sha2",
- "sha3",
- "unsigned-varint 0.2.3",
-]
-
[[package]]
name = "parity-multihash"
version = "0.2.3"
@@ -4616,14 +4619,14 @@ dependencies = [
"sha-1",
"sha2",
"sha3",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
]
[[package]]
name = "parity-scale-codec"
-version = "1.1.2"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f747c06d9f3b2ad387ac881b9667298c81b1243aa9833f086e05996937c35507"
+checksum = "f509c5e67ca0605ee17dcd3f91ef41cadd685c75a298fb6261b781a5acb3f910"
dependencies = [
"arrayvec 0.5.1",
"bitvec",
@@ -4634,13 +4637,13 @@ dependencies = [
[[package]]
name = "parity-scale-codec-derive"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34e513ff3e406f3ede6796dcdc83d0b32ffb86668cea1ccf7363118abeb00476"
+checksum = "5a0ec292e92e8ec7c58e576adacc1e3f399c597c8f263c42f18420abe58e7245"
dependencies = [
"proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -4657,7 +4660,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef1476e40bf8f5c6776e9600983435821ca86eb9819d74a6207cca69d091406a"
dependencies = [
"cfg-if",
+ "ethereum-types",
+ "hashbrown",
"impl-trait-for-tuples",
+ "lru",
"parity-util-mem-derive",
"parking_lot 0.10.0",
"primitive-types",
@@ -4671,7 +4677,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
dependencies = [
- "proc-macro2 1.0.8",
+ "proc-macro2",
"syn",
"synstructure",
]
@@ -4743,9 +4749,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49"
+checksum = "63e1afe738d71b1ebab5f1207c055054015427dbfc7bbe9ee1266894156ec046"
dependencies = [
"paste-impl",
"proc-macro-hack",
@@ -4753,13 +4759,13 @@ dependencies = [
[[package]]
name = "paste-impl"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5"
+checksum = "6d4dc4a7f6f743211c5aab239640a65091535d97d43d92a52bca435a640892bb"
dependencies = [
"proc-macro-hack",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -4822,8 +4828,8 @@ version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -4871,9 +4877,9 @@ checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
[[package]]
name = "predicates"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4"
+checksum = "1188bf092c81c18228c383b190c069a8a613c18a046ffa9fdfc0f5fc8fb2da8a"
dependencies = [
"difference",
"predicates-core",
@@ -4931,25 +4937,25 @@ dependencies = [
[[package]]
name = "proc-macro-error"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875077759af22fa20b610ad4471d8155b321c89c3f2785526c9839b099be4e0a"
+checksum = "052b3c9af39c7e5e94245f820530487d19eb285faedcb40e0c3275132293f242"
dependencies = [
"proc-macro-error-attr",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"rustversion",
"syn",
]
[[package]]
name = "proc-macro-error-attr"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5717d9fa2664351a01ed73ba5ef6df09c01a521cb42cb65a061432a826f3c7a"
+checksum = "d175bef481c7902e63e3165627123fff3502f06ac043d3ef42d08c1246da9253"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"rustversion",
"syn",
"syn-mid",
@@ -4961,8 +4967,8 @@ version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -4974,20 +4980,11 @@ checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
[[package]]
name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
dependencies = [
- "unicode-xid 0.2.0",
+ "unicode-xid",
]
[[package]]
@@ -5004,19 +5001,6 @@ dependencies = [
"spin",
]
-[[package]]
-name = "prometheus-exporter"
-version = "0.8.0"
-dependencies = [
- "async-std",
- "derive_more",
- "futures-util",
- "hyper 0.13.2",
- "log 0.4.8",
- "prometheus",
- "tokio 0.2.11",
-]
-
[[package]]
name = "prost"
version = "0.6.1"
@@ -5042,7 +5026,7 @@ dependencies = [
"prost",
"prost-types",
"tempfile",
- "which 3.1.0",
+ "which",
]
[[package]]
@@ -5053,8 +5037,8 @@ checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
dependencies = [
"anyhow",
"itertools",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -5116,20 +5100,11 @@ dependencies = [
[[package]]
name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
dependencies = [
- "proc-macro2 1.0.8",
+ "proc-macro2",
]
[[package]]
@@ -5518,16 +5493,29 @@ dependencies = [
"webpki",
]
+[[package]]
+name = "rustls"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
+dependencies = [
+ "base64 0.11.0",
+ "log 0.4.8",
+ "ring",
+ "sct",
+ "webpki",
+]
+
[[package]]
name = "rustls-native-certs"
-version = "0.1.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ffebdbb48c14f84eba0b715197d673aff1dd22cc1007ca647e28483bbcc307"
+checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
dependencies = [
"openssl-probe",
- "rustls",
+ "rustls 0.17.0",
"schannel",
- "security-framework",
+ "security-framework 0.4.1",
]
[[package]]
@@ -5536,8 +5524,8 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3bba175698996010c4f6dce5e7f173b6eb781fce25d2cfc45e27091ce0b79f6"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -5604,13 +5592,13 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
- "bytes 0.4.12",
+ "bytes 0.5.4",
"derive_more",
"env_logger 0.7.1",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"libp2p",
"log 0.4.8",
"parity-scale-codec",
@@ -5628,19 +5616,19 @@ dependencies = [
"sp-blockchain",
"sp-core",
"sp-runtime",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime-client",
]
[[package]]
name = "sc-basic-authorship"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"futures 0.3.4",
"log 0.4.8",
"parity-scale-codec",
"parking_lot 0.10.0",
"sc-block-builder",
- "sc-client",
"sc-client-api",
"sc-telemetry",
"sc-transaction-pool",
@@ -5657,7 +5645,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -5668,11 +5656,13 @@ dependencies = [
"sp-core",
"sp-runtime",
"sp-state-machine",
+ "sp-trie",
+ "substrate-test-runtime-client",
]
[[package]]
name = "sc-chain-spec"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"impl-trait-for-tuples",
"sc-chain-spec-derive",
@@ -5686,17 +5676,17 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "sc-cli"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"ansi_term 0.12.1",
"app_dirs",
@@ -5711,7 +5701,6 @@ dependencies = [
"log 0.4.8",
"names",
"parity-util-mem",
- "prometheus-exporter",
"regex",
"rpassword",
"sc-client-api",
@@ -5728,14 +5717,15 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"structopt",
+ "substrate-prometheus-endpoint",
"tempfile",
"time",
- "tokio 0.2.11",
+ "tokio 0.2.12",
]
[[package]]
name = "sc-client"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"env_logger 0.7.1",
@@ -5765,6 +5755,7 @@ dependencies = [
"sp-std",
"sp-trie",
"sp-version",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
"tracing",
@@ -5772,7 +5763,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"fnv",
@@ -5795,6 +5786,7 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-std",
+ "sp-storage",
"sp-test-primitives",
"sp-transaction-pool",
"sp-trie",
@@ -5803,7 +5795,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"env_logger 0.7.1",
"hash-db",
@@ -5828,22 +5820,23 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-trie",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
]
[[package]]
name = "sc-consensus-aura"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"env_logger 0.7.1",
- "futures 0.1.29",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"log 0.4.8",
"parity-scale-codec",
"parking_lot 0.10.0",
+ "sc-block-builder",
"sc-client",
"sc-client-api",
"sc-consensus-slots",
@@ -5868,19 +5861,17 @@ dependencies = [
"sp-version",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.1.22",
]
[[package]]
name = "sc-consensus-babe"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"env_logger 0.7.1",
"fork-tree",
- "futures 0.1.29",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"log 0.4.8",
"merlin",
"num-bigint",
@@ -5919,12 +5910,11 @@ dependencies = [
"sp-version",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.1.22",
]
[[package]]
name = "sc-consensus-babe-rpc"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
@@ -5949,7 +5939,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -5961,7 +5951,7 @@ dependencies = [
[[package]]
name = "sc-consensus-manual-seal"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"env_logger 0.7.1",
@@ -5984,12 +5974,12 @@ dependencies = [
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
"tempfile",
- "tokio 0.2.11",
+ "tokio 0.2.12",
]
[[package]]
name = "sc-consensus-pow"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
@@ -6009,10 +5999,10 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"log 0.4.8",
"parity-scale-codec",
"parking_lot 0.10.0",
@@ -6030,7 +6020,7 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"log 0.4.8",
"sc-client-api",
@@ -6043,7 +6033,7 @@ dependencies = [
[[package]]
name = "sc-executor"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"assert_matches",
"derive_more",
@@ -6062,6 +6052,7 @@ dependencies = [
"sp-externalities",
"sp-io",
"sp-panic-handler",
+ "sp-runtime",
"sp-runtime-interface",
"sp-serializer",
"sp-state-machine",
@@ -6076,7 +6067,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"log 0.4.8",
@@ -6091,7 +6082,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"log 0.4.8",
"parity-scale-codec",
@@ -6106,37 +6097,37 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"assert_matches",
"log 0.4.8",
"parity-scale-codec",
"parity-wasm 0.41.0",
"sc-executor-common",
+ "scoped-tls",
"sp-allocator",
"sp-core",
"sp-runtime-interface",
"sp-wasm-interface",
- "wasmi",
"wasmtime",
]
[[package]]
name = "sc-finality-grandpa"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"assert_matches",
"env_logger 0.7.1",
"finality-grandpa",
"fork-tree",
- "futures 0.1.29",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"log 0.4.8",
"parity-scale-codec",
"parking_lot 0.10.0",
"pin-project",
"rand 0.7.3",
+ "sc-block-builder",
"sc-client",
"sc-client-api",
"sc-keystore",
@@ -6157,14 +6148,15 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"sp-state-machine",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.1.22",
+ "tokio 0.2.12",
]
[[package]]
name = "sc-informant"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"ansi_term 0.12.1",
"futures 0.3.4",
@@ -6180,7 +6172,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"hex",
@@ -6195,7 +6187,7 @@ dependencies = [
[[package]]
name = "sc-network"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"assert_matches",
"async-std",
@@ -6208,16 +6200,17 @@ dependencies = [
"fnv",
"fork-tree",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"futures_codec",
"libp2p",
"linked-hash-map",
"linked_hash_set",
"log 0.4.8",
- "lru 0.4.3",
+ "lru",
"nohash-hasher",
"parity-scale-codec",
"parking_lot 0.10.0",
+ "pin-project",
"prost",
"prost-build",
"quickcheck",
@@ -6240,12 +6233,12 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"sp-test-primitives",
- "substrate-test-client",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime",
"substrate-test-runtime-client",
"tempfile",
"thiserror",
- "unsigned-varint 0.3.0",
+ "unsigned-varint",
"void",
"wasm-timer",
"zeroize 1.1.0",
@@ -6253,15 +6246,13 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
- "futures 0.1.29",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"libp2p",
"log 0.4.8",
- "lru 0.1.17",
- "parking_lot 0.10.0",
+ "lru",
"sc-network",
"sp-runtime",
"wasm-timer",
@@ -6269,12 +6260,11 @@ dependencies = [
[[package]]
name = "sc-network-test"
-version = "0.8.0"
+version = "0.8.0-dev"
dependencies = [
"env_logger 0.7.1",
- "futures 0.1.29",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"libp2p",
"log 0.4.8",
"parking_lot 0.10.0",
@@ -6291,18 +6281,18 @@ dependencies = [
"substrate-test-runtime",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.1.22",
]
[[package]]
name = "sc-offchain"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"bytes 0.5.4",
"env_logger 0.7.1",
+ "fdlimit",
"fnv",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"hyper 0.13.2",
"hyper-rustls",
"log 0.4.8",
@@ -6322,12 +6312,12 @@ dependencies = [
"sp-transaction-pool",
"substrate-test-runtime-client",
"threadpool",
- "tokio 0.2.11",
+ "tokio 0.2.12",
]
[[package]]
name = "sc-peerset"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"futures 0.3.4",
"libp2p",
@@ -6339,7 +6329,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"assert_matches",
"futures 0.1.29",
@@ -6351,6 +6341,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.10.0",
"rustc-hex",
+ "sc-block-builder",
"sc-client",
"sc-client-api",
"sc-executor",
@@ -6376,7 +6367,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
@@ -6398,7 +6389,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"jsonrpc-core",
"jsonrpc-http-server",
@@ -6412,7 +6403,7 @@ dependencies = [
[[package]]
name = "sc-runtime-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"sp-allocator",
"sp-core",
@@ -6425,21 +6416,20 @@ dependencies = [
[[package]]
name = "sc-service"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"exit-future",
"futures 0.1.29",
"futures 0.3.4",
"futures-diagnose",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"lazy_static",
"log 0.4.8",
- "parity-multiaddr 0.5.0",
+ "parity-multiaddr",
"parity-scale-codec",
"parity-util-mem",
"parking_lot 0.10.0",
- "prometheus-exporter",
"sc-chain-spec",
"sc-client",
"sc-client-api",
@@ -6468,17 +6458,17 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-transaction-pool",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"sysinfo",
"target_info",
- "tokio 0.2.11",
"tracing",
"wasm-timer",
]
[[package]]
name = "sc-service-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"env_logger 0.7.1",
"fdlimit",
@@ -6498,22 +6488,25 @@ dependencies = [
[[package]]
name = "sc-state-db"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"env_logger 0.7.1",
"log 0.4.8",
"parity-scale-codec",
+ "parity-util-mem",
+ "parity-util-mem-derive",
"parking_lot 0.10.0",
+ "sc-client-api",
"sp-core",
]
[[package]]
name = "sc-telemetry"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"bytes 0.5.4",
"futures 0.3.4",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"libp2p",
"log 0.4.8",
"parking_lot 0.10.0",
@@ -6530,7 +6523,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"erased-serde",
"log 0.4.8",
@@ -6545,7 +6538,7 @@ dependencies = [
[[package]]
name = "sc-transaction-graph"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"assert_matches",
"criterion 0.3.1",
@@ -6567,7 +6560,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
@@ -6618,10 +6611,16 @@ dependencies = [
]
[[package]]
-name = "scopeguard"
+name = "scoped-tls"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scroll"
@@ -6638,8 +6637,8 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -6659,10 +6658,22 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
dependencies = [
- "core-foundation",
- "core-foundation-sys",
+ "core-foundation 0.6.4",
+ "core-foundation-sys 0.6.2",
"libc",
- "security-framework-sys",
+ "security-framework-sys 0.3.3",
+]
+
+[[package]]
+name = "security-framework"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97bbedbe81904398b6ebb054b3e912f99d55807125790f3198ac990d98def5b0"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.7.0",
+ "core-foundation-sys 0.7.0",
+ "security-framework-sys 0.4.1",
]
[[package]]
@@ -6671,7 +6682,17 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
dependencies = [
- "core-foundation-sys",
+ "core-foundation-sys 0.6.2",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06fd2f23e31ef68dd2328cc383bd493142e46107a3a0e24f7d734e3f3b80fe4c"
+dependencies = [
+ "core-foundation-sys 0.7.0",
+ "libc",
]
[[package]]
@@ -6732,16 +6753,16 @@ version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "serde_json"
-version = "1.0.47"
+version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15913895b61e0be854afd32fd4163fcd2a3df34142cf2cb961b310ce694cbf90"
+checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25"
dependencies = [
"itoa",
"ryu",
@@ -6862,8 +6883,8 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -6897,7 +6918,7 @@ dependencies = [
"rustc_version",
"sha2",
"subtle 2.2.2",
- "x25519-dalek 0.6.0",
+ "x25519-dalek",
]
[[package]]
@@ -6928,7 +6949,7 @@ checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
[[package]]
name = "sp-allocator"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"log 0.4.8",
@@ -6939,7 +6960,7 @@ dependencies = [
[[package]]
name = "sp-api"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"hash-db",
"parity-scale-codec",
@@ -6954,25 +6975,27 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"blake2-rfc",
"proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "sp-api-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"criterion 0.3.1",
"parity-scale-codec",
"rustversion",
+ "sc-block-builder",
"sp-api",
"sp-blockchain",
"sp-consensus",
+ "sp-core",
"sp-runtime",
"sp-state-machine",
"sp-version",
@@ -6982,7 +7005,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"serde",
@@ -6993,7 +7016,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"sp-api",
"sp-application-crypto",
@@ -7004,7 +7027,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"criterion 0.3.1",
"integer-sqrt",
@@ -7019,7 +7042,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7030,7 +7053,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -7040,7 +7063,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7051,11 +7074,11 @@ dependencies = [
[[package]]
name = "sp-blockchain"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"log 0.4.8",
- "lru 0.4.3",
+ "lru",
"parity-scale-codec",
"parking_lot 0.10.0",
"sp-block-builder",
@@ -7066,12 +7089,12 @@ dependencies = [
[[package]]
name = "sp-consensus"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
"futures-diagnose",
- "futures-timer 3.0.1",
+ "futures-timer 3.0.2",
"libp2p",
"log 0.4.8",
"parity-scale-codec",
@@ -7088,7 +7111,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7101,7 +7124,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7117,7 +7140,7 @@ dependencies = [
[[package]]
name = "sp-consensus-pow"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7138,7 +7161,7 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"base58",
"blake2-rfc",
@@ -7182,16 +7205,16 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "sp-externalities"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"environmental",
"sp-std",
@@ -7200,7 +7223,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"serde",
@@ -7212,7 +7235,7 @@ dependencies = [
[[package]]
name = "sp-finality-tracker"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -7221,7 +7244,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"parity-scale-codec",
@@ -7232,7 +7255,7 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"hash-db",
"libsecp256k1",
@@ -7249,7 +7272,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"lazy_static",
"sp-core",
@@ -7259,7 +7282,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"sp-api",
"sp-runtime",
@@ -7267,7 +7290,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"backtrace",
"log 0.4.8",
@@ -7275,7 +7298,7 @@ dependencies = [
[[package]]
name = "sp-phragmen"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"rand 0.7.3",
"serde",
@@ -7287,7 +7310,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"serde",
"serde_json",
@@ -7296,8 +7319,9 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
+ "hash256-std-hasher",
"impl-trait-for-tuples",
"log 0.4.8",
"parity-scale-codec",
@@ -7316,7 +7340,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"primitive-types",
@@ -7335,22 +7359,22 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"Inflector",
"proc-macro-crate",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "sp-runtime-interface-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"sc-executor",
- "sp-core",
"sp-io",
+ "sp-runtime",
"sp-runtime-interface",
"sp-runtime-interface-test-wasm",
"sp-state-machine",
@@ -7358,7 +7382,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-test-wasm"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"sp-core",
"sp-io",
@@ -7369,7 +7393,7 @@ dependencies = [
[[package]]
name = "sp-sandbox"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"assert_matches",
"parity-scale-codec",
@@ -7383,7 +7407,7 @@ dependencies = [
[[package]]
name = "sp-serializer"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"serde",
"serde_json",
@@ -7391,7 +7415,7 @@ dependencies = [
[[package]]
name = "sp-session"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"sp-api",
"sp-core",
@@ -7401,7 +7425,7 @@ dependencies = [
[[package]]
name = "sp-staking"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -7410,7 +7434,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"hash-db",
"hex-literal",
@@ -7422,6 +7446,7 @@ dependencies = [
"sp-core",
"sp-externalities",
"sp-panic-handler",
+ "sp-runtime",
"sp-trie",
"trie-db",
"trie-root",
@@ -7429,11 +7454,11 @@ dependencies = [
[[package]]
name = "sp-std"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
[[package]]
name = "sp-storage"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"impl-serde 0.2.3",
"serde",
@@ -7443,7 +7468,7 @@ dependencies = [
[[package]]
name = "sp-test-primitives"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -7455,7 +7480,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -7468,7 +7493,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
@@ -7481,7 +7506,7 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"criterion 0.2.11",
"hash-db",
@@ -7489,6 +7514,7 @@ dependencies = [
"memory-db",
"parity-scale-codec",
"sp-core",
+ "sp-runtime",
"sp-std",
"trie-bench",
"trie-db",
@@ -7498,7 +7524,7 @@ dependencies = [
[[package]]
name = "sp-version"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"impl-serde 0.2.3",
"parity-scale-codec",
@@ -7509,7 +7535,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -7587,8 +7613,8 @@ checksum = "095064aa1f5b94d14e635d0a5684cf140c43ae40a0fd990708d38f5d669e5f64"
dependencies = [
"heck",
"proc-macro-error",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -7608,14 +7634,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81"
dependencies = [
"heck",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
[[package]]
name = "subkey"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"clap",
"derive_more",
@@ -7655,13 +7681,38 @@ dependencies = [
"sha2",
]
+[[package]]
+name = "substrate-browser-utils"
+version = "0.8.0-alpha.3"
+dependencies = [
+ "chrono",
+ "clear_on_drop",
+ "console_error_panic_hook",
+ "console_log",
+ "futures 0.1.29",
+ "futures 0.3.4",
+ "futures-timer 3.0.2",
+ "js-sys",
+ "kvdb-web",
+ "libp2p-wasm-ext",
+ "log 0.4.8",
+ "rand 0.6.5",
+ "rand 0.7.3",
+ "sc-chain-spec",
+ "sc-informant",
+ "sc-network",
+ "sc-service",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
[[package]]
name = "substrate-build-script-utils"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
[[package]]
name = "substrate-frame-rpc-support"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -7672,12 +7723,12 @@ dependencies = [
"sc-rpc-api",
"serde",
"sp-storage",
- "tokio 0.1.22",
+ "tokio 0.2.12",
]
[[package]]
name = "substrate-frame-rpc-system"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"env_logger 0.7.1",
"frame-system-rpc-runtime-api",
@@ -7698,9 +7749,22 @@ dependencies = [
"substrate-test-runtime-client",
]
+[[package]]
+name = "substrate-prometheus-endpoint"
+version = "0.8.0-alpha.3"
+dependencies = [
+ "async-std",
+ "derive_more",
+ "futures-util",
+ "hyper 0.13.2",
+ "log 0.4.8",
+ "prometheus",
+ "tokio 0.2.12",
+]
+
[[package]]
name = "substrate-test-client"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"futures 0.3.4",
"hash-db",
@@ -7719,7 +7783,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"cfg-if",
"frame-executive",
@@ -7732,6 +7796,7 @@ dependencies = [
"pallet-timestamp",
"parity-scale-codec",
"parity-util-mem",
+ "sc-block-builder",
"sc-client",
"sc-executor",
"serde",
@@ -7760,7 +7825,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime-client"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"futures 0.3.4",
"parity-scale-codec",
@@ -7777,7 +7842,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime-transaction-pool"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"derive_more",
"futures 0.3.4",
@@ -7792,7 +7857,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
[[package]]
name = "substrate-wasm-builder"
@@ -7802,6 +7867,7 @@ dependencies = [
"build-helper",
"cargo_metadata",
"fs2",
+ "itertools",
"tempfile",
"toml",
"walkdir",
@@ -7826,13 +7892,13 @@ checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941"
[[package]]
name = "syn"
-version = "1.0.14"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
- "unicode-xid 0.2.0",
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
]
[[package]]
@@ -7841,8 +7907,8 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -7852,21 +7918,23 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
- "unicode-xid 0.2.0",
+ "unicode-xid",
]
[[package]]
name = "sysinfo"
-version = "0.9.6"
+version = "0.11.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f4b2468c629cffba39c0a4425849ab3cdb03d9dfacba69684609aea04d08ff9"
+checksum = "e15d793f059727ad34a9245503c13b38262bb32e9906d8122ca64d6ca54b0858"
dependencies = [
"cfg-if",
"doc-comment",
"libc",
+ "ntapi",
+ "once_cell",
"rayon",
"winapi 0.3.8",
]
@@ -7889,16 +7957,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
-[[package]]
-name = "tempdir"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-dependencies = [
- "rand 0.4.6",
- "remove_dir_all",
-]
-
[[package]]
name = "tempfile"
version = "3.1.0"
@@ -7929,8 +7987,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a605baa797821796a751f4a959e1206079b24a4b7e1ed302b7d785d81a9276c9"
dependencies = [
"lazy_static",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
"version_check 0.9.1",
]
@@ -7946,21 +8004,21 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "205684fd018ca14432b12cce6ea3d46763311a571c3d294e71ba3f01adcf1aad"
+checksum = "ee14bf8e6767ab4c687c9e8bc003879e042a96fd67a3ba5934eadb6536bef4db"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57e4d2e50ca050ed44fb58309bdce3efa79948f84f9993ad1978de5eebdce5a7"
+checksum = "a7b51e1fbc44b5a0840be594fbc0f960be09050f2617e61e6aa43bef97cd3ef4"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -7995,9 +8053,9 @@ dependencies = [
[[package]]
name = "tiny-bip39"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd1fb03fe8e07d17cd851a624a9fff74642a997b67fbd1ccd77533241640d92"
+checksum = "a6848cd8f566953ce1e8faeba12ee23cbdbb0437754792cd857d44628b5685e3"
dependencies = [
"failure",
"hmac",
@@ -8006,6 +8064,7 @@ dependencies = [
"rand 0.7.3",
"rustc-hash",
"sha2",
+ "unicode-normalization",
]
[[package]]
@@ -8062,9 +8121,9 @@ dependencies = [
[[package]]
name = "tokio"
-version = "0.2.11"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fdd17989496f49cdc57978c96f0c9fe5e4a58a8bddc6813c449a4624f6a030b"
+checksum = "b34bee1facdc352fba10c9c58b654e6ecb6a2250167772bf86071f7c5f2f5061"
dependencies = [
"bytes 0.5.4",
"fnv",
@@ -8159,12 +8218,12 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4b1e7ed7d5d4c2af3d999904b0eebe76544897cdbfb2b9684bed2174ab20f7c"
+checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -8189,13 +8248,13 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.12.2"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "141afec0978abae6573065a48882c6bae44c5cc61db9b511ac4abf6a09bfd9cc"
+checksum = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
dependencies = [
"futures-core",
- "rustls",
- "tokio 0.2.11",
+ "rustls 0.17.0",
+ "tokio 0.2.12",
"webpki",
]
@@ -8318,7 +8377,7 @@ dependencies = [
"futures-sink",
"log 0.4.8",
"pin-project-lite",
- "tokio 0.2.11",
+ "tokio 0.2.12",
]
[[package]]
@@ -8338,9 +8397,9 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
[[package]]
name = "tracing"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e213bd24252abeb86a0b7060e02df677d367ce6cb772cef17e9214b8390a8d3"
+checksum = "1721cc8cf7d770cc4257872507180f35a4797272f5962f24c806af9e7faf52ab"
dependencies = [
"cfg-if",
"tracing-attributes",
@@ -8349,19 +8408,19 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cfd395def5a60236e187e1ff905cb55668a59f29928dec05e6e1b1fd2ac1f3"
+checksum = "7fbad39da2f9af1cae3016339ad7f2c7a9e870f12e8fd04c4fd7ef35b30c0d2b"
dependencies = [
- "quote 1.0.2",
+ "quote",
"syn",
]
[[package]]
name = "tracing-core"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a46f11e372b8bd4b4398ea54353412fdd7fd42a8370c7e543e218cf7661978"
+checksum = "0aa83a9a47081cd522c09c81b31aec2c9273424976f922ad61c053b58350b715"
dependencies = [
"lazy_static",
]
@@ -8401,7 +8460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de9222c50cc325855621271157c973da27a0dcd26fa06f8edf81020bd2333df0"
dependencies = [
"hash-db",
- "hashbrown 0.6.3",
+ "hashbrown",
"log 0.4.8",
"rustc-hex",
"smallvec 1.2.0",
@@ -8434,9 +8493,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
[[package]]
name = "trybuild"
-version = "1.0.21"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f5b3f750c701725331ac78e389b5d143b7d25f6b6ffffd0d419759a9063ac5f"
+checksum = "26ff1b18659a2218332848d76ad1c867ce4c6ee37b085e6bc8de9a6d11401220"
dependencies = [
"glob 0.3.0",
"lazy_static",
@@ -8538,12 +8597,6 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
[[package]]
name = "unicode-xid"
version = "0.2.0"
@@ -8552,17 +8605,12 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
[[package]]
name = "unsigned-varint"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f0023a96687fe169081e8adce3f65e3874426b7886e9234d490af2dc077959"
-
-[[package]]
-name = "unsigned-varint"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c689459fbaeb50e56c6749275f084decfd02194ac5852e6617d95d0d3cf02eaf"
+checksum = "3b7ffb36714206d2f5f05d61a2bc350415c642f2c54433f0ebf829afbe41d570"
dependencies = [
"bytes 0.5.4",
+ "futures 0.3.4",
"futures_codec",
]
@@ -8594,6 +8642,12 @@ dependencies = [
"percent-encoding 2.1.0",
]
+[[package]]
+name = "uuid"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
+
[[package]]
name = "vcpkg"
version = "0.2.8"
@@ -8715,8 +8769,8 @@ dependencies = [
"bumpalo",
"lazy_static",
"log 0.4.8",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
"wasm-bindgen-shared",
]
@@ -8739,7 +8793,7 @@ version = "0.2.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3"
dependencies = [
- "quote 1.0.2",
+ "quote",
"wasm-bindgen-macro-support",
]
@@ -8749,8 +8803,8 @@ version = "0.2.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
@@ -8771,8 +8825,8 @@ dependencies = [
"anyhow",
"heck",
"log 0.4.8",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
"wasm-bindgen-backend",
"weedle",
@@ -8831,21 +8885,14 @@ dependencies = [
[[package]]
name = "wasmparser"
-version = "0.48.2"
+version = "0.51.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "073da89bf1c84db000dd68ce660c1b4a08e3a2d28fd1e3394ab9e7abdde4a0f8"
-
-[[package]]
-name = "wasmparser"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e41b27a1677fe28c115de49efca55dabb14f7fece2c32947ffb9b1064fe5bd4"
+checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a"
[[package]]
name = "wasmtime"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5614d964c3e7d07a13b59aca66103c52656bd80430f0d86dc7eeb3af4f03d4a2"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"anyhow",
"backtrace",
@@ -8855,9 +8902,10 @@ dependencies = [
"region",
"rustc-demangle",
"target-lexicon",
- "wasmparser 0.51.1",
+ "wasmparser",
"wasmtime-environ",
"wasmtime-jit",
+ "wasmtime-profiling",
"wasmtime-runtime",
"wat",
"winapi 0.3.8",
@@ -8865,25 +8913,23 @@ dependencies = [
[[package]]
name = "wasmtime-debug"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb5900275b4ef0b621ce725b9d5660b12825d7f7d79b392b97baf089ffab8c0"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"anyhow",
"faerie",
- "gimli 0.19.0",
+ "gimli",
"more-asserts",
"target-lexicon",
"thiserror",
- "wasmparser 0.51.1",
+ "wasmparser",
"wasmtime-environ",
]
[[package]]
name = "wasmtime-environ"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04661851e133fb11691c4a0f92a705766b4bbf7afc06811f949e295cc8414fc"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"anyhow",
"base64 0.11.0",
@@ -8903,16 +8949,15 @@ dependencies = [
"sha2",
"thiserror",
"toml",
- "wasmparser 0.51.1",
+ "wasmparser",
"winapi 0.3.8",
"zstd",
]
[[package]]
name = "wasmtime-jit"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d451353764ce55c9bb6a8b260063cfc209b7adadd277a9a872ab4563a69e357c"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"anyhow",
"cfg-if",
@@ -8925,46 +8970,63 @@ dependencies = [
"region",
"target-lexicon",
"thiserror",
- "wasmparser 0.51.1",
+ "wasmparser",
"wasmtime-debug",
"wasmtime-environ",
+ "wasmtime-profiling",
"wasmtime-runtime",
"winapi 0.3.8",
]
+[[package]]
+name = "wasmtime-profiling"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
+dependencies = [
+ "gimli",
+ "goblin",
+ "lazy_static",
+ "libc",
+ "object",
+ "scroll",
+ "serde",
+ "target-lexicon",
+]
+
[[package]]
name = "wasmtime-runtime"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dbd4fc114b828cae3e405fed413df4b3814d87a92ea029640cec9ba41f0c162"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"backtrace",
"cc",
"cfg-if",
"indexmap",
+ "lazy_static",
"libc",
"memoffset",
"more-asserts",
"region",
"thiserror",
"wasmtime-environ",
+ "wasmtime-profiling",
"winapi 0.3.8",
]
[[package]]
name = "wast"
-version = "7.0.0"
+version = "9.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a729d076deb29c8509fa71f2d427729f9394f9496844ed8fcab152f35d163d"
+checksum = "ee7b16105405ca2aa2376ba522d8d4b1a11604941dd3bb7df9fd2ece60f8d16a"
dependencies = [
"leb128",
]
[[package]]
name = "wat"
-version = "1.0.8"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5795e34a4b39893653dec97e644fac85c31398e0ce1abecc48967aac83d9e8ce"
+checksum = "56173f7f4fb59aebe35a7e71423845e1c6c7144bfb56362d497931b6b3bed0f6"
dependencies = [
"wast",
]
@@ -9060,16 +9122,6 @@ dependencies = [
"nom",
]
-[[package]]
-name = "which"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
-dependencies = [
- "failure",
- "libc",
-]
-
[[package]]
name = "which"
version = "3.1.0"
@@ -9150,17 +9202,6 @@ dependencies = [
"winapi-build",
]
-[[package]]
-name = "x25519-dalek"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538"
-dependencies = [
- "clear_on_drop",
- "curve25519-dalek 1.2.3",
- "rand_core 0.3.1",
-]
-
[[package]]
name = "x25519-dalek"
version = "0.6.0"
@@ -9180,9 +9221,9 @@ checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
[[package]]
name = "yamux"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d73295bc9d9acf89dd9336b3b5f5b57731ee72b587857dd4312721a0196b48e5"
+checksum = "f03098897b734bd943ab23f6aa9f98aafd72a88516deedd66f9d564c57bf2f19"
dependencies = [
"bytes 0.5.4",
"futures 0.3.4",
@@ -9214,8 +9255,8 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
dependencies = [
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
"synstructure",
]
diff --git a/Cargo.toml b/Cargo.toml
index 7244a453ce7870198ed607cd393a0ca589958b35..3aed14d159ec709c734b6fc299bb6c434301772f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,6 +62,7 @@ members = [
"frame/babe",
"frame/balances",
"frame/benchmarking",
+ "frame/benchmark",
"frame/collective",
"frame/contracts",
"frame/contracts/rpc",
@@ -71,6 +72,7 @@ members = [
"frame/elections",
"frame/evm",
"frame/example",
+ "frame/example-offchain-worker",
"frame/executive",
"frame/finality-tracker",
"frame/generic-asset",
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 9ad4a0e8a55ad5ad82a07252f1d62fc12e8ce101..1e8c3fad2e3c0e2f1a8cef0f2d7fff57f2b45ff3 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -1,10 +1,12 @@
[package]
name = "node-template"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
authors = ["Anonymous"]
edition = "2018"
license = "Unlicense"
build = "build.rs"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
[[bin]]
name = "node-template"
@@ -14,25 +16,26 @@ futures = "0.3.1"
log = "0.4.8"
structopt = "0.3.8"
-sc-cli = { version = "0.8.0", path = "../../../client/cli" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sc-executor = { version = "0.8", path = "../../../client/executor" }
-sc-service = { version = "0.8", path = "../../../client/service" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
-sc-network = { version = "0.8", path = "../../../client/network" }
-sc-consensus-aura = { version = "0.8", path = "../../../client/consensus/aura" }
-sp-consensus-aura = { version = "0.8", path = "../../../primitives/consensus/aura" }
-sp-consensus = { version = "0.8", path = "../../../primitives/consensus/common" }
-grandpa = { version = "0.8", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
-sc-client = { version = "0.8", path = "../../../client/" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sc-basic-authorship = { path = "../../../client/basic-authorship" }
+sc-cli = { version = "0.8.0-alpha.2", path = "../../../client/cli" }
+sp-core = { version = "2.0.0-alpha.2", path = "../../../primitives/core" }
+sc-executor = { version = "0.8.0-alpha.2", path = "../../../client/executor" }
+sc-service = { version = "0.8.0-alpha.2", path = "../../../client/service" }
+sp-inherents = { version = "2.0.0-alpha.2", path = "../../../primitives/inherents" }
+sc-transaction-pool = { version = "2.0.0-alpha.2", path = "../../../client/transaction-pool" }
+sp-transaction-pool = { version = "2.0.0-alpha.2", path = "../../../primitives/transaction-pool" }
+sc-network = { version = "0.8.0-alpha.2", path = "../../../client/network" }
+sc-consensus-aura = { version = "0.8.0-alpha.2", path = "../../../client/consensus/aura" }
+sp-consensus-aura = { version = "0.8.0-alpha.2", path = "../../../primitives/consensus/aura" }
+sp-consensus = { version = "0.8.0-alpha.2", path = "../../../primitives/consensus/common" }
+grandpa = { version = "0.8.0-alpha.2", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
+grandpa-primitives = { version = "2.0.0-alpha.2", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
+sc-client = { version = "0.8.0-alpha.2", path = "../../../client/" }
+sc-client-api = { version = "2.0.0-alpha.2", path = "../../../client/api" }
+sp-runtime = { version = "2.0.0-alpha.2", path = "../../../primitives/runtime" }
+sc-basic-authorship = { path = "../../../client/basic-authorship" , version = "0.8.0-alpha.2"}
-node-template-runtime = { version = "2.0.0", path = "../runtime" }
+node-template-runtime = { version = "2.0.0-alpha.2", path = "../runtime" }
[build-dependencies]
vergen = "3.0.4"
-build-script-utils = { version = "2.0.0", package = "substrate-build-script-utils", path = "../../../utils/build-script-utils" }
+build-script-utils = { version = "2.0.0-alpha.2", package = "substrate-build-script-utils", path = "../../../utils/build-script-utils" }
diff --git a/bin/node-template/node/src/chain_spec.rs b/bin/node-template/node/src/chain_spec.rs
index 9bdfea3b7820d5ed80e5912d65de7e91a3b14f9a..f1a7e29d44cb44e297bbb65591b8ed8396a7c37d 100644
--- a/bin/node-template/node/src/chain_spec.rs
+++ b/bin/node-template/node/src/chain_spec.rs
@@ -1,7 +1,7 @@
use sp_core::{Pair, Public, sr25519};
use node_template_runtime::{
AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig,
- IndicesConfig, SudoConfig, SystemConfig, WASM_BINARY, Signature
+ SudoConfig, SystemConfig, WASM_BINARY, Signature
};
use sp_consensus_aura::sr25519::{AuthorityId as AuraId};
use grandpa_primitives::{AuthorityId as GrandpaId};
@@ -12,7 +12,7 @@ use sp_runtime::traits::{Verify, IdentifyAccount};
//const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::ChainSpec;
+pub type ChainSpec = sc_service::GenericChainSpec;
/// The chain specification option. This is expected to come in from the CLI and
/// is little more than one of a number of alternatives which can easily be converted
@@ -127,27 +127,24 @@ fn testnet_genesis(initial_authorities: Vec<(AuraId, GrandpaId)>,
code: WASM_BINARY.to_vec(),
changes_trie_config: Default::default(),
}),
- indices: Some(IndicesConfig {
- indices: vec![],
- }),
balances: Some(BalancesConfig {
balances: endowed_accounts.iter().cloned().map(|k|(k, 1 << 60)).collect(),
}),
- sudo: Some(SudoConfig {
- key: root_key,
- }),
aura: Some(AuraConfig {
authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
}),
grandpa: Some(GrandpaConfig {
authorities: initial_authorities.iter().map(|x| (x.1.clone(), 1)).collect(),
}),
+ sudo: Some(SudoConfig {
+ key: root_key,
+ }),
}
}
-pub fn load_spec(id: &str) -> Result, String> {
+pub fn load_spec(id: &str) -> Result, String> {
Ok(match Alternative::from(id) {
- Some(spec) => Some(spec.load()?),
- None => None,
+ Some(spec) => Box::new(spec.load()?),
+ None => Box::new(ChainSpec::from_json_file(std::path::PathBuf::from(id))?),
})
}
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index e7e386703deee0a7894dfc5bf931c6c41fa89438..0f4c301dbff5b7defe0565bf71e85b21a6418867 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -15,32 +15,35 @@
// along with Substrate. If not, see .
use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
-use sc_cli::{VersionInfo, error};
+use sc_cli::VersionInfo;
use crate::service;
use crate::chain_spec;
use crate::cli::Cli;
/// Parse and run command line arguments
-pub fn run(version: VersionInfo) -> error::Result<()> {
+pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
let opt = sc_cli::from_args::(&version);
- let config = sc_service::Configuration::new(&version);
+ let mut config = sc_service::Configuration::from_version(&version);
match opt.subcommand {
- Some(subcommand) => sc_cli::run_subcommand(
- config,
- subcommand,
- chain_spec::load_spec,
- |config: _| Ok(new_full_start!(config).0),
- &version,
- ),
- None => sc_cli::run(
- config,
- opt.run,
- service::new_light,
- service::new_full,
- chain_spec::load_spec,
- &version,
- )
+ Some(subcommand) => {
+ subcommand.init(&version)?;
+ subcommand.update_config(&mut config, chain_spec::load_spec, &version)?;
+ subcommand.run(
+ config,
+ |config: _| Ok(new_full_start!(config).0),
+ )
+ },
+ None => {
+ opt.run.init(&version)?;
+ opt.run.update_config(&mut config, chain_spec::load_spec, &version)?;
+ opt.run.run(
+ config,
+ service::new_light,
+ service::new_full,
+ &version,
+ )
+ },
}
}
diff --git a/bin/node-template/node/src/main.rs b/bin/node-template/node/src/main.rs
index 9d0a57d77a851d551e9a8e087365a8d8cb470977..91b2c257e0cd733f7e87d00e02857101810a2fb0 100644
--- a/bin/node-template/node/src/main.rs
+++ b/bin/node-template/node/src/main.rs
@@ -7,10 +7,8 @@ mod service;
mod cli;
mod command;
-pub use sc_cli::{VersionInfo, error};
-
-fn main() -> Result<(), error::Error> {
- let version = VersionInfo {
+fn main() -> sc_cli::Result<()> {
+ let version = sc_cli::VersionInfo {
name: "Substrate Node",
commit: env!("VERGEN_SHA_SHORT"),
version: env!("CARGO_PKG_VERSION"),
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 5466f3e919c0baa4bed2b83622fdf35d5987e5b8..4b66f90fbb3732bbc07e59ced32a40717bd1b559 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -3,14 +3,14 @@
use std::sync::Arc;
use std::time::Duration;
use sc_client::LongestChain;
-use node_template_runtime::{self, GenesisConfig, opaque::Block, RuntimeApi};
+use sc_client_api::ExecutorProvider;
+use node_template_runtime::{self, opaque::Block, RuntimeApi};
use sc_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder};
use sp_inherents::InherentDataProviders;
-use sc_network::{construct_simple_protocol};
use sc_executor::native_executor_instance;
pub use sc_executor::NativeExecutor;
use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
-use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
+use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider};
// Our native executor instance.
native_executor_instance!(
@@ -19,17 +19,13 @@ native_executor_instance!(
node_template_runtime::native_version,
);
-construct_simple_protocol! {
- /// Demo protocol attachment for substrate.
- pub struct NodeProtocol where Block = Block { }
-}
-
/// 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
/// be able to perform chain operations.
macro_rules! new_full_start {
($config:expr) => {{
+ use std::sync::Arc;
let mut import_setup = None;
let inherent_data_providers = sp_inherents::InherentDataProviders::new();
@@ -43,27 +39,24 @@ macro_rules! new_full_start {
let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());
Ok(sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api)))
})?
- .with_import_queue(|_config, client, mut select_chain, transaction_pool| {
+ .with_import_queue(|_config, client, mut select_chain, _transaction_pool| {
let select_chain = select_chain.take()
.ok_or_else(|| sc_service::Error::SelectChainRequired)?;
let (grandpa_block_import, grandpa_link) =
- grandpa::block_import::<_, _, _, node_template_runtime::RuntimeApi, _>(
- client.clone(), &*client, select_chain
- )?;
+ grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain)?;
let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
grandpa_block_import.clone(), client.clone(),
);
- let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>(
- sc_consensus_aura::SlotDuration::get_or_compute(&*client)?,
+ let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair>(
+ sc_consensus_aura::slot_duration(&*client)?,
aura_block_import,
Some(Box::new(grandpa_block_import.clone())),
None,
client,
inherent_data_providers.clone(),
- Some(transaction_pool),
)?;
import_setup = Some((grandpa_block_import, grandpa_link));
@@ -76,7 +69,7 @@ macro_rules! new_full_start {
}
/// Builds a new service for a full client.
-pub fn new_full(config: Configuration)
+pub fn new_full(config: Configuration)
-> Result
{
let is_authority = config.roles.is_authority();
@@ -95,17 +88,19 @@ pub fn new_full(config: Configuration)
import_setup.take()
.expect("Link Half and Block Import are present for Full Services or setup failed before. qed");
- let service = builder.with_network_protocol(|_| Ok(NodeProtocol::new()))?
- .with_finality_proof_provider(|client, backend|
- Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, client)) as _)
- )?
+ let service = builder
+ .with_finality_proof_provider(|client, backend| {
+ // GenesisAuthoritySetProvider is implemented for StorageAndProofProvider
+ let provider = client as Arc>;
+ Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
+ })?
.build()?;
if participates_in_consensus {
- let proposer = sc_basic_authorship::ProposerFactory {
- client: service.client(),
- transaction_pool: service.transaction_pool(),
- };
+ let proposer = sc_basic_authorship::ProposerFactory::new(
+ service.client(),
+ service.transaction_pool()
+ );
let client = service.client();
let select_chain = service.select_chain()
@@ -115,7 +110,7 @@ pub fn new_full(config: Configuration)
sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
let aura = sc_consensus_aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _>(
- sc_consensus_aura::SlotDuration::get_or_compute(&*client)?,
+ sc_consensus_aura::slot_duration(&*client)?,
client,
select_chain,
block_import,
@@ -145,51 +140,48 @@ pub fn new_full(config: Configuration)
gossip_duration: Duration::from_millis(333),
justification_period: 512,
name: Some(name),
- observer_enabled: true,
+ observer_enabled: false,
keystore,
is_authority,
};
- match (is_authority, disable_grandpa) {
- (false, false) => {
- // start the lightweight GRANDPA observer
- service.spawn_task("grandpa-observer", grandpa::run_grandpa_observer(
- grandpa_config,
- grandpa_link,
- service.network(),
- service.on_exit(),
- )?);
- },
- (true, false) => {
- // start the full GRANDPA voter
- let voter_config = grandpa::GrandpaParams {
- config: grandpa_config,
- link: grandpa_link,
- network: service.network(),
- inherent_data_providers: inherent_data_providers.clone(),
- on_exit: service.on_exit(),
- telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
- voting_rule: grandpa::VotingRulesBuilder::default().build(),
- };
-
- // the GRANDPA voter task is considered infallible, i.e.
- // if it fails we take down the service with it.
- service.spawn_essential_task("grandpa", grandpa::run_grandpa_voter(voter_config)?);
- },
- (_, true) => {
- grandpa::setup_disabled_grandpa(
- service.client(),
- &inherent_data_providers,
- service.network(),
- )?;
- },
+ let enable_grandpa = !disable_grandpa;
+ if enable_grandpa {
+ // start the full GRANDPA voter
+ // NOTE: non-authorities could run the GRANDPA observer protocol, but at
+ // this point the full voter should provide better guarantees of block
+ // and vote data availability than the observer. The observer has not
+ // been tested extensively yet and having most nodes in a network run it
+ // could lead to finality stalls.
+ let grandpa_config = grandpa::GrandpaParams {
+ config: grandpa_config,
+ link: grandpa_link,
+ network: service.network(),
+ inherent_data_providers: inherent_data_providers.clone(),
+ telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
+ voting_rule: grandpa::VotingRulesBuilder::default().build(),
+ prometheus_registry: service.prometheus_registry()
+ };
+
+ // the GRANDPA voter task is considered infallible, i.e.
+ // if it fails we take down the service with it.
+ service.spawn_essential_task(
+ "grandpa-voter",
+ grandpa::run_grandpa_voter(grandpa_config)?
+ );
+ } else {
+ grandpa::setup_disabled_grandpa(
+ service.client(),
+ &inherent_data_providers,
+ service.network(),
+ )?;
}
Ok(service)
}
/// Builds a new service for a light client.
-pub fn new_light(config: Configuration)
+pub fn new_light(config: Configuration)
-> Result
{
let inherent_data_providers = InherentDataProviders::new();
@@ -212,28 +204,31 @@ pub fn new_light(config: Configuration)
let fetch_checker = fetcher
.map(|fetcher| fetcher.checker().clone())
.ok_or_else(|| "Trying to start light import queue without active fetch checker")?;
- let grandpa_block_import = grandpa::light_block_import::<_, _, _, RuntimeApi>(
- client.clone(), backend, &*client.clone(), Arc::new(fetch_checker),
+ let grandpa_block_import = grandpa::light_block_import(
+ client.clone(),
+ backend,
+ &(client.clone() as Arc<_>),
+ Arc::new(fetch_checker),
)?;
let finality_proof_import = grandpa_block_import.clone();
let finality_proof_request_builder =
finality_proof_import.create_finality_proof_request_builder();
- let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, ()>(
- sc_consensus_aura::SlotDuration::get_or_compute(&*client)?,
+ let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair>(
+ sc_consensus_aura::slot_duration(&*client)?,
grandpa_block_import,
None,
Some(Box::new(finality_proof_import)),
client,
inherent_data_providers.clone(),
- None,
)?;
Ok((import_queue, finality_proof_request_builder))
})?
- .with_network_protocol(|_| Ok(NodeProtocol::new()))?
- .with_finality_proof_provider(|client, backend|
- Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, client)) as _)
- )?
+ .with_finality_proof_provider(|client, backend| {
+ // GenesisAuthoritySetProvider is implemented for StorageAndProofProvider
+ let provider = client as Arc>;
+ Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
+ })?
.build()
}
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index 8ea3f3adabc52c2c87802b2f407d188f14bd202c..b39fcc1dae4d5bdb3b71edfaac02c55783879e29 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -2,43 +2,47 @@
authors = ['Anonymous']
edition = '2018'
name = 'pallet-template'
-version = '2.0.0'
+version = "2.0.0-alpha.3"
+license = "Unlicense"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME pallet template"
[dependencies]
-codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false, features = ["derive"] }
safe-mix = { default-features = false, version = '1.0.0' }
[dependencies.frame-support]
default-features = false
-version = '2.0.0'
+version = "2.0.0-alpha.2"
path = "../../../../frame/support"
[dependencies.system]
default-features = false
package = 'frame-system'
-version = '2.0.0'
+version = "2.0.0-alpha.2"
path = "../../../../frame/system"
-
[dev-dependencies.sp-core]
default-features = false
-version = '2.0.0'
+version = "2.0.0-alpha.2"
path = "../../../../primitives/core"
[dev-dependencies.sp-io]
default-features = false
-version = '2.0.0'
+version = "2.0.0-alpha.2"
path = "../../../../primitives/io"
[dev-dependencies.sp-runtime]
default-features = false
-version = '2.0.0'
+version = "2.0.0-alpha.2"
path = "../../../../primitives/runtime"
+
[features]
default = ['std']
std = [
- 'codec/std',
- 'frame-support/std',
- 'safe-mix/std',
- 'system/std'
+ 'codec/std',
+ 'frame-support/std',
+ 'safe-mix/std',
+ 'system/std'
]
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 7a23610e4b0a396039e01a563d591004ed121c7b..2ea81ffb456261122b234c6ae3c36f52eaa9c430 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -41,7 +41,7 @@ impl system::Trait for Test {
type ModuleToIndex = ();
type AccountData = ();
type OnNewAccount = ();
- type OnReapAccount = ();
+ type OnKilledAccount = ();
}
impl Trait for Test {
type Event = ();
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index ddecb0e4cff4c11da2ddf6e7973c1c57e082d1e1..9268dd8c05035f4dd8022702e9792f421ab556c5 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -1,42 +1,43 @@
[package]
name = "node-template-runtime"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
authors = ["Anonymous"]
edition = "2018"
license = "Unlicense"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
[dependencies]
-codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false, features = ["derive"] }
-aura = { version = "2.0.0", default-features = false, package = "pallet-aura", path = "../../../frame/aura" }
-balances = { version = "2.0.0", default-features = false, package = "pallet-balances", path = "../../../frame/balances" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../../frame/support" }
-grandpa = { version = "2.0.0", default-features = false, package = "pallet-grandpa", path = "../../../frame/grandpa" }
-indices = { version = "2.0.0", default-features = false, package = "pallet-indices", path = "../../../frame/indices" }
-randomness-collective-flip = { version = "2.0.0", default-features = false, package = "pallet-randomness-collective-flip", path = "../../../frame/randomness-collective-flip" }
-sudo = { version = "2.0.0", default-features = false, package = "pallet-sudo", path = "../../../frame/sudo" }
-system = { version = "2.0.0", default-features = false, package = "frame-system", path = "../../../frame/system" }
-timestamp = { version = "2.0.0", default-features = false, package = "pallet-timestamp", path = "../../../frame/timestamp" }
-transaction-payment = { version = "2.0.0", default-features = false, package = "pallet-transaction-payment", path = "../../../frame/transaction-payment" }
-frame-executive = { version = "2.0.0", default-features = false, path = "../../../frame/executive" }
+aura = { version = "2.0.0-alpha.2", default-features = false, package = "pallet-aura", path = "../../../frame/aura" }
+balances = { version = "2.0.0-alpha.2", default-features = false, package = "pallet-balances", path = "../../../frame/balances" }
+frame-support = { version = "2.0.0-alpha.2", default-features = false, path = "../../../frame/support" }
+grandpa = { version = "2.0.0-alpha.2", default-features = false, package = "pallet-grandpa", path = "../../../frame/grandpa" }
+randomness-collective-flip = { version = "2.0.0-alpha.2", default-features = false, package = "pallet-randomness-collective-flip", path = "../../../frame/randomness-collective-flip" }
+sudo = { version = "2.0.0-alpha.2", default-features = false, package = "pallet-sudo", path = "../../../frame/sudo" }
+system = { version = "2.0.0-alpha.2", default-features = false, package = "frame-system", path = "../../../frame/system" }
+timestamp = { version = "2.0.0-alpha.2", default-features = false, package = "pallet-timestamp", path = "../../../frame/timestamp" }
+transaction-payment = { version = "2.0.0-alpha.2", default-features = false, package = "pallet-transaction-payment", path = "../../../frame/transaction-payment" }
+frame-executive = { version = "2.0.0-alpha.2", default-features = false, path = "../../../frame/executive" }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-api = { version = "2.0.0", default-features = false, path = "../../../primitives/api" }
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false}
-sp-consensus-aura = { version = "0.8", default-features = false, path = "../../../primitives/consensus/aura" }
-sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
-sp-inherents = { path = "../../../primitives/inherents", default-features = false}
-sp-io = { version = "2.0.0", default-features = false, path = "../../../primitives/io" }
-sp-offchain = { version = "2.0.0", default-features = false, path = "../../../primitives/offchain" }
-sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
-sp-session = { version = "2.0.0", default-features = false, path = "../../../primitives/session" }
-sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
-sp-transaction-pool = { version = "2.0.0", default-features = false, path = "../../../primitives/transaction-pool" }
-sp-version = { version = "2.0.0", default-features = false, path = "../../../primitives/version" }
+sp-api = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/api" }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "2.0.0-alpha.2"}
+sp-consensus-aura = { version = "0.8.0-alpha.2", default-features = false, path = "../../../primitives/consensus/aura" }
+sp-core = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/core" }
+sp-inherents = { path = "../../../primitives/inherents", default-features = false, version = "2.0.0-alpha.2"}
+sp-io = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/io" }
+sp-offchain = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/offchain" }
+sp-runtime = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/runtime" }
+sp-session = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/session" }
+sp-std = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/std" }
+sp-transaction-pool = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/transaction-pool" }
+sp-version = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/version" }
-template = { version = "2.0.0", default-features = false, path = "../pallets/template", package = "pallet-template" }
+template = { version = "2.0.0-alpha.2", default-features = false, path = "../pallets/template", package = "pallet-template" }
[build-dependencies]
-wasm-builder-runner = { version = "1.0.4", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
+wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
[features]
default = ["std"]
@@ -47,7 +48,6 @@ std = [
"frame-executive/std",
"frame-support/std",
"grandpa/std",
- "indices/std",
"randomness-collective-flip/std",
"serde",
"sp-api/std",
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index a1bcd157ad63a7e677a92ea4f2cdcc4c444ce040..0414759a5ad86f5c5be4adb1cc5031d4adf1b4e7 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -15,7 +15,7 @@ use sp_runtime::{
impl_opaque_keys, MultiSignature,
};
use sp_runtime::traits::{
- BlakeTwo256, Block as BlockT, StaticLookup, Verify, ConvertInto, IdentifyAccount
+ BlakeTwo256, Block as BlockT, IdentityLookup, Verify, ConvertInto, IdentifyAccount
};
use sp_api::impl_runtime_apis;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -120,7 +120,7 @@ pub fn native_version() -> NativeVersion {
parameter_types! {
pub const BlockHashCount: BlockNumber = 250;
- pub const MaximumBlockWeight: Weight = 1_000_000;
+ pub const MaximumBlockWeight: Weight = 1_000_000_000;
pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;
pub const Version: RuntimeVersion = VERSION;
@@ -132,7 +132,7 @@ impl system::Trait for Runtime {
/// The aggregated dispatch type that is available for extrinsics.
type Call = Call;
/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
- type Lookup = Indices;
+ type Lookup = IdentityLookup;
/// The index type for storing how many extrinsics an account has signed.
type Index = Index;
/// The index type for blocks.
@@ -164,7 +164,7 @@ impl system::Trait for Runtime {
/// What to do if a new account is created.
type OnNewAccount = ();
/// What to do if an account is fully reaped from the system.
- type OnReapAccount = Balances;
+ type OnKilledAccount = ();
/// The data to be stored in an account.
type AccountData = balances::AccountData;
}
@@ -177,23 +177,6 @@ impl grandpa::Trait for Runtime {
type Event = Event;
}
-parameter_types! {
- /// How much an index costs.
- pub const IndexDeposit: u128 = 100;
-}
-
-impl indices::Trait for Runtime {
- /// The type for recording indexing into the account enumeration. If this ever overflows, there
- /// will be problems!
- type AccountIndex = AccountIndex;
- /// The ubiquitous event type.
- type Event = Event;
- /// The currency type.
- type Currency = Balances;
- /// How much an index costs.
- type Deposit = IndexDeposit;
-}
-
parameter_types! {
pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
}
@@ -250,21 +233,20 @@ construct_runtime!(
UncheckedExtrinsic = UncheckedExtrinsic
{
System: system::{Module, Call, Config, Storage, Event},
+ RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage},
Timestamp: timestamp::{Module, Call, Storage, Inherent},
Aura: aura::{Module, Config, Inherent(Timestamp)},
Grandpa: grandpa::{Module, Call, Storage, Config, Event},
- Indices: indices::{Module, Call, Storage, Event, Config},
Balances: balances::{Module, Call, Storage, Config, Event},
TransactionPayment: transaction_payment::{Module, Storage},
Sudo: sudo::{Module, Call, Config, Storage, Event},
// Used for the module template in `./template.rs`
TemplateModule: template::{Module, Call, Storage, Event},
- RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage},
}
);
/// The address format for describing accounts.
-pub type Address = ::Source;
+pub type Address = AccountId;
/// Block header type as expected by this runtime.
pub type Header = generic::Header;
/// Block type as expected by this runtime.
@@ -315,10 +297,6 @@ impl_runtime_apis! {
Executive::apply_extrinsic(extrinsic)
}
- fn apply_trusted_extrinsic(extrinsic: ::Extrinsic) -> ApplyExtrinsicResult {
- Executive::apply_trusted_extrinsic(extrinsic)
- }
-
fn finalize_block() -> ::Header {
Executive::finalize_block()
}
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index d383e2c05a944bab30885e60c452211b9270cf67..e18b6b228e65553543891d6e5cbcd6fb6094c752 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -1,12 +1,14 @@
[package]
name = "node-cli"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
authors = ["Parity Technologies "]
description = "Substrate node implementation in Rust."
build = "build.rs"
edition = "2018"
license = "GPL-3.0"
default-run = "substrate"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
[package.metadata.wasm-pack.profile.release]
# `wasm-opt` has some problems on linux, see
@@ -29,7 +31,7 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
# third-party dependencies
-codec = { package = "parity-scale-codec", version = "1.0.6" }
+codec = { package = "parity-scale-codec", version = "1.2.0" }
serde = { version = "1.0.102", features = ["derive"] }
futures = { version = "0.3.1", features = ["compat"] }
hex-literal = "0.2.1"
@@ -40,83 +42,84 @@ structopt = { version = "0.3.8", optional = true }
tracing = "0.1.10"
# primitives
-sp-authority-discovery = { version = "2.0.0", path = "../../../primitives/authority-discovery" }
-sp-consensus-babe = { version = "0.8", path = "../../../primitives/consensus/babe" }
-grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
-sp-core = { version = "2.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
-sp-timestamp = { version = "2.0.0", default-features = false, path = "../../../primitives/timestamp" }
-sp-finality-tracker = { version = "2.0.0", default-features = false, path = "../../../primitives/finality-tracker" }
-sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
-sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
-sp-io = { version = "2.0.0", path = "../../../primitives/io" }
-sp-consensus = { version = "0.8", path = "../../../primitives/consensus/common" }
+sp-authority-discovery = { version = "2.0.0-alpha.2", path = "../../../primitives/authority-discovery" }
+sp-consensus-babe = { version = "0.8.0-alpha.2", path = "../../../primitives/consensus/babe" }
+grandpa-primitives = { version = "2.0.0-alpha.2", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
+sp-core = { version = "2.0.0-alpha.2", path = "../../../primitives/core" }
+sp-runtime = { version = "2.0.0-alpha.2", path = "../../../primitives/runtime" }
+sp-timestamp = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/timestamp" }
+sp-finality-tracker = { version = "2.0.0-alpha.2", default-features = false, path = "../../../primitives/finality-tracker" }
+sp-inherents = { version = "2.0.0-alpha.2", path = "../../../primitives/inherents" }
+sp-keyring = { version = "2.0.0-alpha.2", path = "../../../primitives/keyring" }
+sp-io = { version = "2.0.0-alpha.2", path = "../../../primitives/io" }
+sp-consensus = { version = "0.8.0-alpha.2", path = "../../../primitives/consensus/common" }
# client dependencies
-sc-client-api = { version = "2.0.0", path = "../../../client/api" }
-sc-client = { version = "0.8", path = "../../../client/" }
-sc-chain-spec = { version = "2.0.0", path = "../../../client/chain-spec" }
-sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
-sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
-sc-network = { version = "0.8", path = "../../../client/network" }
-sc-consensus-babe = { version = "0.8", path = "../../../client/consensus/babe" }
-grandpa = { version = "0.8", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-sc-client-db = { version = "0.8", default-features = false, path = "../../../client/db" }
-sc-offchain = { version = "2.0.0", path = "../../../client/offchain" }
-sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
-sc-basic-authorship = { version = "0.8", path = "../../../client/basic-authorship" }
-sc-service = { version = "0.8", default-features = false, path = "../../../client/service" }
-sc-tracing = { version = "2.0.0", path = "../../../client/tracing" }
-sc-telemetry = { version = "2.0.0", path = "../../../client/telemetry" }
-sc-authority-discovery = { version = "0.8", path = "../../../client/authority-discovery" }
+sc-client-api = { version = "2.0.0-alpha.2", path = "../../../client/api" }
+sc-client = { version = "0.8.0-alpha.2", path = "../../../client/" }
+sc-chain-spec = { version = "2.0.0-alpha.2", path = "../../../client/chain-spec" }
+sc-transaction-pool = { version = "2.0.0-alpha.2", path = "../../../client/transaction-pool" }
+sp-transaction-pool = { version = "2.0.0-alpha.2", path = "../../../primitives/transaction-pool" }
+sc-network = { version = "0.8.0-alpha.2", path = "../../../client/network" }
+sc-consensus-babe = { version = "0.8.0-alpha.2", path = "../../../client/consensus/babe" }
+grandpa = { version = "0.8.0-alpha.2", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
+sc-client-db = { version = "0.8.0-alpha.2", default-features = false, path = "../../../client/db" }
+sc-offchain = { version = "2.0.0-alpha.2", path = "../../../client/offchain" }
+sc-rpc = { version = "2.0.0-alpha.2", path = "../../../client/rpc" }
+sc-basic-authorship = { version = "0.8.0-alpha.2", path = "../../../client/basic-authorship" }
+sc-service = { version = "0.8.0-alpha.2", default-features = false, path = "../../../client/service" }
+sc-tracing = { version = "2.0.0-alpha.2", path = "../../../client/tracing" }
+sc-telemetry = { version = "2.0.0-alpha.2", path = "../../../client/telemetry" }
+sc-authority-discovery = { version = "0.8.0-alpha.2", path = "../../../client/authority-discovery" }
# frame dependencies
-pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
-pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
-pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
-frame-system = { version = "2.0.0", path = "../../../frame/system" }
-pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
-pallet-transaction-payment = { version = "2.0.0", path = "../../../frame/transaction-payment" }
-frame-support = { version = "2.0.0", default-features = false, path = "../../../frame/support" }
-pallet-im-online = { version = "2.0.0", default-features = false, path = "../../../frame/im-online" }
-pallet-authority-discovery = { version = "2.0.0", path = "../../../frame/authority-discovery" }
+pallet-indices = { version = "2.0.0-alpha.2", path = "../../../frame/indices" }
+pallet-timestamp = { version = "2.0.0-alpha.2", default-features = false, path = "../../../frame/timestamp" }
+pallet-contracts = { version = "2.0.0-alpha.2", path = "../../../frame/contracts" }
+frame-system = { version = "2.0.0-alpha.2", path = "../../../frame/system" }
+pallet-balances = { version = "2.0.0-alpha.2", path = "../../../frame/balances" }
+pallet-transaction-payment = { version = "2.0.0-alpha.2", path = "../../../frame/transaction-payment" }
+frame-support = { version = "2.0.0-alpha.2", default-features = false, path = "../../../frame/support" }
+pallet-im-online = { version = "2.0.0-alpha.2", default-features = false, path = "../../../frame/im-online" }
+pallet-authority-discovery = { version = "2.0.0-alpha.2", path = "../../../frame/authority-discovery" }
# node-specific dependencies
-node-runtime = { version = "2.0.0", path = "../runtime" }
-node-rpc = { version = "2.0.0", path = "../rpc" }
-node-primitives = { version = "2.0.0", path = "../primitives" }
-node-executor = { version = "2.0.0", path = "../executor" }
+node-runtime = { version = "2.0.0-alpha.2", path = "../runtime" }
+node-rpc = { version = "2.0.0-alpha.2", path = "../rpc" }
+node-primitives = { version = "2.0.0-alpha.2", path = "../primitives" }
+node-executor = { version = "2.0.0-alpha.2", path = "../executor" }
# CLI-specific dependencies
-sc-cli = { version = "0.8.0", optional = true, path = "../../../client/cli" }
-frame-benchmarking-cli = { version = "2.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
-node-transaction-factory = { version = "0.8.0", optional = true, path = "../transaction-factory" }
-node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
+sc-cli = { version = "0.8.0-alpha.2", optional = true, path = "../../../client/cli" }
+frame-benchmarking-cli = { version = "2.0.0-alpha.2", optional = true, path = "../../../utils/frame/benchmarking-cli" }
+node-transaction-factory = { version = "0.8.0-alpha.2", optional = true, path = "../transaction-factory" }
+node-inspect = { version = "0.8.0-alpha.2", optional = true, path = "../inspect" }
# WASM-specific dependencies
wasm-bindgen = { version = "0.2.57", optional = true }
wasm-bindgen-futures = { version = "0.4.7", optional = true }
-browser-utils = { path = "../../../utils/browser", optional = true }
+browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.8.0-alpha.2" }
[dev-dependencies]
-sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
-sc-consensus-babe = { version = "0.8", features = ["test-helpers"], path = "../../../client/consensus/babe" }
-sc-consensus-epochs = { version = "0.8", path = "../../../client/consensus/epochs" }
-sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
+sc-keystore = { version = "2.0.0-alpha.2", path = "../../../client/keystore" }
+sc-consensus-babe = { version = "0.8.0-alpha.2", features = ["test-helpers"], path = "../../../client/consensus/babe" }
+sc-consensus-epochs = { version = "0.8.0-alpha.2", path = "../../../client/consensus/epochs" }
+sc-service-test = { version = "2.0.0-dev", path = "../../../client/service/test" }
futures = "0.3.1"
tempfile = "3.1.0"
assert_cmd = "0.12"
nix = "0.17"
+serde_json = "1.0"
[build-dependencies]
-build-script-utils = { version = "2.0.0", package = "substrate-build-script-utils", path = "../../../utils/build-script-utils" }
+build-script-utils = { version = "2.0.0-alpha.2", package = "substrate-build-script-utils", path = "../../../utils/build-script-utils" }
structopt = { version = "0.3.8", optional = true }
-node-transaction-factory = { version = "0.8.0", optional = true, path = "../transaction-factory" }
-node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
-frame-benchmarking-cli = { version = "2.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
+node-transaction-factory = { version = "0.8.0-alpha.2", optional = true, path = "../transaction-factory" }
+node-inspect = { version = "0.8.0-alpha.2", optional = true, path = "../inspect" }
+frame-benchmarking-cli = { version = "2.0.0-alpha.2", optional = true, path = "../../../utils/frame/benchmarking-cli" }
[build-dependencies.sc-cli]
-version = "0.8.0"
+version = "0.8.0-alpha.2"
package = "sc-cli"
path = "../../../client/cli"
optional = true
@@ -148,3 +151,4 @@ wasmtime = [
"sc-cli/wasmtime",
"sc-service/wasmtime",
]
+runtime-benchmarks = [ "node-runtime/runtime-benchmarks" ]
diff --git a/bin/node/cli/bin/main.rs b/bin/node/cli/bin/main.rs
index e951c04710b92ff387b2f5fd5ba3c144b68af05c..8c4412667baceec56904864413178cbc88001497 100644
--- a/bin/node/cli/bin/main.rs
+++ b/bin/node/cli/bin/main.rs
@@ -18,10 +18,8 @@
#![warn(missing_docs)]
-use sc_cli::VersionInfo;
-
-fn main() -> Result<(), sc_cli::error::Error> {
- let version = VersionInfo {
+fn main() -> sc_cli::Result<()> {
+ let version = sc_cli::VersionInfo {
name: "Substrate Node",
commit: env!("VERGEN_SHA_SHORT"),
version: env!("CARGO_PKG_VERSION"),
diff --git a/bin/node/cli/browser-demo/index.html b/bin/node/cli/browser-demo/index.html
index f40863c46e77d2d811848aa6f459d5fe8381b6fe..60acfde39f5591525a779e9763296bb1af0d8971 100644
--- a/bin/node/cli/browser-demo/index.html
+++ b/bin/node/cli/browser-demo/index.html
@@ -6,7 +6,6 @@