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/kubernetes/templates/service.yaml b/.maintain/kubernetes/templates/service.yaml
index 01ba9d5a567c57045b585aa7e1fa894d404cbf90..b14bb74c10a1abdeae784a51189500e46bce131d 100644
--- a/.maintain/kubernetes/templates/service.yaml
+++ b/.maintain/kubernetes/templates/service.yaml
@@ -33,7 +33,7 @@ spec:
app: {{ .Values.GitlabEnvSlug | default .Values.app }}
sessionAffinity: None
type: NodePort
- # don't route exteral traffic to non-local pods
+ # don't route external traffic to non-local pods
externalTrafficPolicy: Local
{{- else if .Values.validator.keys }}
{{- $root := . -}}
diff --git a/.maintain/kubernetes/values.yaml b/.maintain/kubernetes/values.yaml
index 89a6445e00a2f59c6290ef8e4eafdc9fdd925832..4c3cb5c7d702d6c4a8a3ce6b428012dcd634e3db 100644
--- a/.maintain/kubernetes/values.yaml
+++ b/.maintain/kubernetes/values.yaml
@@ -48,7 +48,7 @@ validator: {}
# substrate-1-node-key
#
# pod names are canonical. changing these or providing different amount of
- # keys than the replicas count will lead to behavior noone ever has
+ # keys than the replicas count will lead to behavior no one ever has
# experienced before.
diff --git a/Cargo.lock b/Cargo.lock
index b93b32fd931f5c0342efcd5b0130fa99ab68f10a..ed90ccbf2ffa9741ab596060237685e365be0921 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",
]
@@ -189,7 +189,7 @@ dependencies = [
"mio",
"mio-uds",
"num_cpus",
- "once_cell 1.3.1",
+ "once_cell",
"pin-project-lite",
"pin-utils",
"slab",
@@ -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,31 +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.3.0"
@@ -580,9 +556,18 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+[[package]]
+name = "chacha20-poly1305-aead"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77d2058ba29594f69c75e8a9018e0485e3914ca5084e3613cd64529042f5423b"
+dependencies = [
+ "constant_time_eq",
+]
+
[[package]]
name = "chain-spec-builder"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"ansi_term 0.12.1",
"node-cli",
@@ -601,7 +586,6 @@ dependencies = [
"js-sys",
"num-integer",
"num-traits",
- "serde",
"time",
"wasm-bindgen",
]
@@ -711,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",
]
@@ -722,25 +716,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
[[package]]
-name = "cranelift-bforest"
-version = "0.50.0"
+name = "core-foundation-sys"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd05aac8cefcde54ce26178df8f36cb1f518ac691db650e7d2440c2b6b41c4dc"
+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.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c63d9b6ff8a94f98deabab21880d7fd54996e0e16be687b6f80a3b6bdd9c188d"
+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",
"log 0.4.8",
"serde",
"smallvec 1.2.0",
@@ -750,9 +749,8 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cb3df51c2c07d719d02869bfac6cabd8d82ee308d5b29ca62e6528723cc33a4"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-codegen-shared",
"cranelift-entity",
@@ -760,24 +758,21 @@ dependencies = [
[[package]]
name = "cranelift-codegen-shared"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758f9426b2e22bf83fc1a6b231a9d53cd4830751883c7f0e196ebb3c210467b3"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
[[package]]
name = "cranelift-entity"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff064733df8b98f453060264a8790393d1e807aca6942706b42f79a4f7aae9ed"
+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.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eaafb5fa623dcbe19a28084a8226d7a1b17184a949c1a1f29a46b479867998d"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-codegen",
"log 0.4.8",
@@ -787,9 +782,8 @@ dependencies = [
[[package]]
name = "cranelift-native"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90033dbd7293f6fad4cf9dcd769cd621d60df22b1c5a11799e86359b7447a51d"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-codegen",
"raw-cpuid",
@@ -798,9 +792,8 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54cb82a1071f88822763a583ec1a8688ffe5e2cda02c111d4483dd4376ed14d8"
+version = "0.59.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -895,35 +888,38 @@ 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 1.0.0",
+ "scopeguard",
]
[[package]]
@@ -938,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",
]
@@ -978,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",
]
@@ -996,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",
]
@@ -1052,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",
]
@@ -1153,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",
]
@@ -1232,11 +1228,38 @@ 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.14.2"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f887b371f9999682ccc5b1cb771e7d4408ae61e93fc0343ceaeb761fca42d1"
+checksum = "272f65e18a2b6449b682bfcdf6c3ccc63db0b93898d89c0fb237548bbfc764a5"
dependencies = [
"evm-core",
"evm-gasometer",
@@ -1249,18 +1272,18 @@ dependencies = [
[[package]]
name = "evm-core"
-version = "0.14.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcde5af3d542874ddeb53de0919302d57586ea04b3f76f54d865f8a6cdc70ae"
+checksum = "66534d42e13d50f9101bed87cb568fd5aa929c600c3c13f8dadbbf39f5635945"
dependencies = [
"primitive-types",
]
[[package]]
name = "evm-gasometer"
-version = "0.14.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b82bc9f275cb59d2bcc05d85c98736ddfaba003a7ef7b73893fa7c1c1fab29dc"
+checksum = "39bc5b592803ca644781fe2290b7305ea5182f7c9516d615ddfb2308c2cab639"
dependencies = [
"evm-core",
"evm-runtime",
@@ -1269,9 +1292,9 @@ dependencies = [
[[package]]
name = "evm-runtime"
-version = "0.14.1"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dbbc89d29618c3722c17ba78ddf432d40ace8ee27e3f8b28b52a85921112e4b"
+checksum = "389e4b447fb26971a9c76c8aa49c0ab435f8e46e8fc46e1bc4ebf01f3c2b428f"
dependencies = [
"evm-core",
"primitive-types",
@@ -1289,9 +1312,9 @@ dependencies = [
[[package]]
name = "faerie"
-version = "0.13.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f902f2af041f6c7177a2a04f805687cdc71e69c7cbef059a2755d8923f4cd7a8"
+checksum = "74b9ed6159e4a6212c61d9c6a86bee01876b192a64accecf58d5b5ae3b667b52"
dependencies = [
"anyhow",
"goblin",
@@ -1305,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",
@@ -1315,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",
]
@@ -1426,14 +1449,44 @@ 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-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-alpha.3"
dependencies = [
+ "frame-benchmarking",
"parity-scale-codec",
+ "sc-cli",
+ "sc-client",
+ "sc-client-db",
+ "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",
@@ -1451,7 +1504,7 @@ dependencies = [
[[package]]
name = "frame-metadata"
-version = "11.0.0"
+version = "11.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"serde",
@@ -1461,7 +1514,7 @@ dependencies = [
[[package]]
name = "frame-support"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"bitmask",
"frame-metadata",
@@ -1469,7 +1522,7 @@ dependencies = [
"frame-system",
"impl-trait-for-tuples",
"log 0.4.8",
- "once_cell 0.2.4",
+ "once_cell",
"parity-scale-codec",
"paste",
"pretty_assertions",
@@ -1486,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",
@@ -1532,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",
@@ -1550,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",
@@ -1578,6 +1631,12 @@ dependencies = [
"winapi 0.3.8",
]
+[[package]]
+name = "fs_extra"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
+
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
@@ -1703,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",
]
@@ -1728,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",
@@ -1781,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"
@@ -1841,14 +1891,15 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.19.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00"
+checksum = "81dd6190aad0f05ddbbf3245c54ed14ca4aa6dd32f22312b70d8f168c3e3e633"
dependencies = [
- "arrayvec 0.4.12",
+ "arrayvec 0.5.1",
"byteorder 1.3.4",
"fallible-iterator",
"indexmap",
+ "smallvec 1.2.0",
"stable_deref_trait",
]
@@ -1901,34 +1952,6 @@ dependencies = [
"scroll",
]
-[[package]]
-name = "grafana-data-source"
-version = "0.8.0"
-dependencies = [
- "async-std",
- "chrono",
- "derive_more",
- "futures-timer 3.0.1",
- "futures-util",
- "hyper 0.13.2",
- "lazy_static",
- "log 0.4.8",
- "parking_lot 0.10.0",
- "serde",
- "serde_json",
- "tokio 0.2.11",
-]
-
-[[package]]
-name = "grafana-data-source-test"
-version = "2.0.0"
-dependencies = [
- "futures 0.3.4",
- "futures-timer 3.0.1",
- "grafana-data-source",
- "rand 0.7.3",
-]
-
[[package]]
name = "h2"
version = "0.1.26"
@@ -1962,7 +1985,7 @@ dependencies = [
"indexmap",
"log 0.4.8",
"slab",
- "tokio 0.2.11",
+ "tokio 0.2.12",
"tokio-util",
]
@@ -1981,22 +2004,6 @@ dependencies = [
"crunchy",
]
-[[package]]
-name = "hashbrown"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
-dependencies = [
- "byteorder 1.3.4",
- "scopeguard 0.3.3",
-]
-
-[[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"
@@ -2018,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"
@@ -2195,28 +2202,30 @@ dependencies = [
"httparse",
"itoa",
"log 0.4.8",
+ "net2",
"pin-project",
"time",
- "tokio 0.2.11",
+ "tokio 0.2.12",
"tower-service",
"want 0.3.0",
]
[[package]]
name = "hyper-rustls"
-version = "0.17.1"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
+checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
dependencies = [
- "bytes 0.4.12",
+ "bytes 0.5.4",
"ct-logs",
- "futures 0.1.29",
- "hyper 0.12.35",
- "rustls",
- "tokio-io",
+ "futures-util",
+ "hyper 0.13.2",
+ "log 0.4.8",
+ "rustls 0.17.0",
+ "rustls-native-certs",
+ "tokio 0.2.12",
"tokio-rustls",
"webpki",
- "webpki-roots 0.17.0",
]
[[package]]
@@ -2296,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",
]
@@ -2419,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",
]
@@ -2593,11 +2602,17 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
+[[package]]
+name = "leb128"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
@@ -2611,9 +2626,9 @@ dependencies = [
[[package]]
name = "libp2p"
-version = "0.15.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84847789ab24b3fc5971a68656ac85886df640986d9ce3264c0327694eae471"
+checksum = "bba17ee9cac4bb89de5812159877d9b4f0a993bf41697a5a875940cd1eb71f24"
dependencies = [
"bytes 0.5.4",
"futures 0.3.4",
@@ -2631,6 +2646,7 @@ dependencies = [
"libp2p-noise",
"libp2p-ping",
"libp2p-plaintext",
+ "libp2p-pnet",
"libp2p-secio",
"libp2p-swarm",
"libp2p-tcp",
@@ -2648,16 +2664,16 @@ dependencies = [
[[package]]
name = "libp2p-core"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbafb2706b8082233f66dc13e196f9cf9b4c229f2cd7c96b2b16617ad6ee330b"
+checksum = "3b874594c4b29de1a29f27871feba8e6cd13aa54a8a1e8f8c7cf3dfac5ca287c"
dependencies = [
"asn1_der",
"bs58",
"ed25519-dalek",
"fnv",
"futures 0.3.4",
- "futures-timer 2.0.2",
+ "futures-timer 3.0.2",
"lazy_static",
"libsecp256k1",
"log 0.4.8",
@@ -2675,26 +2691,25 @@ dependencies = [
"smallvec 1.2.0",
"thiserror",
"unsigned-varint",
- "untrusted",
"void",
"zeroize 1.1.0",
]
[[package]]
name = "libp2p-core-derive"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c320266be0a7760e23484d635acdb83844b2d74d3612d93b41c393c9bcf004e"
+checksum = "96d472e9d522f588805c77801de10b957be84e10f019ca5f869fa1825b15ea9b"
dependencies = [
- "quote 1.0.2",
+ "quote",
"syn",
]
[[package]]
name = "libp2p-deflate"
-version = "0.7.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be32697b42d040b325c3737f827ea04ede569ec956b7807700dd8d89d8210f9"
+checksum = "2e25004d4d9837b44b22c5f1a69be1724a5168fef6cff1716b5176a972c3aa62"
dependencies = [
"flate2",
"futures 0.3.4",
@@ -2703,9 +2718,9 @@ dependencies = [
[[package]]
name = "libp2p-dns"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11c979b882f25d85726b15637d5bbc722dfa1be576605c54e99b8cf56906be3"
+checksum = "b99e552f9939b606eb4b59f7f64d9b01e3f96752f47e350fc3c5fc646ed3f649"
dependencies = [
"futures 0.3.4",
"libp2p-core",
@@ -2714,11 +2729,10 @@ dependencies = [
[[package]]
name = "libp2p-floodsub"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bdf6fba9272ad47dde94bade89540fdb16e24ae9ff7fb714c1c80a035165f28"
+checksum = "1d3234f12e44f9a50351a9807b97fe7de11eb9ae4482370392ba10da6dc90722"
dependencies = [
- "bs58",
"cuckoofilter",
"fnv",
"futures 0.3.4",
@@ -2732,12 +2746,11 @@ dependencies = [
[[package]]
name = "libp2p-gossipsub"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e6ecd058bf769d27ebec530544b081e08b0a1088e3186da8cc58d59915784d0"
+checksum = "d46cb3e0841bd951cbf4feae56cdc081e6347836a644fb260c3ec554149b4006"
dependencies = [
"base64 0.11.0",
- "bs58",
"byteorder 1.3.4",
"bytes 0.5.4",
"fnv",
@@ -2746,7 +2759,7 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log 0.4.8",
- "lru 0.4.3",
+ "lru",
"prost",
"prost-build",
"rand 0.7.3",
@@ -2758,9 +2771,9 @@ dependencies = [
[[package]]
name = "libp2p-identify"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1a6261b804111c2dbf53f8ca03f66edc5ad1c29b78a61cf0cc5354052e28e9"
+checksum = "bfeb935a9bd41263e4f3a24b988e9f4a044f3ae89ac284e83c17fe2f84e0d66b"
dependencies = [
"futures 0.3.4",
"libp2p-core",
@@ -2774,9 +2787,9 @@ dependencies = [
[[package]]
name = "libp2p-kad"
-version = "0.15.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6ea6fece0d99599afb1b2082ca8937944cdd6b0946a88d54cb3ae7a38d1253"
+checksum = "464dc8412978d40f0286be72ed9ab5e0e1386a4a06e7f174526739b5c3c1f041"
dependencies = [
"arrayvec 0.5.1",
"bytes 0.5.4",
@@ -2801,9 +2814,9 @@ dependencies = [
[[package]]
name = "libp2p-mdns"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074312353355df310affa105ec71b16fd7e52f5c6ae61d3dcbb3e79e8fdc9e5f"
+checksum = "881fcfb360c2822db9f0e6bb6f89529621556ed9a8b038313414eda5107334de"
dependencies = [
"async-std",
"data-encoding",
@@ -2823,9 +2836,9 @@ dependencies = [
[[package]]
name = "libp2p-mplex"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d0b44dfdef80cc2be4b42d127de1c793905eca2459415a5c57d6b4fbd8ec30"
+checksum = "d8507b37ad0eed275efcde67a023c3d85af6c80768b193845b9288e848e1af95"
dependencies = [
"bytes 0.5.4",
"fnv",
@@ -2839,11 +2852,11 @@ dependencies = [
[[package]]
name = "libp2p-noise"
-version = "0.13.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0845e8208d814cd41c26c90a6a2f2b720c31b588209cecc49a44c881a09f417f"
+checksum = "b15a8a3d71f898beb6f854c8aae27aa1d198e0d1f2e49412261c2d90ef39675a"
dependencies = [
- "curve25519-dalek 1.2.3",
+ "curve25519-dalek 2.0.0",
"futures 0.3.4",
"lazy_static",
"libp2p-core",
@@ -2851,17 +2864,18 @@ dependencies = [
"prost",
"prost-build",
"rand 0.7.3",
- "ring",
+ "sha2",
"snow",
+ "static_assertions",
"x25519-dalek",
"zeroize 1.1.0",
]
[[package]]
name = "libp2p-ping"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ecced2949ae93b6ff29565303ecd1bef15c4e4efb689033ee744922561a36b"
+checksum = "33d22f2f228b3a828dca1cb8aa9fa331e0bc9c36510cb2c1916956e20dc85e8c"
dependencies = [
"futures 0.3.4",
"libp2p-core",
@@ -2874,9 +2888,9 @@ dependencies = [
[[package]]
name = "libp2p-plaintext"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195fda6b6a948a242fd30570e0e3418ae8e0a20055ea75d45458e1079a8efb05"
+checksum = "56126a204d7b3382bac163143ff4125a14570b3ba76ba979103d1ae1abed1923"
dependencies = [
"bytes 0.5.4",
"futures 0.3.4",
@@ -2891,15 +2905,29 @@ dependencies = [
]
[[package]]
-name = "libp2p-secio"
-version = "0.15.0"
+name = "libp2p-pnet"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceef68ca377b264f84d64c88739a8fa118b5db1e8f18297351dff75314504a5f"
+checksum = "b916938a8868f75180aeeffcc6a516a922d165e8fa2a90b57bad989d1ccbb57a"
dependencies = [
- "aes-ctr",
- "ctr",
"futures 0.3.4",
- "hmac",
+ "log 0.4.8",
+ "pin-project",
+ "rand 0.7.3",
+ "salsa20",
+ "sha3",
+]
+
+[[package]]
+name = "libp2p-secio"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1219e9ecb4945d7331a05f5ffe96a1f6e28051bfa1223d4c60353c251de0354e"
+dependencies = [
+ "aes-ctr",
+ "ctr",
+ "futures 0.3.4",
+ "hmac",
"js-sys",
"lazy_static",
"libp2p-core",
@@ -2922,9 +2950,9 @@ dependencies = [
[[package]]
name = "libp2p-swarm"
-version = "0.5.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14ea00be81bc3985e36abad263ce2ad1b6aeb862aa743563eb70ad42880c05ae"
+checksum = "275471e7c0e88ae004660866cd54f603bd8bd1f4caef541a27f50dd8640c4d4c"
dependencies = [
"futures 0.3.4",
"libp2p-core",
@@ -2936,13 +2964,13 @@ dependencies = [
[[package]]
name = "libp2p-tcp"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e65ef381570df31cb047dfbc11483ab0fe7e6abbdcf2bdc2c60b5d11133d241"
+checksum = "f9e80ad4e3535345f3d666554ce347d3100453775611c05c60786bf9a1747a10"
dependencies = [
"async-std",
"futures 0.3.4",
- "futures-timer 2.0.2",
+ "futures-timer 3.0.2",
"get_if_addrs",
"ipnet",
"libp2p-core",
@@ -2951,9 +2979,9 @@ dependencies = [
[[package]]
name = "libp2p-uds"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e4f4f7989b35f33d4b9738aab2f031310eb20fec513cab44d12b1bc985a8074"
+checksum = "76d329564a43da9d0e055a5b938633c4a8ceab1f59cec133fbc4647917c07341"
dependencies = [
"async-std",
"futures 0.3.4",
@@ -2963,9 +2991,9 @@ dependencies = [
[[package]]
name = "libp2p-wasm-ext"
-version = "0.8.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b4d457adb91a5e2212343218a554394cd8ced64a79fb8e36e7aed2a16d49495"
+checksum = "923581c055bc4b8c5f42d4ce5ef43e52fe5216f1ea4bc26476cb8a966ce6220b"
dependencies = [
"futures 0.3.4",
"js-sys",
@@ -2977,9 +3005,9 @@ dependencies = [
[[package]]
name = "libp2p-websocket"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bba425f2af1fdb7dece88b9ae05ca9430dfb0b72b2c078e73ded6f1556084509"
+checksum = "5351ca9eea122081c1c0f9323164d2918cac29b5a6bfe5054d4ba8ec9447cf42"
dependencies = [
"async-tls",
"bytes 0.5.4",
@@ -2988,7 +3016,7 @@ dependencies = [
"libp2p-core",
"log 0.4.8",
"quicksink",
- "rustls",
+ "rustls 0.16.0",
"rw-stream-sink",
"soketto",
"url 2.1.1",
@@ -2998,13 +3026,12 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
-version = "0.15.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca25b3aac78a3c93c2a567622abd3cfc16f96f26ae1bf6134f0056203d62d86"
+checksum = "9dac30de24ccde0e67f363d71a125c587bbe6589503f664947e9b084b68a34f1"
dependencies = [
"futures 0.3.4",
"libp2p-core",
- "log 0.4.8",
"parking_lot 0.10.0",
"thiserror",
"yamux",
@@ -3012,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",
@@ -3065,22 +3092,13 @@ dependencies = [
"linked-hash-map",
]
-[[package]]
-name = "lock_api"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
-dependencies = [
- "scopeguard 0.3.3",
-]
-
[[package]]
name = "lock_api"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
dependencies = [
- "scopeguard 1.0.0",
+ "scopeguard",
]
[[package]]
@@ -3101,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]]
@@ -3142,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"
@@ -3166,7 +3172,7 @@ checksum = "198831fe8722331a395bc199a5d08efbc197497ef354cb4c77b969c02ffc0fc4"
dependencies = [
"ahash",
"hash-db",
- "hashbrown 0.6.3",
+ "hashbrown",
"parity-util-mem",
]
@@ -3308,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",
]
@@ -3339,10 +3345,10 @@ 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",
"futures 0.3.4",
@@ -3351,6 +3357,7 @@ dependencies = [
"log 0.4.8",
"nix",
"node-executor",
+ "node-inspect",
"node-primitives",
"node-rpc",
"node-runtime",
@@ -3384,6 +3391,7 @@ dependencies = [
"sc-tracing",
"sc-transaction-pool",
"serde",
+ "serde_json",
"sp-authority-discovery",
"sp-consensus",
"sp-consensus-babe",
@@ -3397,6 +3405,7 @@ dependencies = [
"sp-timestamp",
"sp-transaction-pool",
"structopt",
+ "substrate-browser-utils",
"substrate-build-script-utils",
"tempfile",
"tracing",
@@ -3407,9 +3416,10 @@ dependencies = [
[[package]]
name = "node-executor"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"criterion 0.3.1",
+ "frame-benchmarking",
"frame-support",
"frame-system",
"node-primitives",
@@ -3428,6 +3438,7 @@ dependencies = [
"sc-executor",
"sp-application-crypto",
"sp-core",
+ "sp-externalities",
"sp-io",
"sp-runtime",
"sp-state-machine",
@@ -3437,9 +3448,25 @@ dependencies = [
"wabt",
]
+[[package]]
+name = "node-inspect"
+version = "0.8.0-alpha.3"
+dependencies = [
+ "derive_more",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "sc-cli",
+ "sc-client-api",
+ "sc-service",
+ "sp-blockchain",
+ "sp-core",
+ "sp-runtime",
+ "structopt",
+]
+
[[package]]
name = "node-primitives"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"pretty_assertions",
"sp-core",
@@ -3449,7 +3476,7 @@ dependencies = [
[[package]]
name = "node-rpc"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"jsonrpc-core",
"node-primitives",
@@ -3457,7 +3484,14 @@ dependencies = [
"pallet-contracts-rpc",
"pallet-transaction-payment-rpc",
"sc-client",
+ "sc-consensus-babe",
+ "sc-consensus-babe-rpc",
+ "sc-consensus-epochs",
+ "sc-keystore",
"sp-api",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-babe",
"sp-runtime",
"sp-transaction-pool",
"substrate-frame-rpc-system",
@@ -3465,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",
@@ -3478,8 +3512,9 @@ dependencies = [
[[package]]
name = "node-runtime"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
+ "frame-benchmarking",
"frame-executive",
"frame-support",
"frame-system",
@@ -3539,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",
@@ -3547,6 +3582,7 @@ dependencies = [
"sc-basic-authorship",
"sc-cli",
"sc-client",
+ "sc-client-api",
"sc-consensus-aura",
"sc-executor",
"sc-finality-grandpa",
@@ -3567,7 +3603,7 @@ dependencies = [
[[package]]
name = "node-template-runtime"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-executive",
"frame-support",
@@ -3575,7 +3611,6 @@ dependencies = [
"pallet-aura",
"pallet-balances",
"pallet-grandpa",
- "pallet-indices",
"pallet-randomness-collective-flip",
"pallet-sudo",
"pallet-template",
@@ -3600,10 +3635,13 @@ dependencies = [
[[package]]
name = "node-testing"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
+ "criterion 0.3.1",
"frame-support",
"frame-system",
+ "fs_extra",
+ "log 0.4.8",
"node-executor",
"node-primitives",
"node-runtime",
@@ -3618,19 +3656,31 @@ dependencies = [
"pallet-transaction-payment",
"pallet-treasury",
"parity-scale-codec",
+ "sc-cli",
"sc-client",
+ "sc-client-api",
+ "sc-client-db",
"sc-executor",
+ "sc-service",
+ "sp-api",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-consensus",
"sp-core",
+ "sp-finality-tracker",
+ "sp-inherents",
"sp-io",
"sp-keyring",
"sp-runtime",
+ "sp-timestamp",
"substrate-test-client",
+ "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",
@@ -3654,9 +3704,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "nohash-hasher"
-version = "0.1.3"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721a2bf1c26159ebf17e0a980bc4ce61f4b2fec5ec3b42d42fddd7a84a9e538f"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]]
name = "nom"
@@ -3721,35 +3771,37 @@ dependencies = [
]
[[package]]
-name = "ole32-sys"
-version = "0.2.0"
+name = "object"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
+checksum = "ea44a4fd660ab0f38434934ca0212e90fbeaaee54126ef20a3451c30c95bafae"
dependencies = [
- "winapi 0.2.8",
- "winapi-build",
+ "flate2",
+ "goblin",
+ "parity-wasm 0.41.0",
+ "scroll",
+ "target-lexicon",
+ "uuid",
]
[[package]]
-name = "once_cell"
-version = "0.1.8"
+name = "ole32-sys"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37"
+checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
dependencies = [
- "parking_lot 0.7.1",
+ "winapi 0.2.8",
+ "winapi-build",
]
-[[package]]
-name = "once_cell"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d584f08c2d717d5c23a6414fc2822b71c651560713e54fa7eace675f758a355e"
-
[[package]]
name = "once_cell"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
+dependencies = [
+ "parking_lot 0.9.0",
+]
[[package]]
name = "oorandom"
@@ -3807,16 +3859,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",
@@ -3830,7 +3882,7 @@ dependencies = [
[[package]]
name = "pallet-aura"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3852,7 +3904,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3870,7 +3922,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3886,7 +3938,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -3911,8 +3963,9 @@ dependencies = [
[[package]]
name = "pallet-balances"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"pallet-transaction-payment",
@@ -3924,9 +3977,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",
@@ -3942,7 +4009,7 @@ dependencies = [
[[package]]
name = "pallet-contracts"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"assert_matches",
"frame-support",
@@ -3967,7 +4034,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-primitives"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -3976,7 +4043,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -3995,7 +4062,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",
@@ -4006,7 +4073,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4023,7 +4090,7 @@ dependencies = [
[[package]]
name = "pallet-elections"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4039,7 +4106,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4057,7 +4124,7 @@ dependencies = [
[[package]]
name = "pallet-evm"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"evm",
"frame-support",
@@ -4077,8 +4144,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",
@@ -4090,9 +4158,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",
@@ -4109,7 +4192,7 @@ dependencies = [
[[package]]
name = "pallet-generic-asset"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4123,7 +4206,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4141,9 +4224,10 @@ dependencies = [
[[package]]
name = "pallet-identity"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"enumflags2",
+ "frame-benchmarking",
"frame-support",
"frame-system",
"pallet-balances",
@@ -4157,7 +4241,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4175,10 +4259,11 @@ dependencies = [
[[package]]
name = "pallet-indices"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
+ "pallet-balances",
"parity-scale-codec",
"serde",
"sp-core",
@@ -4190,7 +4275,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4204,7 +4289,7 @@ dependencies = [
[[package]]
name = "pallet-nicks"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4219,7 +4304,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4235,7 +4320,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4249,7 +4334,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"enumflags2",
"frame-support",
@@ -4265,7 +4350,7 @@ dependencies = [
[[package]]
name = "pallet-scored-pool"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4280,7 +4365,7 @@ dependencies = [
[[package]]
name = "pallet-session"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4300,7 +4385,7 @@ dependencies = [
[[package]]
name = "pallet-society"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4316,7 +4401,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4339,18 +4424,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",
@@ -4364,7 +4449,7 @@ dependencies = [
[[package]]
name = "pallet-template"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4377,8 +4462,9 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"impl-trait-for-tuples",
@@ -4394,7 +4480,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4409,7 +4495,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -4426,7 +4512,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",
@@ -4439,7 +4525,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4454,7 +4540,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"frame-support",
"frame-system",
@@ -4469,9 +4555,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",
@@ -4493,9 +4580,9 @@ checksum = "0c276d76c5333b8c2579e02d49a06733a55b8282d2d9b13e8d53b6406bd7e30a"
[[package]]
name = "parity-multiaddr"
-version = "0.7.1"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80878c27f90dd162d3143333d672e80b194d6b080f05c83440e3dfda42e409f2"
+checksum = "f77055f9e81921a8cc7bebeb6cded3d128931d51f1e3dd6251f0770a6d431477"
dependencies = [
"arrayref",
"bs58",
@@ -4511,9 +4598,9 @@ dependencies = [
[[package]]
name = "parity-multihash"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b11f42bbd3a021c5061b77154bd3334d5a57e1a03eb162de0b962681cc25800d"
+checksum = "7a1cd2ba02391b81367bec529fb209019d718684fdc8ad6a712c2b536e46f775"
dependencies = [
"blake2",
"bytes 0.5.4",
@@ -4526,9 +4613,9 @@ dependencies = [
[[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",
@@ -4539,13 +4626,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",
]
@@ -4562,7 +4649,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",
@@ -4576,7 +4666,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",
]
@@ -4596,23 +4686,13 @@ version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
-[[package]]
-name = "parking_lot"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
-dependencies = [
- "lock_api 0.1.5",
- "parking_lot_core 0.4.0",
-]
-
[[package]]
name = "parking_lot"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
dependencies = [
- "lock_api 0.3.3",
+ "lock_api",
"parking_lot_core 0.6.2",
"rustc_version",
]
@@ -4623,23 +4703,10 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
dependencies = [
- "lock_api 0.3.3",
+ "lock_api",
"parking_lot_core 0.7.0",
]
-[[package]]
-name = "parking_lot_core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-dependencies = [
- "libc",
- "rand 0.6.5",
- "rustc_version",
- "smallvec 0.6.13",
- "winapi 0.3.8",
-]
-
[[package]]
name = "parking_lot_core"
version = "0.6.2"
@@ -4671,9 +4738,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",
@@ -4681,13 +4748,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",
]
@@ -4750,8 +4817,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",
]
@@ -4799,9 +4866,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",
@@ -4859,25 +4926,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",
@@ -4889,8 +4956,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",
]
@@ -4902,20 +4969,25 @@ checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
[[package]]
name = "proc-macro2"
-version = "0.4.30"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
dependencies = [
- "unicode-xid 0.1.0",
+ "unicode-xid",
]
[[package]]
-name = "proc-macro2"
-version = "1.0.8"
+name = "prometheus"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+checksum = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1"
dependencies = [
- "unicode-xid 0.2.0",
+ "cfg-if",
+ "fnv",
+ "lazy_static",
+ "protobuf",
+ "quick-error",
+ "spin",
]
[[package]]
@@ -4943,7 +5015,7 @@ dependencies = [
"prost",
"prost-types",
"tempfile",
- "which 3.1.0",
+ "which",
]
[[package]]
@@ -4954,8 +5026,8 @@ checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
dependencies = [
"anyhow",
"itertools",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -4969,6 +5041,12 @@ dependencies = [
"prost",
]
+[[package]]
+name = "protobuf"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6686ddd96a8dbe2687b5f2a687b2cfb520854010ec480f2d74c32e7c9873d3c5"
+
[[package]]
name = "pwasm-utils"
version = "0.12.0"
@@ -5011,20 +5089,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]]
@@ -5379,6 +5448,12 @@ version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
[[package]]
name = "rustc-hex"
version = "2.1.0"
@@ -5407,14 +5482,39 @@ 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.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
+dependencies = [
+ "openssl-probe",
+ "rustls 0.17.0",
+ "schannel",
+ "security-framework 0.4.1",
+]
+
[[package]]
name = "rustversion"
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",
]
@@ -5450,6 +5550,26 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+[[package]]
+name = "salsa20"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2324b0e8c3bb9a586a571fdb3136f70e7e2c748de00a78043f86e0cff91f91fe"
+dependencies = [
+ "byteorder 1.3.4",
+ "salsa20-core",
+ "stream-cipher",
+]
+
+[[package]]
+name = "salsa20-core"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fe6cc1b9f5a5867853ade63099de70f042f7679e408d1ffe52821c9248e6e69"
+dependencies = [
+ "stream-cipher",
+]
+
[[package]]
name = "same-file"
version = "1.0.6"
@@ -5461,13 +5581,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",
@@ -5490,14 +5610,13 @@ dependencies = [
[[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",
@@ -5514,7 +5633,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -5525,11 +5644,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",
@@ -5543,17 +5664,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",
@@ -5584,14 +5705,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",
@@ -5621,6 +5743,7 @@ dependencies = [
"sp-std",
"sp-trie",
"sp-version",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
"tracing",
@@ -5628,7 +5751,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"fnv",
@@ -5651,6 +5774,7 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-std",
+ "sp-storage",
"sp-test-primitives",
"sp-transaction-pool",
"sp-trie",
@@ -5659,7 +5783,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",
@@ -5684,19 +5808,19 @@ 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",
@@ -5724,19 +5848,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",
@@ -5759,6 +5881,7 @@ dependencies = [
"sc-service",
"sc-telemetry",
"schnorrkel",
+ "serde",
"sp-api",
"sp-application-crypto",
"sp-block-builder",
@@ -5774,12 +5897,36 @@ dependencies = [
"sp-version",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.1.22",
+]
+
+[[package]]
+name = "sc-consensus-babe-rpc"
+version = "0.8.0-alpha.3"
+dependencies = [
+ "derive_more",
+ "futures 0.3.4",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "sc-consensus-babe",
+ "sc-consensus-epochs",
+ "sc-keystore",
+ "serde",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-keyring",
+ "sp-runtime",
+ "substrate-test-runtime-client",
+ "tempfile",
]
[[package]]
name = "sc-consensus-epochs"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -5791,7 +5938,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",
@@ -5814,12 +5961,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",
@@ -5839,10 +5986,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",
@@ -5860,7 +6007,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",
@@ -5873,7 +6020,7 @@ dependencies = [
[[package]]
name = "sc-executor"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"assert_matches",
"derive_more",
@@ -5892,6 +6039,7 @@ dependencies = [
"sp-externalities",
"sp-io",
"sp-panic-handler",
+ "sp-runtime",
"sp-runtime-interface",
"sp-serializer",
"sp-state-machine",
@@ -5906,7 +6054,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"log 0.4.8",
@@ -5921,7 +6069,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",
@@ -5936,44 +6084,37 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"assert_matches",
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-frontend",
- "cranelift-native",
- "cranelift-wasm",
"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-environ",
- "wasmtime-jit",
- "wasmtime-runtime",
+ "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",
@@ -5994,14 +6135,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",
@@ -6017,7 +6159,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"hex",
@@ -6032,8 +6174,10 @@ dependencies = [
[[package]]
name = "sc-network"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
+ "assert_matches",
+ "async-std",
"bitflags",
"bytes 0.5.4",
"derive_more",
@@ -6043,15 +6187,19 @@ 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",
"rand 0.7.3",
"rustc-hex",
@@ -6072,9 +6220,11 @@ 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",
"void",
"wasm-timer",
@@ -6083,15 +6233,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",
@@ -6099,12 +6247,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",
@@ -6121,20 +6268,19 @@ 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.4.12",
+ "bytes 0.5.4",
"env_logger 0.7.1",
+ "fdlimit",
"fnv",
- "futures 0.1.29",
"futures 0.3.4",
- "futures-timer 3.0.1",
- "hyper 0.12.35",
+ "futures-timer 3.0.2",
+ "hyper 0.13.2",
"hyper-rustls",
"log 0.4.8",
"num_cpus",
@@ -6153,12 +6299,12 @@ dependencies = [
"sp-transaction-pool",
"substrate-test-runtime-client",
"threadpool",
- "tokio 0.1.22",
+ "tokio 0.2.12",
]
[[package]]
name = "sc-peerset"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"futures 0.3.4",
"libp2p",
@@ -6170,7 +6316,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"assert_matches",
"futures 0.1.29",
@@ -6207,7 +6353,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
@@ -6222,13 +6368,14 @@ dependencies = [
"serde_json",
"sp-core",
"sp-rpc",
+ "sp-runtime",
"sp-transaction-pool",
"sp-version",
]
[[package]]
name = "sc-rpc-server"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"jsonrpc-core",
"jsonrpc-http-server",
@@ -6242,7 +6389,7 @@ dependencies = [
[[package]]
name = "sc-runtime-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"sp-allocator",
"sp-core",
@@ -6255,15 +6402,14 @@ 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",
- "grafana-data-source",
+ "futures-timer 3.0.2",
"lazy_static",
"log 0.4.8",
"parity-multiaddr",
@@ -6298,18 +6444,17 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-transaction-pool",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"sysinfo",
"target_info",
- "tokio 0.2.11",
- "tokio-executor 0.1.10",
"tracing",
"wasm-timer",
]
[[package]]
name = "sc-service-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"env_logger 0.7.1",
"fdlimit",
@@ -6329,22 +6474,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",
@@ -6361,10 +6509,9 @@ dependencies = [
[[package]]
name = "sc-tracing"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"erased-serde",
- "grafana-data-source",
"log 0.4.8",
"parking_lot 0.10.0",
"sc-telemetry",
@@ -6377,17 +6524,19 @@ dependencies = [
[[package]]
name = "sc-transaction-graph"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"assert_matches",
"criterion 0.3.1",
"derive_more",
"futures 0.3.4",
+ "linked-hash-map",
"log 0.4.8",
"parity-scale-codec",
"parity-util-mem",
"parking_lot 0.10.0",
"serde",
+ "sp-blockchain",
"sp-core",
"sp-runtime",
"sp-transaction-pool",
@@ -6397,11 +6546,12 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
"futures-diagnose",
+ "futures-timer 2.0.2",
"log 0.4.8",
"parity-scale-codec",
"parity-util-mem",
@@ -6447,16 +6597,16 @@ dependencies = [
]
[[package]]
-name = "scopeguard"
-version = "0.3.3"
+name = "scoped-tls"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
[[package]]
name = "scopeguard"
-version = "1.0.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scroll"
@@ -6473,8 +6623,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",
]
@@ -6494,10 +6644,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]]
@@ -6506,7 +6668,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]]
@@ -6567,16 +6739,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",
@@ -6697,8 +6869,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",
]
@@ -6724,10 +6896,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afb767eee7d257ba202f0b9b08673bc13b22281632ef45267b19f13100accd2f"
dependencies = [
"arrayref",
+ "blake2-rfc",
+ "chacha20-poly1305-aead",
+ "rand 0.7.3",
"rand_core 0.5.1",
"ring",
"rustc_version",
+ "sha2",
"subtle 2.2.2",
+ "x25519-dalek",
]
[[package]]
@@ -6758,7 +6935,7 @@ checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
[[package]]
name = "sp-allocator"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"log 0.4.8",
@@ -6769,7 +6946,7 @@ dependencies = [
[[package]]
name = "sp-api"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"hash-db",
"parity-scale-codec",
@@ -6784,25 +6961,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",
@@ -6812,7 +6991,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"serde",
@@ -6823,7 +7002,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto-test"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"sp-api",
"sp-application-crypto",
@@ -6834,7 +7013,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"criterion 0.3.1",
"integer-sqrt",
@@ -6849,7 +7028,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6860,7 +7039,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -6870,7 +7049,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6881,11 +7060,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",
@@ -6896,12 +7075,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",
@@ -6918,7 +7097,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6931,7 +7110,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -6946,7 +7125,7 @@ dependencies = [
[[package]]
name = "sp-consensus-pow"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6957,7 +7136,7 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"base58",
"blake2-rfc",
@@ -6968,7 +7147,7 @@ dependencies = [
"hash256-std-hasher",
"hex",
"hex-literal",
- "impl-serde 0.2.3",
+ "impl-serde 0.3.0",
"lazy_static",
"libsecp256k1",
"log 0.4.8",
@@ -7001,16 +7180,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",
@@ -7019,7 +7198,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"serde",
@@ -7031,7 +7210,7 @@ dependencies = [
[[package]]
name = "sp-finality-tracker"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -7040,7 +7219,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"parity-scale-codec",
@@ -7051,7 +7230,7 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"hash-db",
"libsecp256k1",
@@ -7068,7 +7247,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"lazy_static",
"sp-core",
@@ -7078,7 +7257,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"sp-api",
"sp-runtime",
@@ -7086,7 +7265,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"backtrace",
"log 0.4.8",
@@ -7094,7 +7273,7 @@ dependencies = [
[[package]]
name = "sp-phragmen"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"rand 0.7.3",
"serde",
@@ -7106,7 +7285,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"serde",
"serde_json",
@@ -7115,8 +7294,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",
@@ -7135,7 +7315,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"primitive-types",
@@ -7154,22 +7334,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",
@@ -7177,7 +7357,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-test-wasm"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"sp-core",
"sp-io",
@@ -7188,7 +7368,7 @@ dependencies = [
[[package]]
name = "sp-sandbox"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"assert_matches",
"parity-scale-codec",
@@ -7202,7 +7382,7 @@ dependencies = [
[[package]]
name = "sp-serializer"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"serde",
"serde_json",
@@ -7210,7 +7390,7 @@ dependencies = [
[[package]]
name = "sp-session"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"sp-api",
"sp-core",
@@ -7220,7 +7400,7 @@ dependencies = [
[[package]]
name = "sp-staking"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -7229,7 +7409,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.8.0"
+version = "0.8.0-alpha.3"
dependencies = [
"hash-db",
"hex-literal",
@@ -7241,6 +7421,7 @@ dependencies = [
"sp-core",
"sp-externalities",
"sp-panic-handler",
+ "sp-runtime",
"sp-trie",
"trie-db",
"trie-root",
@@ -7248,11 +7429,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",
@@ -7262,7 +7443,7 @@ dependencies = [
[[package]]
name = "sp-test-primitives"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -7274,7 +7455,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -7287,7 +7468,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"derive_more",
"futures 0.3.4",
@@ -7300,7 +7481,7 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
dependencies = [
"criterion 0.2.11",
"hash-db",
@@ -7308,6 +7489,7 @@ dependencies = [
"memory-db",
"parity-scale-codec",
"sp-core",
+ "sp-runtime",
"sp-std",
"trie-bench",
"trie-db",
@@ -7317,7 +7499,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",
@@ -7328,7 +7510,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",
@@ -7406,8 +7588,8 @@ checksum = "095064aa1f5b94d14e635d0a5684cf140c43ae40a0fd990708d38f5d669e5f64"
dependencies = [
"heck",
"proc-macro-error",
- "proc-macro2 1.0.8",
- "quote 1.0.2",
+ "proc-macro2",
+ "quote",
"syn",
]
@@ -7427,14 +7609,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",
@@ -7445,6 +7627,7 @@ dependencies = [
"hyper 0.12.35",
"itertools",
"jsonrpc-core-client",
+ "libp2p",
"node-primitives",
"node-runtime",
"pallet-balances",
@@ -7454,6 +7637,7 @@ dependencies = [
"rpassword",
"rustc-hex",
"sc-rpc",
+ "serde_json",
"sp-core",
"sp-runtime",
"substrate-bip39",
@@ -7472,13 +7656,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",
@@ -7489,12 +7698,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",
@@ -7515,9 +7724,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",
@@ -7536,7 +7758,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"cfg-if",
"frame-executive",
@@ -7577,7 +7799,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",
@@ -7594,13 +7816,14 @@ dependencies = [
[[package]]
name = "substrate-test-runtime-transaction-pool"
-version = "2.0.0"
+version = "2.0.0-dev"
dependencies = [
"derive_more",
"futures 0.3.4",
"parity-scale-codec",
"parking_lot 0.10.0",
"sc-transaction-graph",
+ "sp-blockchain",
"sp-runtime",
"sp-transaction-pool",
"substrate-test-runtime-client",
@@ -7608,7 +7831,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
-version = "2.0.0"
+version = "2.0.0-alpha.3"
[[package]]
name = "substrate-wasm-builder"
@@ -7618,6 +7841,7 @@ dependencies = [
"build-helper",
"cargo_metadata",
"fs2",
+ "itertools",
"tempfile",
"toml",
"walkdir",
@@ -7642,13 +7866,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]]
@@ -7657,8 +7881,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",
]
@@ -7668,10 +7892,10 @@ 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]]
@@ -7695,9 +7919,9 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
[[package]]
name = "target-lexicon"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"
+checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"
[[package]]
name = "target_info"
@@ -7735,8 +7959,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",
]
@@ -7752,21 +7976,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",
]
@@ -7801,17 +8025,18 @@ dependencies = [
[[package]]
name = "tiny-bip39"
-version = "0.6.2"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1c5676413eaeb1ea35300a0224416f57abc3bd251657e0fafc12c47ff98c060"
+checksum = "a6848cd8f566953ce1e8faeba12ee23cbdbb0437754792cd857d44628b5685e3"
dependencies = [
"failure",
- "hashbrown 0.1.8",
"hmac",
- "once_cell 0.1.8",
+ "once_cell",
"pbkdf2",
- "rand 0.6.5",
+ "rand 0.7.3",
+ "rustc-hash",
"sha2",
+ "unicode-normalization",
]
[[package]]
@@ -7868,12 +8093,13 @@ 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",
+ "iovec",
"lazy_static",
"libc",
"memchr",
@@ -7882,6 +8108,7 @@ dependencies = [
"num_cpus",
"pin-project-lite",
"signal-hook-registry",
+ "slab",
"tokio-macros",
"winapi 0.3.8",
]
@@ -7963,12 +8190,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",
]
@@ -7993,15 +8220,13 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.10.3"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
+checksum = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
dependencies = [
- "bytes 0.4.12",
- "futures 0.1.29",
- "iovec",
- "rustls",
- "tokio-io",
+ "futures-core",
+ "rustls 0.17.0",
+ "tokio 0.2.12",
"webpki",
]
@@ -8124,7 +8349,7 @@ dependencies = [
"futures-sink",
"log 0.4.8",
"pin-project-lite",
- "tokio 0.2.11",
+ "tokio 0.2.12",
]
[[package]]
@@ -8144,9 +8369,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",
@@ -8155,19 +8380,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",
]
@@ -8207,7 +8432,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",
@@ -8240,9 +8465,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",
@@ -8344,12 +8569,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"
@@ -8358,13 +8577,13 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
[[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",
- "tokio-util",
]
[[package]]
@@ -8395,6 +8614,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"
@@ -8516,8 +8741,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",
]
@@ -8540,7 +8765,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",
]
@@ -8550,8 +8775,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",
@@ -8572,8 +8797,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",
@@ -8632,20 +8857,38 @@ dependencies = [
[[package]]
name = "wasmparser"
-version = "0.39.3"
+version = "0.51.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c702914acda5feeeffbc29e4d953e5b9ce79d8b98da4dbf18a77086e116c5470"
+checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a"
+
+[[package]]
+name = "wasmtime"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
+dependencies = [
+ "anyhow",
+ "backtrace",
+ "cfg-if",
+ "lazy_static",
+ "libc",
+ "region",
+ "rustc-demangle",
+ "target-lexicon",
+ "wasmparser",
+ "wasmtime-environ",
+ "wasmtime-jit",
+ "wasmtime-profiling",
+ "wasmtime-runtime",
+ "wat",
+ "winapi 0.3.8",
+]
[[package]]
name = "wasmtime-debug"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5008729ad53f75020f28fa0d682269335d6f0eac0b3ffafe31f185b2f33aca74"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"anyhow",
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-wasm",
"faerie",
"gimli",
"more-asserts",
@@ -8657,10 +8900,10 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3947662a0b8e05b1418465e64f16de9114f9fec18cc3f56e0ed5aa7737b89d0"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
+ "anyhow",
"base64 0.11.0",
"bincode",
"cranelift-codegen",
@@ -8670,14 +8913,12 @@ dependencies = [
"errno",
"file-per-thread-logger",
"indexmap",
- "lazy_static",
"libc",
"log 0.4.8",
"more-asserts",
"rayon",
"serde",
"sha2",
- "spin",
"thiserror",
"toml",
"wasmparser",
@@ -8687,14 +8928,15 @@ dependencies = [
[[package]]
name = "wasmtime-jit"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed7922689461a7b5bd0d9c7350cac526c8a520a23b3ffd7f5b446ac51dfc51f"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
"anyhow",
+ "cfg-if",
"cranelift-codegen",
"cranelift-entity",
"cranelift-frontend",
+ "cranelift-native",
"cranelift-wasm",
"more-asserts",
"region",
@@ -8703,20 +8945,34 @@ dependencies = [
"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.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781d6bb8b346efaa3dc39746386957cd79b8d841e8652ed9b02d77bcf64fb514"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/wasmtime?branch=a-thread-safe-api#851887d84d03543f931f6312448d0dd5d8a9324e"
dependencies = [
+ "backtrace",
"cc",
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-wasm",
+ "cfg-if",
"indexmap",
"lazy_static",
"libc",
@@ -8725,9 +8981,28 @@ dependencies = [
"region",
"thiserror",
"wasmtime-environ",
+ "wasmtime-profiling",
"winapi 0.3.8",
]
+[[package]]
+name = "wast"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee7b16105405ca2aa2376ba522d8d4b1a11604941dd3bb7df9fd2ece60f8d16a"
+dependencies = [
+ "leb128",
+]
+
+[[package]]
+name = "wat"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56173f7f4fb59aebe35a7e71423845e1c6c7144bfb56362d497931b6b3bed0f6"
+dependencies = [
+ "wast",
+]
+
[[package]]
name = "web-sys"
version = "0.3.35"
@@ -8819,16 +9094,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"
@@ -8911,13 +9176,13 @@ dependencies = [
[[package]]
name = "x25519-dalek"
-version = "0.5.2"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538"
+checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
dependencies = [
- "clear_on_drop",
- "curve25519-dalek 1.2.3",
- "rand_core 0.3.1",
+ "curve25519-dalek 2.0.0",
+ "rand_core 0.5.1",
+ "zeroize 1.1.0",
]
[[package]]
@@ -8928,9 +9193,9 @@ checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
[[package]]
name = "yamux"
-version = "0.4.2"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "902f4cee32c401c211b6b69f4a3f6f4cf3515644db5bd822cf685a7dbd6201f9"
+checksum = "f03098897b734bd943ab23f6aa9f98aafd72a88516deedd66f9d564c57bf2f19"
dependencies = [
"bytes 0.5.4",
"futures 0.3.4",
@@ -8962,8 +9227,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 0c620d251d0972c30d55bd9b35933aab23857c1a..0459bc8ebbd6abd658db6295fefc4c699291207e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,6 +23,7 @@ members = [
"client/cli",
"client/consensus/aura",
"client/consensus/babe",
+ "client/consensus/babe/rpc",
"client/consensus/manual-seal",
"client/consensus/pow",
"client/consensus/uncles",
@@ -52,15 +53,16 @@ members = [
"client/telemetry",
"client/transaction-pool",
"client/transaction-pool/graph",
+ "utils/prometheus",
"utils/wasm-builder-runner",
- "utils/grafana-data-source",
- "utils/grafana-data-source/test",
"frame/assets",
"frame/aura",
"frame/authority-discovery",
"frame/authorship",
"frame/babe",
"frame/balances",
+ "frame/benchmarking",
+ "frame/benchmark",
"frame/collective",
"frame/contracts",
"frame/contracts/rpc",
@@ -70,6 +72,7 @@ members = [
"frame/elections",
"frame/evm",
"frame/example",
+ "frame/example-offchain-worker",
"frame/executive",
"frame/finality-tracker",
"frame/generic-asset",
@@ -155,6 +158,7 @@ members = [
"utils/browser",
"utils/build-script-utils",
"utils/fork-tree",
+ "utils/frame/benchmarking-cli",
"utils/frame/rpc/support",
"utils/frame/rpc/system",
"utils/wasm-builder",
diff --git a/bin/node-template/README.md b/bin/node-template/README.md
index c411dbeef5bcccf9e05d64ddee2405cb5237c678..4ae60478fc72b77f32664b4225c023c36ff5f1af 100644
--- a/bin/node-template/README.md
+++ b/bin/node-template/README.md
@@ -1,6 +1,6 @@
# Substrate Node Template
-A new SRML-based Substrate node, ready for hacking.
+A new FRAME-based Substrate node, ready for hacking.
## Build
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 aa50d06b2391675152b51eb120e723ffbeccd003..64b84005072fda218c5b866e8ec8a1898e27df18 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,
- SudoConfig, IndicesConfig, SystemConfig, WASM_BINARY, Signature
+ SudoConfig, SystemConfig, WASM_BINARY, Signature
};
use sp_consensus_aura::sr25519::{AuthorityId as AuraId};
use grandpa_primitives::{AuthorityId as GrandpaId};
@@ -127,21 +127,18 @@ fn testnet_genesis(initial_authorities: Vec<(AuraId, GrandpaId)>,
code: WASM_BINARY.to_vec(),
changes_trie_config: Default::default(),
}),
- indices: Some(IndicesConfig {
- ids: endowed_accounts.clone(),
- }),
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,
+ }),
}
}
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 d113f90866a405e2ac062054b0a94ba75b98112b..f289ff58549dbc354bfdb706f8edf1659f6b044a 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 sc_client_api::ExecutorProvider;
use node_template_runtime::{self, GenesisConfig, 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();
@@ -41,30 +37,26 @@ macro_rules! new_full_start {
})?
.with_transaction_pool(|config, client, _fetcher| {
let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());
- let pool = sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api));
- Ok(pool)
+ 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));
@@ -96,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()
@@ -116,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,
@@ -146,46 +140,41 @@ 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(),
- service.spawn_task_handle(),
- )?);
- },
- (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(),
- executor: service.spawn_task_handle(),
- };
-
- // 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)
@@ -215,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/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index a1615b4c1f0bc071b7cf54e3977284df8d411061..34e055bf546b0b57a247a8cb083a41de7d064508 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -1,12 +1,12 @@
#![cfg_attr(not(feature = "std"), no_std)]
-/// A runtime module template with necessary imports
+/// A FRAME pallet template with necessary imports
/// Feel free to remove or edit this file as needed.
/// If you change the name of this file, make sure to update its references in runtime/src/lib.rs
/// If you remove this file, you can remove those references
-/// For more guidance on Substrate modules, see the example module
+/// For more guidance on Substrate FRAME, see the example pallet
/// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs
use frame_support::{decl_module, decl_storage, decl_event, decl_error, dispatch};
@@ -41,7 +41,7 @@ decl_event!(
pub enum Event where AccountId = ::AccountId {
/// Just a dummy event.
/// Event `Something` is declared with a parameter of the type `u32` and `AccountId`
- /// To emit this event, we call the deposit funtion, from our runtime funtions
+ /// To emit this event, we call the deposit function, from our runtime functions
SomethingStored(u32, AccountId),
}
);
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 2cbfc89d5b3ae69e3737b2667a3b7972effcdf70..2ea81ffb456261122b234c6ae3c36f52eaa9c430 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -11,9 +11,9 @@ impl_outer_origin! {
pub enum Origin for Test {}
}
-// For testing the module, we construct most of a mock runtime. This means
+// For testing the pallet, we construct most of a mock runtime. This means
// first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of modules we want to use.
+// configuration traits of pallets we want to use.
#[derive(Clone, Eq, PartialEq)]
pub struct Test;
parameter_types! {
@@ -39,6 +39,9 @@ impl system::Trait for Test {
type AvailableBlockRatio = AvailableBlockRatio;
type Version = ();
type ModuleToIndex = ();
+ type AccountData = ();
+ type OnNewAccount = ();
+ type OnKilledAccount = ();
}
impl Trait for Test {
type Event = ();
diff --git a/bin/node-template/pallets/template/src/tests.rs b/bin/node-template/pallets/template/src/tests.rs
index 44a423c948fbf88cb193612fbab307d4df20b634..ec123a50c7cc984f15c8f80983ed300d95ecdccf 100644
--- a/bin/node-template/pallets/template/src/tests.rs
+++ b/bin/node-template/pallets/template/src/tests.rs
@@ -6,7 +6,7 @@ use frame_support::{assert_ok, assert_noop};
#[test]
fn it_works_for_default_value() {
new_test_ext().execute_with(|| {
- // Just a dummy test for the dummy funtion `do_something`
+ // Just a dummy test for the dummy function `do_something`
// calling the `do_something` function with a value 42
assert_ok!(TemplateModule::do_something(Origin::signed(1), 42));
// asserting that the stored value is equal to what we stored
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 a863ec40a70a9ff7dca85cd10f09f5ff5ae57baa..0414759a5ad86f5c5be4adb1cc5031d4adf1b4e7 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -12,10 +12,10 @@ use sp_std::prelude::*;
use sp_core::OpaqueMetadata;
use sp_runtime::{
ApplyExtrinsicResult, transaction_validity::TransactionValidity, generic, create_runtime_str,
- impl_opaque_keys, MultiSignature
+ 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;
@@ -69,7 +69,7 @@ pub type DigestItem = generic::DigestItem;
/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
/// the specifics of the runtime. They can then be made to be agnostic over specific formats
/// of data like extrinsics, allowing for them to continue syncing the network through upgrades
-/// to even the core datastructures.
+/// to even the core data structures.
pub mod opaque {
use super::*;
@@ -109,7 +109,7 @@ pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
pub const HOURS: BlockNumber = MINUTES * 60;
pub const DAYS: BlockNumber = HOURS * 24;
-/// The version infromation used to identify this runtime when compiled natively.
+/// The version information used to identify this runtime when compiled natively.
#[cfg(feature = "std")]
pub fn native_version() -> NativeVersion {
NativeVersion {
@@ -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.
@@ -161,6 +161,12 @@ impl system::Trait for Runtime {
///
/// This type is being generated by `construct_runtime!`.
type ModuleToIndex = ModuleToIndex;
+ /// What to do if a new account is created.
+ type OnNewAccount = ();
+ /// What to do if an account is fully reaped from the system.
+ type OnKilledAccount = ();
+ /// The data to be stored in an account.
+ type AccountData = balances::AccountData;
}
impl aura::Trait for Runtime {
@@ -171,18 +177,6 @@ impl grandpa::Trait for Runtime {
type Event = Event;
}
-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;
- /// Use the standard means of resolving an index hint from an id.
- type ResolveHint = indices::SimpleResolveHint;
- /// Determine whether an account is dead.
- type IsDeadAccount = Balances;
- /// The ubiquitous event type.
- type Event = Event;
-}
-
parameter_types! {
pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
}
@@ -196,22 +190,16 @@ impl timestamp::Trait for Runtime {
parameter_types! {
pub const ExistentialDeposit: u128 = 500;
- pub const CreationFee: u128 = 0;
}
impl balances::Trait for Runtime {
/// The type for recording an account's balance.
type Balance = Balance;
- /// What to do if an account is fully reaped from the system.
- type OnReapAccount = System;
- /// What to do if a new account is created.
- type OnNewAccount = Indices;
/// The ubiquitous event type.
type Event = Event;
type DustRemoval = ();
- type TransferPayment = ();
type ExistentialDeposit = ExistentialDeposit;
- type CreationFee = CreationFee;
+ type AccountStore = System;
}
parameter_types! {
@@ -230,7 +218,7 @@ impl transaction_payment::Trait for Runtime {
impl sudo::Trait for Runtime {
type Event = Event;
- type Proposal = Call;
+ type Call = Call;
}
/// Used for the module template in `./template.rs`
@@ -244,22 +232,21 @@ construct_runtime!(
NodeBlock = opaque::Block,
UncheckedExtrinsic = UncheckedExtrinsic
{
- System: system::{Module, Call, Storage, Config, Event},
+ 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,
- Balances: balances,
+ Balances: balances::{Module, Call, Storage, Config, Event},
TransactionPayment: transaction_payment::{Module, Storage},
- Sudo: sudo,
+ 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.
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index dad76ae4bfdad4b9f267f077bc168b8f1ed490ad..e18b6b228e65553543891d6e5cbcd6fb6094c752 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -1,12 +1,19 @@
[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
+# https://github.com/rustwasm/wasm-pack/issues/781 etc.
+wasm-opt = false
[badges]
travis-ci = { repository = "paritytech/substrate", branch = "master" }
@@ -24,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"
@@ -35,79 +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" }
-node-transaction-factory = { version = "0.8.0", optional = true, path = "../transaction-factory" }
+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-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
@@ -124,12 +136,14 @@ browser = [
"wasm-bindgen-futures",
]
cli = [
- "sc-cli",
+ "node-executor/wasmi-errno",
+ "node-inspect",
"node-transaction-factory",
+ "sc-cli",
+ "frame-benchmarking-cli",
"sc-service/rocksdb",
- "node-executor/wasmi-errno",
- "vergen",
"structopt",
+ "vergen",
]
wasmtime = [
"cli",
@@ -137,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 @@