diff --git a/.github/workflows/polkadot-companion-labels.yml b/.github/workflows/polkadot-companion-labels.yml
index 27f743e1bd4529dc83ee7dfd5b96c6c5bb4ac3f8..3c3987b5f4d563cfa15f36a87dc588a674b59660 100644
--- a/.github/workflows/polkadot-companion-labels.yml
+++ b/.github/workflows/polkadot-companion-labels.yml
@@ -16,9 +16,10 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
contexts: 'continuous-integration/gitlab-check-polkadot-companion-build'
timeout: 1800
- notPresentTimeout: 3600 # It can take quite a while before the job starts...
+ notPresentTimeout: 3600 # It can take quite a while before the job starts on Gitlab when the CI queue is large
failureStates: failure
interruptedStates: error # Error = job was probably cancelled. We don't want to label the PR in that case
+ pollInterval: 30
- name: Label success
uses: andymckay/labeler@master
if: steps.check-companion-status.outputs.result == 'success'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c97d68bab0030484317757c9a69737430c80d5d8..3ec5b007119c631d08df7b9dd8785f78ddb82cf5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@
# image: paritytech/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)
+# - build-rust-doc # 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:
@@ -193,6 +193,9 @@ cargo-deny:
- schedules
- tags
- web
+ except:
+ variables:
+ - $CI_COMMIT_MESSAGE =~ /skip-checks/
script:
- cargo deny check --hide-inclusion-graph -c .maintain/deny.toml
after_script:
@@ -273,6 +276,9 @@ unleash-check:
only:
- master
- tags
+ except:
+ variables:
+ - $CI_COMMIT_MESSAGE =~ /skip-checks/
script:
- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
- cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
@@ -336,6 +342,9 @@ check-web-wasm:
- time cargo build --target=wasm32-unknown-unknown -p sc-telemetry
# Note: the command below is a bit weird because several Cargo issues prevent us from compiling the node in a more straight-forward way.
- time cargo +nightly build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features browser --target=wasm32-unknown-unknown -Z features=itarget
+ # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
+ - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features
+ - time cargo +nightly test --manifest-path primitives/tracing/Cargo.toml --no-default-features --features=with-tracing
- sccache -s
test-full-crypto-feature:
@@ -476,23 +485,25 @@ build-macos-subkey:
tags:
- osx
-build-rust-doc-release:
+build-rust-doc:
stage: build
<<: *docker-env
<<: *docker-env-only
allow_failure: true
+ variables:
+ <<: *default-vars
+ RUSTFLAGS: -Dwarnings
artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
when: on_success
expire_in: 7 days
paths:
- - ./crate-docs
- <<: *build-only
+ - ./crate-docs/
script:
- rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds
- BUILD_DUMMY_WASM_BINARY=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
- time cargo +nightly doc --release --all --verbose
- - cp -R ./target/doc ./crate-docs
+ time cargo +nightly doc --no-deps --workspace --all-features --verbose
+ - mv ./target/doc ./crate-docs
- echo "" > ./crate-docs/index.html
- sccache -s
@@ -520,7 +531,7 @@ docker-build-chaos: &docker-build-chaos
needs:
- job: build-linux-substrate
image: docker:stable
- tags:
+ tags:
- kubernetes-parity-build
variables:
<<: *default-vars
@@ -559,7 +570,7 @@ chaos-test-singlenodeheight:
image: parity/chaostools:latest
needs:
- job: docker-build-chaos
- tags:
+ tags:
- parity-chaos
variables:
<<: *default-vars
@@ -670,7 +681,7 @@ publish-s3-doc:
image: paritytech/awscli:latest
allow_failure: true
needs:
- - job: build-rust-doc-release
+ - job: build-rust-doc
artifacts: true
<<: *build-only
<<: *kubernetes-build
@@ -734,7 +745,8 @@ deploy-kubernetes-alerting-rules:
refs:
- master
changes:
- - "${RULES}"
+ - .gitlab-ci.yml
+ - .maintain/monitoring/
diff --git a/.maintain/chaostest/package-lock.json b/.maintain/chaostest/package-lock.json
index 8855f221a133d14040312ce255bbf5ced3c27183..09468e12fb4f9ca72d8d6e352960464d4b2502ab 100644
--- a/.maintain/chaostest/package-lock.json
+++ b/.maintain/chaostest/package-lock.json
@@ -941,9 +941,9 @@
}
},
"bl": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
- "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+ "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
"dev": true,
"requires": {
"buffer": "^5.5.0",
@@ -3836,9 +3836,9 @@
}
},
"lodash": {
- "version": "4.17.15",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
- "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+ "version": "4.17.20",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+ "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
},
"lodash._reinterpolate": {
"version": "3.0.0",
diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index b78c26dea8458b0bcc7c172d163d31be68354b90..219af5001b0537b40df60a5a8f77f2f939f97d0a 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env sh
#
-# check if a pr is compatible with polkadot companion pr or master if not
+# check if a pr is compatible with polkadot companion pr or master if not
# available
#
-# to override one that was just mentioned mark companion pr in the body of the
+# to override one that was just mentioned mark companion pr in the body of the
# polkadot pr like
#
# polkadot companion: paritytech/polkadot#567
@@ -12,7 +12,7 @@
github_api_substrate_pull_url="https://api.github.com/repos/paritytech/substrate/pulls"
# use github api v3 in order to access the data without authentication
-github_header="Authorization: token ${GITHUB_PR_TOKEN}"
+github_header="Authorization: token ${GITHUB_PR_TOKEN}"
boldprint () { printf "|\n| \033[1m${@}\033[0m\n|\n" ; }
boldcat () { printf "|\n"; while read l; do printf "| \033[1m${l}\033[0m\n"; done; printf "|\n" ; }
@@ -40,7 +40,7 @@ EOT
git config --global user.name 'CI system'
git config --global user.email '<>'
-SUBSTRATE_PATH=$(pwd)
+cargo install -f --version 0.2.0 diener
# Merge master into our branch before building Polkadot to make sure we don't miss
# any commits that are required by Polkadot.
@@ -85,14 +85,10 @@ else
boldprint "this is not a pull request - building polkadot:master"
fi
-# Make sure we override the crates in native and wasm build
-# patching the git path as described in the link below did not test correctly
-# https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html
-mkdir .cargo
-echo "paths = [ \"$SUBSTRATE_PATH\" ]" > .cargo/config
-
-mkdir -p target/debug/wbuild/.cargo
-cp .cargo/config target/debug/wbuild/.cargo/config
+cd ..
+$CARGO_HOME/bin/diener --substrate --branch $CI_COMMIT_REF_NAME --git https://gitlab.parity.io/parity/substrate.git --path polkadot
+cd polkadot
# Test Polkadot pr or master branch with this Substrate commit.
+cargo update -p sp-io
time cargo test --all --release --verbose
diff --git a/.maintain/monitoring/alerting-rules/alerting-rules.yaml b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
index 12f46e17ad85b3b29ea169a2b3ac861c7118b6a3..7f36fedb4ba678041a4cc375e3ddef9d22956993 100644
--- a/.maintain/monitoring/alerting-rules/alerting-rules.yaml
+++ b/.maintain/monitoring/alerting-rules/alerting-rules.yaml
@@ -109,6 +109,19 @@ groups:
message: 'The node {{ $labels.instance }} has less than 3 peers for more
than 15 minutes'
+ ##############################################################################
+ # System
+ ##############################################################################
+
+ - alert: HighNumberOfFileDescriptors
+ expr: 'node_filefd_allocated{domain=~"kusama|polkadot"} > 10000'
+ for: 3m
+ labels:
+ severity: warning
+ annotations:
+ message: 'The node {{ $labels.instance }} has more than 10_000 file
+ descriptors allocated for more than 3 minutes'
+
##############################################################################
# Others
##############################################################################
diff --git a/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json b/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
index 245071c210bfc48d815b6f963f3d51fbc4dd61b4..539fdec086a370367176fa4dc6681a61d876385e 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-service-tasks.json
@@ -44,14 +44,14 @@
{
"datasource": "$data_source",
"enable": true,
- "expr": "increase(${metric_namespace}_tasks_ended_total{reason=\"panic\", instance=~\"${nodename}\"}[5m])",
+ "expr": "increase(${metric_namespace}_tasks_ended_total{reason=\"panic\", instance=~\"${nodename}\"}[10m])",
"hide": true,
"iconColor": "rgba(255, 96, 96, 1)",
"limit": 100,
"name": "Task panics",
"rawQuery": "SELECT\n extract(epoch from time_column) AS time,\n text_column as text,\n tags_column as tags\nFROM\n metric_table\nWHERE\n $__timeFilter(time_column)\n",
"showIn": 0,
- "step": "",
+ "step": "10m",
"tags": [],
"textFormat": "{{instance}} - {{task_name}}",
"titleFormat": "Panic!",
@@ -60,12 +60,12 @@
{
"datasource": "$data_source",
"enable": true,
- "expr": "changes(${metric_namespace}_process_start_time_seconds{instance=~\"${nodename}\"}[5m])",
+ "expr": "changes(${metric_namespace}_process_start_time_seconds{instance=~\"${nodename}\"}[10m])",
"hide": false,
"iconColor": "#8AB8FF",
"name": "Node reboots",
"showIn": 0,
- "step": "",
+ "step": "10m",
"textFormat": "{{instance}}",
"titleFormat": "Reboots"
}
@@ -75,7 +75,7 @@
"gnetId": null,
"graphTooltip": 0,
"id": null,
- "iteration": 1594822742772,
+ "iteration": 1599471940817,
"links": [],
"panels": [
{
@@ -87,9 +87,9 @@
"x": 0,
"y": 0
},
- "id": 25,
+ "id": 29,
"panels": [],
- "title": "CPU & Memory",
+ "title": "Tasks",
"type": "row"
},
{
@@ -107,130 +107,23 @@
"y": 1
},
"hiddenSeries": false,
- "id": 9,
+ "id": 11,
+ "interval": "1m",
"legend": {
- "avg": false,
+ "alignAsTable": true,
+ "avg": true,
"current": false,
+ "hideEmpty": false,
+ "hideZero": false,
"max": false,
"min": false,
- "show": false,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "nullPointMode": "null",
- "options": {
- "dataLinks": []
- },
- "percentage": false,
- "pointradius": 2,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [
- {
- "alias": "stddev-above",
- "fillBelowTo": "stddev-below",
- "hideTooltip": true,
- "lines": false
- },
- {
- "alias": "stddev-below",
- "hideTooltip": true,
- "lines": false
- }
- ],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "avg(${metric_namespace}_cpu_usage_percentage{instance=~\"${nodename}\"})",
- "interval": "",
- "legendFormat": "cpu-usage",
- "refId": "A"
- },
- {
- "expr": "avg(${metric_namespace}_cpu_usage_percentage{instance=~\"${nodename}\"}) - stddev(${metric_namespace}_cpu_usage_percentage{instance=~\"${nodename}\"})",
- "interval": "",
- "legendFormat": "stddev-below",
- "refId": "B"
- },
- {
- "expr": "avg(${metric_namespace}_cpu_usage_percentage{instance=~\"${nodename}\"}) + stddev(${metric_namespace}_cpu_usage_percentage{instance=~\"${nodename}\"})",
- "interval": "",
- "legendFormat": "stddev-above",
- "refId": "C"
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeRegions": [],
- "timeShift": null,
- "title": "Average CPU usage and standard deviation",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
+ "rightSide": true,
"show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "percent",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": "0",
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$data_source",
- "fill": 0,
- "fillGradient": 0,
- "gridPos": {
- "h": 6,
- "w": 24,
- "x": 0,
- "y": 7
- },
- "hiddenSeries": false,
- "id": 20,
- "legend": {
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": false,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
- "linewidth": 1,
+ "linewidth": 2,
"nullPointMode": "null",
"options": {
"dataLinks": []
@@ -242,12 +135,12 @@
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
- "steppedLine": false,
+ "steppedLine": true,
"targets": [
{
- "expr": "${metric_namespace}_memory_usage_bytes{instance=~\"${nodename}\"}",
+ "expr": "avg(irate(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[10m])) by (task_name)",
"interval": "",
- "legendFormat": "{{instance}}",
+ "legendFormat": "{{task_name}}",
"refId": "A"
}
],
@@ -255,7 +148,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Memory usage",
+ "title": "CPU time spent on each task (average per node)",
"tooltip": {
"shared": true,
"sort": 2,
@@ -271,7 +164,7 @@
},
"yaxes": [
{
- "format": "decbytes",
+ "format": "percentunit",
"label": null,
"logBase": 1,
"max": null,
@@ -292,20 +185,6 @@
"alignLevel": null
}
},
- {
- "collapsed": false,
- "datasource": null,
- "gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 13
- },
- "id": 29,
- "panels": [],
- "title": "Tasks",
- "type": "row"
- },
{
"aliasColors": {},
"bars": false,
@@ -318,19 +197,23 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 14
+ "y": 7
},
"hiddenSeries": false,
- "id": 11,
- "interval": "1m",
+ "id": 30,
+ "interval": "",
"legend": {
- "avg": false,
+ "alignAsTable": true,
+ "avg": true,
"current": false,
+ "hideEmpty": false,
+ "hideZero": false,
"max": false,
"min": false,
- "show": false,
+ "rightSide": true,
+ "show": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 2,
@@ -348,7 +231,7 @@
"steppedLine": true,
"targets": [
{
- "expr": "avg(increase(${metric_namespace}_tasks_polling_duration_sum{instance=~\"${nodename}\"}[$__interval])) by (task_name) * 1000 / $__interval_ms",
+ "expr": "avg(irate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[10m])) by (task_name)",
"interval": "",
"legendFormat": "{{task_name}}",
"refId": "A"
@@ -358,7 +241,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "CPU time spent on each task (average per node)",
+ "title": "Task polling rate per second (average per node)",
"tooltip": {
"shared": true,
"sort": 2,
@@ -374,7 +257,7 @@
},
"yaxes": [
{
- "format": "percentunit",
+ "format": "cps",
"label": null,
"logBase": 1,
"max": null,
@@ -407,16 +290,16 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 20
+ "y": 13
},
"hiddenSeries": false,
- "id": 30,
+ "id": 31,
"interval": "",
"legend": {
"alignAsTable": true,
- "avg": true,
+ "avg": false,
"current": false,
- "max": false,
+ "max": true,
"min": false,
"rightSide": true,
"show": true,
@@ -439,7 +322,7 @@
"steppedLine": true,
"targets": [
{
- "expr": "avg(rate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[5m])) by (task_name)",
+ "expr": "max(irate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[10m])) by (task_name)",
"interval": "",
"legendFormat": "{{task_name}}",
"refId": "A"
@@ -449,7 +332,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Task polling rate per second (average per node)",
+ "title": "Task polling rate per second (maximum per node)",
"tooltip": {
"shared": true,
"sort": 2,
@@ -498,16 +381,16 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 26
+ "y": 19
},
"hiddenSeries": false,
- "id": 31,
+ "id": 15,
"interval": "",
"legend": {
"alignAsTable": true,
- "avg": false,
+ "avg": true,
"current": false,
- "max": true,
+ "max": false,
"min": false,
"rightSide": true,
"show": true,
@@ -515,8 +398,8 @@
"values": true
},
"lines": true,
- "linewidth": 2,
- "nullPointMode": "null",
+ "linewidth": 1,
+ "nullPointMode": "null as zero",
"options": {
"dataLinks": []
},
@@ -530,7 +413,7 @@
"steppedLine": true,
"targets": [
{
- "expr": "max(rate(${metric_namespace}_tasks_polling_duration_count{instance=~\"${nodename}\"}[5m])) by (task_name)",
+ "expr": "avg by(task_name) (irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[10m]))",
"interval": "",
"legendFormat": "{{task_name}}",
"refId": "A"
@@ -540,7 +423,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Task polling rate per second (maximum per node)",
+ "title": "Number of tasks started per second (average per node)",
"tooltip": {
"shared": true,
"sort": 2,
@@ -556,11 +439,11 @@
},
"yaxes": [
{
- "format": "cps",
+ "format": "short",
"label": null,
- "logBase": 1,
+ "logBase": 10,
"max": null,
- "min": null,
+ "min": "0",
"show": true
},
{
@@ -569,7 +452,7 @@
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
],
"yaxis": {
@@ -589,21 +472,21 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 32
+ "y": 25
},
"hiddenSeries": false,
- "id": 15,
+ "id": 16,
"interval": "",
"legend": {
- "alignAsTable": false,
+ "alignAsTable": true,
"avg": false,
"current": false,
- "max": false,
+ "max": true,
"min": false,
- "rightSide": false,
- "show": false,
+ "rightSide": true,
+ "show": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 1,
@@ -621,7 +504,7 @@
"steppedLine": true,
"targets": [
{
- "expr": "avg by(task_name) (irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[5m]))",
+ "expr": "max by(task_name) (irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[10m]))",
"interval": "",
"legendFormat": "{{task_name}}",
"refId": "A"
@@ -631,7 +514,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Number of tasks started per second (average per node)",
+ "title": "Number of tasks started per second (maximum over all nodes)",
"tooltip": {
"shared": true,
"sort": 2,
@@ -680,21 +563,21 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 38
+ "y": 31
},
"hiddenSeries": false,
- "id": 16,
+ "id": 2,
"interval": "",
"legend": {
- "alignAsTable": false,
- "avg": false,
+ "alignAsTable": true,
+ "avg": true,
"current": false,
"max": false,
"min": false,
- "rightSide": false,
- "show": false,
+ "rightSide": true,
+ "show": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 1,
@@ -712,7 +595,7 @@
"steppedLine": true,
"targets": [
{
- "expr": "max by(task_name) (irate(${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"}[5m]))",
+ "expr": "avg by(task_name) (${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"} - sum(${metric_namespace}_tasks_ended_total{instance=~\"${nodename}\"}) without(reason))",
"interval": "",
"legendFormat": "{{task_name}}",
"refId": "A"
@@ -722,7 +605,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Number of tasks started per second (maximum over all nodes)",
+ "title": "Number of tasks running (average per node)",
"tooltip": {
"shared": true,
"sort": 2,
@@ -771,21 +654,21 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 44
+ "y": 37
},
"hiddenSeries": false,
- "id": 2,
+ "id": 3,
"interval": "",
"legend": {
- "alignAsTable": false,
+ "alignAsTable": true,
"avg": false,
"current": false,
- "max": false,
+ "max": true,
"min": false,
- "rightSide": false,
- "show": false,
+ "rightSide": true,
+ "show": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 1,
@@ -803,7 +686,7 @@
"steppedLine": true,
"targets": [
{
- "expr": "avg by(task_name) (${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"} - sum(${metric_namespace}_tasks_ended_total{instance=~\"${nodename}\"}) without(reason))",
+ "expr": "max by(task_name) (${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"} - sum(${metric_namespace}_tasks_ended_total{instance=~\"${nodename}\"}) without(reason))",
"interval": "",
"legendFormat": "{{task_name}}",
"refId": "A"
@@ -813,7 +696,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Number of tasks running (average per node)",
+ "title": "Number of tasks running (maximum over all nodes)",
"tooltip": {
"shared": true,
"sort": 2,
@@ -856,27 +739,30 @@
"dashLength": 10,
"dashes": false,
"datasource": "$data_source",
+ "decimals": null,
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 6,
"w": 24,
"x": 0,
- "y": 50
+ "y": 43
},
"hiddenSeries": false,
- "id": 3,
+ "id": 7,
"interval": "",
"legend": {
- "alignAsTable": false,
- "avg": false,
+ "alignAsTable": true,
+ "avg": true,
"current": false,
+ "hideEmpty": true,
+ "hideZero": true,
"max": false,
"min": false,
- "rightSide": false,
- "show": false,
+ "rightSide": true,
+ "show": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 1,
@@ -890,11 +776,11 @@
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
- "stack": false,
+ "stack": true,
"steppedLine": true,
"targets": [
{
- "expr": "max by(task_name) (${metric_namespace}_tasks_spawned_total{instance=~\"${nodename}\"} - sum(${metric_namespace}_tasks_ended_total{instance=~\"${nodename}\"}) without(reason))",
+ "expr": "avg(\n irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"+Inf\"}[10m])\n - ignoring(le)\n irate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"1.024\"}[10m])\n) by (task_name) > 0",
"interval": "",
"legendFormat": "{{task_name}}",
"refId": "A"
@@ -904,11 +790,11 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Number of tasks running (maximum over all nodes)",
+ "title": "Calls to `Future::poll` that took more than one second (average per node)",
"tooltip": {
"shared": true,
"sort": 2,
- "value_type": "individual"
+ "value_type": "cumulative"
},
"type": "graph",
"xaxis": {
@@ -920,9 +806,10 @@
},
"yaxes": [
{
- "format": "short",
- "label": null,
- "logBase": 10,
+ "decimals": null,
+ "format": "cps",
+ "label": "Calls to `Future::poll`/second",
+ "logBase": 1,
"max": null,
"min": "0",
"show": true
@@ -933,7 +820,7 @@
"logBase": 1,
"max": null,
"min": null,
- "show": true
+ "show": false
}
],
"yaxis": {
@@ -941,6 +828,20 @@
"alignLevel": null
}
},
+ {
+ "collapsed": false,
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 49
+ },
+ "id": 27,
+ "panels": [],
+ "title": "Misc",
+ "type": "row"
+ },
{
"aliasColors": {},
"bars": false,
@@ -950,21 +851,18 @@
"fill": 0,
"fillGradient": 0,
"gridPos": {
- "h": 6,
+ "h": 7,
"w": 24,
"x": 0,
- "y": 56
+ "y": 50
},
"hiddenSeries": false,
- "id": 7,
- "interval": "",
+ "id": 32,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
- "hideEmpty": true,
- "hideZero": true,
- "max": false,
+ "max": true,
"min": false,
"rightSide": true,
"show": true,
@@ -973,7 +871,7 @@
},
"lines": true,
"linewidth": 1,
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"options": {
"dataLinks": []
},
@@ -983,25 +881,25 @@
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
- "stack": true,
- "steppedLine": true,
+ "stack": false,
+ "steppedLine": false,
"targets": [
{
- "expr": "avg(\n rate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"+Inf\"}[1m])\n - ignoring(le)\n rate(${metric_namespace}_tasks_polling_duration_bucket{instance=~\"${nodename}\", le=\"1.024\"}[1m])\n) by (task_name) > 0",
+ "expr": "avg(${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"} - ignoring(action) ${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"received\"}) by (entity)",
"interval": "",
- "legendFormat": "{{task_name}}",
- "refId": "A"
+ "legendFormat": "{{entity}}",
+ "refId": "B"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Calls to `Future::poll` that took more than one second (average per node)",
+ "title": "Unbounded channels size (average per node)",
"tooltip": {
"shared": true,
"sort": 2,
- "value_type": "cumulative"
+ "value_type": "individual"
},
"type": "graph",
"xaxis": {
@@ -1013,11 +911,11 @@
},
"yaxes": [
{
- "format": "cps",
- "label": "Calls to `Future::poll`/second",
+ "format": "short",
+ "label": null,
"logBase": 1,
"max": null,
- "min": "0",
+ "min": null,
"show": true
},
{
@@ -1034,20 +932,6 @@
"alignLevel": null
}
},
- {
- "collapsed": false,
- "datasource": null,
- "gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 62
- },
- "id": 27,
- "panels": [],
- "title": "Misc",
- "type": "row"
- },
{
"aliasColors": {},
"bars": false,
@@ -1060,18 +944,20 @@
"h": 7,
"w": 24,
"x": 0,
- "y": 63
+ "y": 57
},
"hiddenSeries": false,
- "id": 23,
+ "id": 33,
"legend": {
- "avg": false,
+ "alignAsTable": true,
+ "avg": true,
"current": false,
"max": false,
"min": false,
- "show": false,
+ "rightSide": true,
+ "show": true,
"total": false,
- "values": false
+ "values": true
},
"lines": true,
"linewidth": 1,
@@ -1089,17 +975,17 @@
"steppedLine": false,
"targets": [
{
- "expr": "${metric_namespace}_threads{instance=~\"${nodename}\"}",
+ "expr": "avg(irate(${metric_namespace}_unbounded_channel_len{instance=~\"${nodename}\", action = \"send\"}[10m])) by (entity)",
"interval": "",
- "legendFormat": "{{instance}}",
- "refId": "A"
+ "legendFormat": "{{entity}}",
+ "refId": "B"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Number of threads",
+ "title": "Unbounded channels rate (average per node)",
"tooltip": {
"shared": true,
"sort": 2,
@@ -1115,7 +1001,7 @@
},
"yaxes": [
{
- "format": "short",
+ "format": "cps",
"label": null,
"logBase": 1,
"max": null,
@@ -1137,7 +1023,7 @@
}
}
],
- "refresh": "30s",
+ "refresh": false,
"schemaVersion": 22,
"style": "dark",
"tags": [],
@@ -1147,7 +1033,7 @@
"allValue": null,
"current": {},
"datasource": "$data_source",
- "definition": "${metric_namespace}_cpu_usage_percentage",
+ "definition": "${metric_namespace}_process_start_time_seconds",
"hide": 0,
"includeAll": true,
"index": -1,
@@ -1155,7 +1041,7 @@
"multi": true,
"name": "nodename",
"options": [],
- "query": "${metric_namespace}_cpu_usage_percentage",
+ "query": "${metric_namespace}_process_start_time_seconds",
"refresh": 1,
"regex": "/instance=\"(.*?)\"/",
"skipUrlSync": false,
@@ -1228,5 +1114,5 @@
"variables": {
"list": []
},
- "version": 44
+ "version": 52
}
diff --git a/Cargo.lock b/Cargo.lock
index ec5af8aca4ecf42b9d8f8751f26f112e8d9222b0..3a661ed15d242174a2646953ce3f101d12381ee7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,12 +25,6 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
-[[package]]
-name = "adler32"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-
[[package]]
name = "aead"
version = "0.3.2"
@@ -46,23 +40,11 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5"
dependencies = [
- "aes-soft 0.4.0",
- "aesni 0.7.0",
+ "aes-soft",
+ "aesni",
"block-cipher",
]
-[[package]]
-name = "aes-ctr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee"
-dependencies = [
- "aes-soft 0.3.3",
- "aesni 0.6.0",
- "ctr",
- "stream-cipher 0.3.2",
-]
-
[[package]]
name = "aes-gcm"
version = "0.6.0"
@@ -73,18 +55,7 @@ dependencies = [
"aes",
"block-cipher",
"ghash",
- "subtle 2.2.2",
-]
-
-[[package]]
-name = "aes-soft"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d"
-dependencies = [
- "block-cipher-trait",
- "byteorder",
- "opaque-debug 0.2.3",
+ "subtle 2.2.3",
]
[[package]]
@@ -94,19 +65,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"
dependencies = [
"block-cipher",
- "byteorder",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "aesni"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100"
-dependencies = [
- "block-cipher-trait",
+ "byteorder 1.3.4",
"opaque-debug 0.2.3",
- "stream-cipher 0.3.2",
]
[[package]]
@@ -136,9 +96,9 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
[[package]]
name = "aho-corasick"
-version = "0.7.10"
+version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
+checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
dependencies = [
"memchr",
]
@@ -160,7 +120,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -169,14 +129,14 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
name = "anyhow"
-version = "1.0.28"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a60d744a80c30fcb657dfe2c1b22bcb3e814c1a1e3674f32bf5820b570fbff"
+checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
[[package]]
name = "approx"
@@ -189,15 +149,15 @@ dependencies = [
[[package]]
name = "arbitrary"
-version = "0.4.1"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75153c95fdedd7db9732dfbfc3702324a1627eec91ba56e37cd0ac78314ab2ed"
+checksum = "7cb544f1057eaaff4b34f8c4dcf56fc3cd04debd291998405d135017a7c3c0f4"
[[package]]
name = "arc-swap"
-version = "0.4.5"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d663a8e9a99154b5fb793032533f6328da35e23aac63d5c152279aa8ba356825"
+checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
[[package]]
name = "arrayref"
@@ -258,6 +218,17 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5"
+[[package]]
+name = "async-channel"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee81ba99bee79f3c8ae114ae4baa7eaa326f63447cf2ec65e4393618b63f8770"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
[[package]]
name = "async-std"
version = "1.6.2"
@@ -274,7 +245,7 @@ dependencies = [
"log",
"memchr",
"num_cpus",
- "once_cell",
+ "once_cell 1.4.0",
"pin-project-lite",
"pin-utils",
"slab",
@@ -300,12 +271,29 @@ dependencies = [
"webpki-roots 0.19.0",
]
+[[package]]
+name = "async-trait"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caae68055714ff28740f310927e04f2eba76ff580b16fb18ed90073ee71646f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "atomic"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64f46ca51dca4837f1520754d1c8c36636356b81553d928dc9c177025369a06e"
+[[package]]
+name = "atomic-waker"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+
[[package]]
name = "atty"
version = "0.2.14"
@@ -314,7 +302,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -338,7 +326,7 @@ dependencies = [
"addr2line",
"cfg-if",
"libc",
- "miniz_oxide 0.4.0",
+ "miniz_oxide",
"object 0.20.0",
"rustc-demangle",
]
@@ -363,26 +351,26 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
[[package]]
name = "bincode"
-version = "1.2.1"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
+checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"serde",
]
[[package]]
name = "bindgen"
-version = "0.53.2"
+version = "0.54.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb26d6a69a335b8cb0e7c7e9775cd5666611dc50a37177c3f2cedcfc040e8c8"
+checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
dependencies = [
"bitflags",
"cexpr",
"cfg-if",
"clang-sys",
"clap",
- "env_logger 0.7.1",
+ "env_logger",
"lazy_static",
"lazycell",
"log",
@@ -395,6 +383,21 @@ dependencies = [
"which",
]
+[[package]]
+name = "bip39"
+version = "0.6.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7059804e226b3ac116519a252d7f5fb985a5ccc0e93255e036a5f7e7283323f4"
+dependencies = [
+ "failure",
+ "hashbrown 0.1.8",
+ "hmac",
+ "once_cell 0.1.8",
+ "pbkdf2",
+ "rand 0.6.5",
+ "sha2 0.8.2",
+]
+
[[package]]
name = "bitflags"
version = "1.2.1"
@@ -424,7 +427,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471"
dependencies = [
"byte-tools",
- "byteorder",
+ "byteorder 1.3.4",
"crypto-mac 0.8.0",
"digest 0.9.0",
"opaque-debug 0.2.3",
@@ -470,7 +473,7 @@ checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
dependencies = [
"block-padding",
"byte-tools",
- "byteorder",
+ "byteorder 1.3.4",
"generic-array 0.12.3",
]
@@ -492,15 +495,6 @@ dependencies = [
"generic-array 0.14.3",
]
-[[package]]
-name = "block-cipher-trait"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774"
-dependencies = [
- "generic-array 0.12.3",
-]
-
[[package]]
name = "block-padding"
version = "0.1.5"
@@ -512,13 +506,14 @@ dependencies = [
[[package]]
name = "blocking"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d17efb70ce4421e351d61aafd90c16a20fb5bfe339fcdc32a86816280e62ce0"
+checksum = "d2468ff7bf85066b4a3678fede6fe66db31846d753ff0adfbfab2c6a6e81612b"
dependencies = [
- "futures-channel",
- "futures-util",
- "once_cell",
+ "async-channel",
+ "atomic-waker",
+ "futures-lite",
+ "once_cell 1.4.0",
"parking",
"waker-fn",
]
@@ -531,9 +526,9 @@ checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
[[package]]
name = "bstr"
-version = "0.2.12"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2889e6d50f394968c8bf4240dc3f2a7eb4680844d27308f798229ac9d4725f41"
+checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
dependencies = [
"lazy_static",
"memchr",
@@ -552,9 +547,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.2.1"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187"
+checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
[[package]]
name = "byte-slice-cast"
@@ -568,6 +563,12 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+[[package]]
+name = "byteorder"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
+
[[package]]
name = "byteorder"
version = "1.3.4"
@@ -580,16 +581,16 @@ version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"either",
"iovec",
]
[[package]]
name = "bytes"
-version = "0.5.4"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "c_linked_list"
@@ -599,17 +600,17 @@ checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b"
[[package]]
name = "cache-padded"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24508e28c677875c380c20f4d28124fab6f8ed4ef929a1397d7b1a31e92f1005"
+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
[[package]]
name = "cargo_metadata"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8de60b887edf6d74370fc8eb177040da4847d971d6234c7b13a6da324ef0caf"
+checksum = "052dbdd9db69a339d5fa9ac87bfe2e1319f709119f0345988a597af82bb1011c"
dependencies = [
- "semver 0.9.0",
+ "semver 0.10.0",
"serde",
"serde_derive",
"serde_json",
@@ -626,9 +627,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.50"
+version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
dependencies = [
"jobserver",
]
@@ -673,7 +674,7 @@ dependencies = [
[[package]]
name = "chain-spec-builder"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"ansi_term 0.12.1",
"node-cli",
@@ -686,9 +687,9 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.11"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
+checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
dependencies = [
"js-sys",
"num-integer",
@@ -703,16 +704,16 @@ version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a"
dependencies = [
- "glob 0.3.0",
+ "glob",
"libc",
"libloading",
]
[[package]]
name = "clap"
-version = "2.33.0"
+version = "2.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
dependencies = [
"ansi_term 0.11.0",
"atty",
@@ -733,12 +734,12 @@ dependencies = [
]
[[package]]
-name = "cmake"
-version = "0.1.42"
+name = "cloudabi"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62"
+checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
dependencies = [
- "cc",
+ "bitflags",
]
[[package]]
@@ -833,7 +834,7 @@ version = "0.66.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d9badfe36176cb653506091693bc2bb1970c9bddfcd6ec7fac404f7eaec6f38"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"cranelift-bforest",
"cranelift-codegen-meta",
"cranelift-codegen-shared",
@@ -921,43 +922,16 @@ dependencies = [
[[package]]
name = "criterion"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0363053954f3e679645fc443321ca128b7b950a6fe288cf5f9335cc22ee58394"
-dependencies = [
- "atty",
- "cast",
- "clap",
- "criterion-plot 0.3.1",
- "csv",
- "itertools 0.8.2",
- "lazy_static",
- "libc",
- "num-traits",
- "rand_core 0.3.1",
- "rand_os",
- "rand_xoshiro",
- "rayon",
- "rayon-core",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion"
-version = "0.3.1"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1"
+checksum = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
dependencies = [
"atty",
"cast",
"clap",
- "criterion-plot 0.4.1",
+ "criterion-plot",
"csv",
- "itertools 0.8.2",
+ "itertools 0.9.0",
"lazy_static",
"num-traits",
"oorandom",
@@ -965,6 +939,7 @@ dependencies = [
"rayon",
"regex",
"serde",
+ "serde_cbor",
"serde_derive",
"serde_json",
"tinytemplate",
@@ -973,23 +948,12 @@ dependencies = [
[[package]]
name = "criterion-plot"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e"
-dependencies = [
- "byteorder",
- "cast",
- "itertools 0.8.2",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.4.1"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01e15e0ea58e8234f96146b1f91fa9d0e4dd7a38da93ff7a75d42c0b9d3a545"
+checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
dependencies = [
"cast",
- "itertools 0.8.2",
+ "itertools 0.9.0",
]
[[package]]
@@ -1015,17 +979,18 @@ dependencies = [
"lazy_static",
"maybe-uninit",
"memoffset",
- "scopeguard",
+ "scopeguard 1.1.0",
]
[[package]]
name = "crossbeam-queue"
-version = "0.2.1"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
dependencies = [
"cfg-if",
"crossbeam-utils",
+ "maybe-uninit",
]
[[package]]
@@ -1062,7 +1027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
"generic-array 0.14.3",
- "subtle 2.2.2",
+ "subtle 2.2.3",
]
[[package]]
@@ -1098,48 +1063,48 @@ dependencies = [
[[package]]
name = "ctor"
-version = "0.1.13"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47c5e5ac752e18207b12e16b10631ae5f7f68f8805f335f9b817ead83d9ffce1"
+checksum = "39858aa5bac06462d4dd4b9164848eb81ffc4aa5c479746393598fd193afa227"
dependencies = [
"quote",
"syn",
]
[[package]]
-name = "ctr"
+name = "cuckoofilter"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736"
+checksum = "8dd43f7cfaffe0a386636a10baea2ee05cc50df3b77bea4a456c9572a939bf1f"
dependencies = [
- "block-cipher-trait",
- "stream-cipher 0.3.2",
+ "byteorder 0.5.3",
+ "rand 0.3.23",
]
[[package]]
name = "curve25519-dalek"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839"
+checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"digest 0.8.1",
"rand_core 0.5.1",
- "subtle 2.2.2",
+ "subtle 2.2.3",
"zeroize",
]
[[package]]
name = "data-encoding"
-version = "2.2.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11c0346158a19b3627234e15596f5e465c360fcdb97d817bcb255e0510f5a788"
+checksum = "72aa14c04dfae8dd7d8a2b1cb7ca2152618cd01336dbfe704b8dcbf8d41dbd69"
[[package]]
name = "derive_more"
-version = "0.99.5"
+version = "0.99.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7"
+checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76"
dependencies = [
"proc-macro2",
"quote",
@@ -1182,14 +1147,13 @@ dependencies = [
[[package]]
name = "dirs-sys"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
dependencies = [
- "cfg-if",
"libc",
"redox_users",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -1204,7 +1168,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"quick-error",
]
@@ -1260,49 +1224,36 @@ dependencies = [
"ed25519",
"rand 0.7.3",
"serde",
- "sha2 0.8.1",
+ "sha2 0.8.2",
"zeroize",
]
[[package]]
name = "either"
-version = "1.5.3"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
[[package]]
name = "enumflags2"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a80e524ebf194285b57e5e7944018721c7fffc673253f5183f7accd88a2a3b0c"
+checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
dependencies = [
"enumflags2_derive",
]
[[package]]
name = "enumflags2_derive"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ed9afacaea0301eefb738c9deea725e6d53938004597cdc518a8cf9a7aa2f03"
+checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
-[[package]]
-name = "env_logger"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
[[package]]
name = "env_logger"
version = "0.7.1"
@@ -1324,22 +1275,22 @@ checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4"
[[package]]
name = "erased-serde"
-version = "0.3.11"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88b6d1705e16a4d62e05ea61cc0496c2bd190f4fa8e5c1f11ce747be6bcf3d1"
+checksum = "6ca8b296792113e1500fd935ae487be6e00ce318952a6880555554824d6ebf38"
dependencies = [
"serde",
]
[[package]]
name = "errno"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b480f641ccf0faf324e20c1d3e53d81b7484c698b42ea677f6907ae4db195371"
+checksum = "6eab5ee3df98a279d9b316b1af6ac95422127b1290317e6d18c1743c99418b01"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -1361,8 +1312,8 @@ dependencies = [
"crunchy",
"fixed-hash",
"impl-rlp",
- "impl-serde 0.3.0",
- "tiny-keccak 2.0.2",
+ "impl-serde",
+ "tiny-keccak",
]
[[package]]
@@ -1374,11 +1325,17 @@ dependencies = [
"ethbloom",
"fixed-hash",
"impl-rlp",
- "impl-serde 0.3.0",
+ "impl-serde",
"primitive-types",
"uint",
]
+[[package]]
+name = "event-listener"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "699d84875f1b72b4da017e6b0f77dfa88c0137f089958a88974d15938cbc2976"
+
[[package]]
name = "evm"
version = "0.17.0"
@@ -1436,9 +1393,9 @@ dependencies = [
[[package]]
name = "failure"
-version = "0.1.7"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b"
+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
dependencies = [
"backtrace",
"failure_derive",
@@ -1446,9 +1403,9 @@ dependencies = [
[[package]]
name = "failure_derive"
-version = "0.1.7"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231"
+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2",
"quote",
@@ -1470,26 +1427,26 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
[[package]]
name = "fastrand"
-version = "1.3.2"
+version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b90eb1dec02087df472ab9f0db65f27edaa654a746830042688bcc2eaf68090f"
+checksum = "36a9cb09840f81cd211e435d00a4e487edd263dc3c8ff815c32dd76ad668ebed"
[[package]]
name = "fdlimit"
-version = "0.1.4"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da54a593b34c71b889ee45f5b5bb900c74148c5f7f8c6a9479ee7899f69603c"
+checksum = "47bc6e222b8349b2bd0acb85a1d16d22852376b3ceed2a7f09c2692c3d8a78d0"
dependencies = [
"libc",
]
[[package]]
name = "file-per-thread-logger"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9"
+checksum = "8b3937f028664bd0e13df401ba49a4567ccda587420365823242977f06609ed1"
dependencies = [
- "env_logger 0.6.2",
+ "env_logger",
"log",
]
@@ -1511,11 +1468,11 @@ dependencies = [
[[package]]
name = "fixed-hash"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32529fc42e86ec06e5047092082aab9ad459b070c5d2a76b14f4f5ce70bf2e84"
+checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"rand 0.7.3",
"rustc-hex",
"static_assertions",
@@ -1529,36 +1486,37 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
[[package]]
name = "flate2"
-version = "1.0.14"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42"
+checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
dependencies = [
"cfg-if",
"crc32fast",
"libc",
"libz-sys",
- "miniz_oxide 0.3.6",
+ "miniz_oxide",
]
[[package]]
name = "fnv"
-version = "1.0.6"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
]
[[package]]
name = "frame-benchmarking"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
+ "hex-literal",
"linregress",
"parity-scale-codec",
"paste",
@@ -1567,11 +1525,12 @@ dependencies = [
"sp-runtime",
"sp-runtime-interface",
"sp-std",
+ "sp-storage",
]
[[package]]
name = "frame-benchmarking-cli"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"parity-scale-codec",
@@ -1588,7 +1547,7 @@ dependencies = [
[[package]]
name = "frame-executive"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -1608,7 +1567,7 @@ dependencies = [
[[package]]
name = "frame-metadata"
-version = "11.0.0-rc5"
+version = "12.0.0"
dependencies = [
"parity-scale-codec",
"serde",
@@ -1618,7 +1577,7 @@ dependencies = [
[[package]]
name = "frame-support"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"bitmask",
"frame-metadata",
@@ -1626,9 +1585,9 @@ dependencies = [
"frame-system",
"impl-trait-for-tuples",
"log",
- "once_cell",
+ "once_cell 1.4.0",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"paste",
"pretty_assertions",
"serde",
@@ -1645,7 +1604,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support-procedural-tools",
"proc-macro2",
@@ -1655,7 +1614,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -1666,7 +1625,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"proc-macro2",
"quote",
@@ -1675,8 +1634,9 @@ dependencies = [
[[package]]
name = "frame-support-test"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
+ "frame-metadata",
"frame-support",
"parity-scale-codec",
"pretty_assertions",
@@ -1693,9 +1653,9 @@ dependencies = [
[[package]]
name = "frame-system"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "criterion 0.2.11",
+ "criterion",
"frame-support",
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -1711,7 +1671,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -1726,7 +1686,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -1741,7 +1701,7 @@ dependencies = [
"lazy_static",
"libc",
"libloading",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -1751,7 +1711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
dependencies = [
"libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -1878,6 +1838,21 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
+[[package]]
+name = "futures-lite"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180d8fc9819eb48a0c976672fbeea13a73e10999e812bdc9e14644c25ad51d60"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
[[package]]
name = "futures-macro"
version = "0.3.5"
@@ -1902,7 +1877,7 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
dependencies = [
- "once_cell",
+ "once_cell 1.4.0",
]
[[package]]
@@ -1960,7 +1935,7 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"futures 0.3.5",
"memchr",
"pin-project",
@@ -2051,12 +2026,6 @@ version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
-[[package]]
-name = "glob"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
-
[[package]]
name = "glob"
version = "0.3.0"
@@ -2095,7 +2064,7 @@ version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"bytes 0.4.12",
"fnv",
"futures 0.1.29",
@@ -2109,23 +2078,29 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.2.4"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377038bf3c89d18d6ca1431e7a5027194fbd724ca10592b9487ede5e8e144f42"
+checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"fnv",
"futures-core",
"futures-sink",
"futures-util",
"http 0.2.1",
"indexmap",
- "log",
"slab",
- "tokio 0.2.21",
+ "tokio 0.2.22",
"tokio-util",
+ "tracing",
]
+[[package]]
+name = "half"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
+
[[package]]
name = "hash-db"
version = "0.15.2"
@@ -2141,6 +2116,16 @@ 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.6.3"
@@ -2153,9 +2138,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9b7860757ce258c89fd48d28b68c41713e597a7b09e793f6c6a6e2ea37c827"
+checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
dependencies = [
"ahash 0.3.8",
"autocfg 1.0.0",
@@ -2172,9 +2157,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.1.10"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e"
+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
dependencies = [
"libc",
]
@@ -2187,22 +2172,15 @@ checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
[[package]]
name = "hex-literal"
-version = "0.2.1"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "961de220ec9a91af2e1e5bd80d02109155695e516771762381ef8581317066e0"
-dependencies = [
- "hex-literal-impl",
- "proc-macro-hack",
-]
+checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8"
[[package]]
-name = "hex-literal-impl"
-version = "0.2.1"
+name = "hex_fmt"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d4c5c844e2fee0bf673d54c2c177f1713b3d2af2ff6e666b49cb7572e6cf42d"
-dependencies = [
- "proc-macro-hack",
-]
+checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
[[package]]
name = "hmac"
@@ -2253,7 +2231,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"fnv",
"itoa",
]
@@ -2276,7 +2254,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"http 0.2.1",
]
@@ -2327,25 +2305,25 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.13.4"
+version = "0.13.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6081100e960d9d74734659ffc9cc91daf1c0fc7aceb8eaa94ee1a3f5046f2e"
+checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"futures-channel",
"futures-core",
"futures-util",
- "h2 0.2.4",
+ "h2 0.2.6",
"http 0.2.1",
"http-body 0.3.1",
"httparse",
"itoa",
- "log",
- "net2",
"pin-project",
+ "socket2",
"time",
- "tokio 0.2.21",
+ "tokio 0.2.22",
"tower-service",
+ "tracing",
"want 0.3.0",
]
@@ -2355,14 +2333,14 @@ version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"ct-logs",
"futures-util",
- "hyper 0.13.4",
+ "hyper 0.13.7",
"log",
"rustls",
"rustls-native-certs",
- "tokio 0.2.21",
+ "tokio 0.2.22",
"tokio-rustls",
"webpki",
]
@@ -2409,18 +2387,9 @@ dependencies = [
[[package]]
name = "impl-serde"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "impl-serde"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bbe9ea9b182f0fb1cabbd61f4ff9b7b7b9197955e95a7e4c27de5055eb29ff8"
+checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f"
dependencies = [
"serde",
]
@@ -2438,14 +2407,21 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.3.2"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
+checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
dependencies = [
"autocfg 1.0.0",
+ "hashbrown 0.8.1",
"serde",
]
+[[package]]
+name = "instant"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
+
[[package]]
name = "integer-sqrt"
version = "0.1.3"
@@ -2503,9 +2479,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
[[package]]
name = "jobserver"
@@ -2518,18 +2494,18 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.37"
+version = "0.3.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a27d435371a2fa5b6d2b028a74bbdb1234f308da363226a2854ca3ff8ba7055"
+checksum = "fa5a448de267e7358beaf4a5d849518fe9a0c13fce7afd44b06e68550e5562a7"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "jsonrpc-client-transports"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecbdaacc17243168d9d1fa6b2bd7556a27e1e60a621d8a2a6e590ae2b145d158"
+checksum = "c6f7b1cdf66312002e15682a24430728bd13036c641163c016bc53fb686a7c2d"
dependencies = [
"failure",
"futures 0.1.29",
@@ -2544,9 +2520,9 @@ dependencies = [
[[package]]
name = "jsonrpc-core"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62"
+checksum = "f30b12567a31d48588a65b6cf870081e6ba1d7b2ae353977cb9820d512e69c70"
dependencies = [
"futures 0.1.29",
"log",
@@ -2557,18 +2533,18 @@ dependencies = [
[[package]]
name = "jsonrpc-core-client"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34221123bc79b66279a3fde2d3363553835b43092d629b34f2e760c44dc94713"
+checksum = "d175ca0cf77439b5495612bf216c650807d252d665b4b70ab2eebd895a88fac1"
dependencies = [
"jsonrpc-client-transports",
]
[[package]]
name = "jsonrpc-derive"
-version = "14.2.1"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fadf6945e227246825a583514534d864554e9f23d80b3c77d034b10983db5ef"
+checksum = "c2cc6ea7f785232d9ca8786a44e9fa698f92149dcdc1acc4aa1fc69c4993d79e"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2578,9 +2554,9 @@ dependencies = [
[[package]]
name = "jsonrpc-http-server"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da906d682799df05754480dac1b9e70ec92e12c19ebafd2662a5ea1c9fd6522"
+checksum = "9996b26c0c7a59626d0ed6c5ec8bf06218e62ce1474bd2849f9b9fd38a0158c0"
dependencies = [
"hyper 0.12.35",
"jsonrpc-core",
@@ -2593,9 +2569,9 @@ dependencies = [
[[package]]
name = "jsonrpc-ipc-server"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dedccd693325d833963b549e959137f30a7a0ea650cde92feda81dc0c1393cb5"
+checksum = "b8e8f2278fb2b277175b6e21b23e7ecf30e78daff5ee301d0a2a411d9a821a0a"
dependencies = [
"jsonrpc-core",
"jsonrpc-server-utils",
@@ -2607,9 +2583,9 @@ dependencies = [
[[package]]
name = "jsonrpc-pubsub"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d44f5602a11d657946aac09357956d2841299ed422035edf140c552cb057986"
+checksum = "f389c5cd1f3db258a99296892c21047e21ae73ff4c0e2d39650ea86fe994b4c7"
dependencies = [
"jsonrpc-core",
"log",
@@ -2620,9 +2596,9 @@ dependencies = [
[[package]]
name = "jsonrpc-server-utils"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56cbfb462e7f902e21121d9f0d1c2b77b2c5b642e1a4e8f4ebfa2e15b94402bb"
+checksum = "c623e1895d0d9110cb0ea7736cfff13191ff52335ad33b21bd5c775ea98b27af"
dependencies = [
"bytes 0.4.12",
"globset",
@@ -2636,16 +2612,16 @@ dependencies = [
[[package]]
name = "jsonrpc-ws-server"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903d3109fe7c4acb932b567e1e607e0f524ed04741b09fb0e61841bc40a022fc"
+checksum = "436a92034d0137ab3e3c64a7a6350b428f31cb4d7d1a89f284bcdbcd98a7bc56"
dependencies = [
"jsonrpc-core",
"jsonrpc-server-utils",
"log",
+ "parity-ws",
"parking_lot 0.10.2",
"slab",
- "ws",
]
[[package]]
@@ -2656,13 +2632,13 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
[[package]]
name = "keccak-hasher"
-version = "0.15.2"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3468207deea1359a0e921591ae9b4c928733d94eb9d6a2eeda994cfd59f42cf8"
+checksum = "711adba9940a039f4374fc5724c0a5eaca84a2d558cce62256bfe26f0dbef05e"
dependencies = [
"hash-db",
"hash256-std-hasher",
- "tiny-keccak 1.5.0",
+ "tiny-keccak",
]
[[package]]
@@ -2677,67 +2653,46 @@ dependencies = [
[[package]]
name = "kv-log-macro"
-version = "1.0.4"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c54d9f465d530a752e6ebdc217e081a7a614b48cb200f6f0aee21ba6bc9aabb"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
dependencies = [
"log",
]
-[[package]]
-name = "kvdb"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e763b2a9b500ba47948061d1e8bc3b5f03a8a1f067dbcf822a4d2c84d2b54a3a"
-dependencies = [
- "parity-util-mem 0.6.0",
- "smallvec 1.4.1",
-]
-
[[package]]
name = "kvdb"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0315ef2f688e33844400b31f11c263f2b3dc21d8b9355c6891c5f185fae43f9a"
dependencies = [
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"smallvec 1.4.1",
]
-[[package]]
-name = "kvdb-memorydb"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73027d5e228de6f503b5b7335d530404fc26230a6ae3e09b33ec6e45408509a4"
-dependencies = [
- "kvdb 0.6.0",
- "parity-util-mem 0.6.0",
- "parking_lot 0.10.2",
-]
-
[[package]]
name = "kvdb-memorydb"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73de822b260a3bdfb889dbbb65bb2d473eee2253973d6fa4a5d149a2a4a7c66e"
dependencies = [
- "kvdb 0.7.0",
- "parity-util-mem 0.7.0",
+ "kvdb",
+ "parity-util-mem",
"parking_lot 0.10.2",
]
[[package]]
name = "kvdb-rocksdb"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c341ef15cfb1f923fa3b5138bfbd2d4813a2c1640b473727a53351c7f0b0fa2"
+checksum = "44947dd392f09475af614d740fe0320b66d01cb5b977f664bbbb5e45a70ea4c1"
dependencies = [
"fs-swap",
- "kvdb 0.7.0",
+ "kvdb",
"log",
"num_cpus",
"owning_ref",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"parking_lot 0.10.2",
"regex",
"rocksdb",
@@ -2752,10 +2707,10 @@ checksum = "2701a1369d6ea4f1b9f606db46e5e2a4a8e47f22530a07823d653f85ab1f6c34"
dependencies = [
"futures 0.3.5",
"js-sys",
- "kvdb 0.7.0",
- "kvdb-memorydb 0.7.0",
+ "kvdb",
+ "kvdb-memorydb",
"log",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"send_wrapper 0.3.0",
"wasm-bindgen",
"web-sys",
@@ -2781,9 +2736,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
[[package]]
name = "libc"
-version = "0.2.71"
+version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
+checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
[[package]]
name = "libloading"
@@ -2792,7 +2747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
dependencies = [
"cc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -2803,26 +2758,32 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
[[package]]
name = "libp2p"
-version = "0.23.0"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1ebb6c031584a5af181fe3a1e4b074af5d0b1a3b31663200f0251f4bcff6b5c"
+checksum = "571f5a4604c1a40d75651da141dfde29ad15329f537a779528803297d2220274"
dependencies = [
"atomic",
- "bytes 0.5.4",
+ "bytes 0.5.6",
"futures 0.3.5",
"lazy_static",
"libp2p-core",
"libp2p-core-derive",
+ "libp2p-deflate",
"libp2p-dns",
+ "libp2p-floodsub",
+ "libp2p-gossipsub",
"libp2p-identify",
"libp2p-kad",
"libp2p-mdns",
"libp2p-mplex",
"libp2p-noise",
"libp2p-ping",
- "libp2p-secio",
+ "libp2p-plaintext",
+ "libp2p-pnet",
+ "libp2p-request-response",
"libp2p-swarm",
"libp2p-tcp",
+ "libp2p-uds",
"libp2p-wasm-ext",
"libp2p-websocket",
"libp2p-yamux",
@@ -2836,9 +2797,9 @@ dependencies = [
[[package]]
name = "libp2p-core"
-version = "0.20.1"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a694fd76d7c33a45a0e6e1525e9b9b5d11127c9c94e560ac0f8abba54ed80af"
+checksum = "52f13ba8c7df0768af2eb391696d562c7de88cc3a35122531aaa6a7d77754d25"
dependencies = [
"asn1_der",
"bs58",
@@ -2860,7 +2821,7 @@ dependencies = [
"rand 0.7.3",
"ring",
"rw-stream-sink",
- "sha2 0.8.1",
+ "sha2 0.8.2",
"smallvec 1.4.1",
"thiserror",
"unsigned-varint 0.4.0",
@@ -2870,30 +2831,84 @@ dependencies = [
[[package]]
name = "libp2p-core-derive"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "515c4a7cba5d321bb88ed3ed803997bdd5634ce35c9c5e8e9ace9c512e57eceb"
+checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213"
dependencies = [
"quote",
"syn",
]
+[[package]]
+name = "libp2p-deflate"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74029ae187f35f4b8ddf26b9779a68b340045d708528a103917cdca49a296db5"
+dependencies = [
+ "flate2",
+ "futures 0.3.5",
+ "libp2p-core",
+]
+
[[package]]
name = "libp2p-dns"
-version = "0.20.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751924b6b98e350005e0b87a822beb246792a3fb878c684e088f866158120ac"
+checksum = "7cf319822e08dd65c8e060d2354e9f952895bbc433f5706c75ed010c152aee5e"
dependencies = [
"futures 0.3.5",
"libp2p-core",
"log",
]
+[[package]]
+name = "libp2p-floodsub"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a9acb43a3e4a4e413e0c4abe0fa49308df7c6335c88534757b647199cb8a51"
+dependencies = [
+ "cuckoofilter",
+ "fnv",
+ "futures 0.3.5",
+ "libp2p-core",
+ "libp2p-swarm",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "smallvec 1.4.1",
+]
+
+[[package]]
+name = "libp2p-gossipsub"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab20fcb60edebe3173bbb708c6ac3444afdf1e3152dc2866b10c4f5497f17467"
+dependencies = [
+ "base64 0.11.0",
+ "byteorder 1.3.4",
+ "bytes 0.5.6",
+ "fnv",
+ "futures 0.3.5",
+ "futures_codec",
+ "hex_fmt",
+ "libp2p-core",
+ "libp2p-swarm",
+ "log",
+ "lru_time_cache",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "sha2 0.8.2",
+ "smallvec 1.4.1",
+ "unsigned-varint 0.4.0",
+ "wasm-timer",
+]
+
[[package]]
name = "libp2p-identify"
-version = "0.20.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "912c00a7bf67e0e765daf0cc37e08f675ea26aba3d6d1fbfaee81f19a4c23049"
+checksum = "56396ee63aa9164eacf40c2c5d2bda8c4133c2f57e1b0425d51d3a4e362583b1"
dependencies = [
"futures 0.3.5",
"libp2p-core",
@@ -2907,12 +2922,12 @@ dependencies = [
[[package]]
name = "libp2p-kad"
-version = "0.21.0"
+version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44ed3a4c8111c570ab2bffb30c6353178d7603ce3787e3c5f2493c8d3d16d1f0"
+checksum = "cc7fa9047f8b8f544278a35c2d9d45d3b2c1785f2d86d4e1629d6edf97be3955"
dependencies = [
"arrayvec 0.5.1",
- "bytes 0.5.4",
+ "bytes 0.5.6",
"either",
"fnv",
"futures 0.3.5",
@@ -2924,7 +2939,7 @@ dependencies = [
"prost",
"prost-build",
"rand 0.7.3",
- "sha2 0.8.1",
+ "sha2 0.8.2",
"smallvec 1.4.1",
"uint",
"unsigned-varint 0.4.0",
@@ -2934,9 +2949,9 @@ dependencies = [
[[package]]
name = "libp2p-mdns"
-version = "0.20.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd004c668160fd922f7268b2cd1e4550ff69165d9c744e9eb5770086eb753d02"
+checksum = "3173b5a6b2f690c29ae07798d85b9441a131ac76ddae9015ef22905b623d0c69"
dependencies = [
"async-std",
"data-encoding",
@@ -2956,11 +2971,11 @@ dependencies = [
[[package]]
name = "libp2p-mplex"
-version = "0.20.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14ae0ffacd30f073f96cd518b2c9cd2cb18ac27c3d136a4b23cf1af99f33e541"
+checksum = "8a73a799cc8410b36e40b8f4c4b6babbcb9efd3727111bf517876e4acfa612d3"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"fnv",
"futures 0.3.5",
"futures_codec",
@@ -2972,11 +2987,11 @@ dependencies = [
[[package]]
name = "libp2p-noise"
-version = "0.22.0"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e594f2de0c23c2b7ad14802c991a2e68e95315c6a6c7715e53801506f20135d"
+checksum = "6ef6c490042f549fb1025f2892dfe6083d97a77558f450c1feebe748ca9eb15a"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"curve25519-dalek",
"futures 0.3.5",
"lazy_static",
@@ -2985,7 +3000,7 @@ dependencies = [
"prost",
"prost-build",
"rand 0.7.3",
- "sha2 0.8.1",
+ "sha2 0.8.2",
"snow",
"static_assertions",
"x25519-dalek",
@@ -2994,9 +3009,9 @@ dependencies = [
[[package]]
name = "libp2p-ping"
-version = "0.20.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70130cf130e4ba6dc177366e72dd9f86f9e3588fa1a0c4145247e676f16affad"
+checksum = "ad063c21dfcea4518ac9e8bd4119d33a5b26c41e674f602f41f05617a368a5c8"
dependencies = [
"futures 0.3.5",
"libp2p-core",
@@ -3008,41 +3023,64 @@ dependencies = [
]
[[package]]
-name = "libp2p-secio"
-version = "0.20.0"
+name = "libp2p-plaintext"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ff43513c383f7cdab2736eb98465fc4c5dd5d1988df89749dc8a68950349d56"
+checksum = "903a12e99c72dbebefea258de887982adeacc7025baa1ceb10b7fa9928f54791"
dependencies = [
- "aes-ctr",
- "ctr",
+ "bytes 0.5.6",
"futures 0.3.5",
- "hmac",
- "js-sys",
- "lazy_static",
+ "futures_codec",
"libp2p-core",
"log",
- "parity-send-wrapper",
- "pin-project",
"prost",
"prost-build",
- "quicksink",
- "rand 0.7.3",
- "ring",
"rw-stream-sink",
- "sha2 0.8.1",
- "static_assertions",
- "twofish",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
+ "unsigned-varint 0.4.0",
+ "void",
+]
+
+[[package]]
+name = "libp2p-pnet"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d0db10e139d22d7af0b23ed7949449ec86262798aa0fd01595abdbcb02dc87"
+dependencies = [
+ "futures 0.3.5",
+ "log",
+ "pin-project",
+ "rand 0.7.3",
+ "salsa20",
+ "sha3",
+]
+
+[[package]]
+name = "libp2p-request-response"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c0c9e8a4cd69d97e9646c54313d007512f411aba8c5226cfcda16df6a6e84a3"
+dependencies = [
+ "async-trait",
+ "bytes 0.5.6",
+ "futures 0.3.5",
+ "libp2p-core",
+ "libp2p-swarm",
+ "log",
+ "lru 0.6.0",
+ "minicbor",
+ "rand 0.7.3",
+ "smallvec 1.4.1",
+ "unsigned-varint 0.5.1",
+ "wasm-timer",
]
[[package]]
name = "libp2p-swarm"
-version = "0.20.1"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f88d5e2a090a2aadf042cd33484e2f015c6dab212567406a59deece5dedbd133"
+checksum = "7193e444210132237b81b755ec7fe53f1c4bd2f53cf719729b94c0c72eb6eaa1"
dependencies = [
+ "either",
"futures 0.3.5",
"libp2p-core",
"log",
@@ -3054,9 +3092,9 @@ dependencies = [
[[package]]
name = "libp2p-tcp"
-version = "0.20.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1fa2bbad054020cb875546a577a66a65a5bf42eff55ed5265f92ffee3cc052"
+checksum = "44f42ec130d7a37a7e47bf4398026b7ad9185c08ed26972e2720f8b94112796f"
dependencies = [
"async-std",
"futures 0.3.5",
@@ -3068,11 +3106,23 @@ dependencies = [
"socket2",
]
+[[package]]
+name = "libp2p-uds"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea7acb0a034f70d7db94c300eba3f65c0f6298820105624088a9609c9974d77"
+dependencies = [
+ "async-std",
+ "futures 0.3.5",
+ "libp2p-core",
+ "log",
+]
+
[[package]]
name = "libp2p-wasm-ext"
-version = "0.20.1"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0feb99e32fea20ffb1bbf56a6fb2614bff7325ff44a515728385170b3420d2c3"
+checksum = "34c1faac6f92c21fbe155417957863ea822fba9e9fd5eb24c0912336a100e63f"
dependencies = [
"futures 0.3.5",
"js-sys",
@@ -3084,9 +3134,9 @@ dependencies = [
[[package]]
name = "libp2p-websocket"
-version = "0.21.1"
+version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046a5201f6e471f22b22b394e4d084269ed1e28cf7300f7b49874385db84c7bd"
+checksum = "d650534ebd99f48f6fa292ed5db10d30df2444943afde4407ceeddab8e513fca"
dependencies = [
"async-tls",
"either",
@@ -3104,26 +3154,26 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
-version = "0.20.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46ae9bf2f7d8a4be9c7e9b61df9de9dc1bd66419d669098f22f81f8d9571029a"
+checksum = "781d9b9f043dcdabc40640807125368596b849fd4d96cdca2dcf052fdf6f33fd"
dependencies = [
"futures 0.3.5",
"libp2p-core",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.0",
"thiserror",
"yamux",
]
[[package]]
name = "librocksdb-sys"
-version = "6.7.4"
+version = "6.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883213ae3d09bfc3d104aefe94b25ebb183b6f4d3a515b23b14817e1f4854005"
+checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09"
dependencies = [
"bindgen",
"cc",
- "glob 0.3.0",
+ "glob",
"libc",
]
@@ -3138,8 +3188,8 @@ dependencies = [
"digest 0.8.1",
"hmac-drbg",
"rand 0.7.3",
- "sha2 0.8.1",
- "subtle 2.2.2",
+ "sha2 0.8.2",
+ "subtle 2.2.3",
"typenum",
]
@@ -3157,15 +3207,15 @@ dependencies = [
[[package]]
name = "linked-hash-map"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
[[package]]
name = "linked_hash_set"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7c91c4c7bbeb4f2f7c4e5be11e6a05bd6830bc37249c47ce1ad86ad453ff9c"
+checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588"
dependencies = [
"linked-hash-map",
]
@@ -3183,27 +3233,54 @@ dependencies = [
[[package]]
name = "lite-json"
-version = "0.1.0"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c73e713a23ac6e12074c9e96ef2dfb770921e0cb9244c093bd38424209e0e523"
+dependencies = [
+ "lite-parser",
+]
+
+[[package]]
+name = "lite-parser"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa835713bb12ba5204013497da16caf2dd2eee25ca829d0efaa054fb38c4ddd"
+checksum = "0c50092e40e0ccd1bf2015a10333fde0502ff95b832b0895dc1ca0d7ac6c52f6"
dependencies = [
"paste",
]
+[[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.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
dependencies = [
- "scopeguard",
+ "scopeguard 1.1.0",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
+dependencies = [
+ "scopeguard 1.1.0",
]
[[package]]
name = "log"
-version = "0.4.8"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
dependencies = [
"cfg-if",
]
@@ -3226,6 +3303,21 @@ dependencies = [
"hashbrown 0.6.3",
]
+[[package]]
+name = "lru"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "111b945ac72ec09eb7bc62a0fbdc3cc6e80555a7245f52a69d3921a75b53b153"
+dependencies = [
+ "hashbrown 0.8.1",
+]
+
+[[package]]
+name = "lru_time_cache"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb241df5c4caeb888755363fc95f8a896618dc0d435e9e775f7930cb099beab"
+
[[package]]
name = "mach"
version = "0.3.2"
@@ -3278,14 +3370,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
dependencies = [
"libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
name = "memoffset"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
dependencies = [
"autocfg 1.0.0",
]
@@ -3297,8 +3389,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36f36ddb0b2cdc25d38babba472108798e3477f02be5165f038c5e393e50c57a"
dependencies = [
"hash-db",
- "hashbrown 0.8.0",
- "parity-util-mem 0.7.0",
+ "hashbrown 0.8.1",
+ "parity-util-mem",
]
[[package]]
@@ -3313,19 +3405,30 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6feca46f4fa3443a01769d768727f10c10a20fdb65e52dc16a81f0c8269bb78"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"keccak",
"rand_core 0.5.1",
"zeroize",
]
[[package]]
-name = "miniz_oxide"
-version = "0.3.6"
+name = "minicbor"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
+checksum = "2fc03ad6f8f548db7194a5ff5a6f96342ecae4e3ef67d2bf18bacc0e245cd041"
dependencies = [
- "adler32",
+ "minicbor-derive",
+]
+
+[[package]]
+name = "minicbor-derive"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c214bf3d90099b52f3e4b328ae0fe34837fd0fab683ad1e10fceb4629106df48"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
]
[[package]]
@@ -3339,9 +3442,9 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.6.21"
+version = "0.6.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
+checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
dependencies = [
"cfg-if",
"fuchsia-zircon",
@@ -3370,21 +3473,21 @@ dependencies = [
[[package]]
name = "mio-named-pipes"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3"
+checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
dependencies = [
"log",
"mio",
"miow 0.3.5",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
name = "mio-uds"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
+checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
dependencies = [
"iovec",
"libc",
@@ -3410,7 +3513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
dependencies = [
"socket2",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -3421,15 +3524,15 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
[[package]]
name = "multihash"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae32179a9904ccc6e063de8beee7f5dd55fae85ecb851ca923d55722bc28cf5d"
+checksum = "f75db05d738947aa5389863aadafbcf2e509d7ba099dc2ddcdf4fc66bf7a9e03"
dependencies = [
"blake2b_simd",
"blake2s_simd",
"digest 0.8.1",
"sha-1",
- "sha2 0.8.1",
+ "sha2 0.8.2",
"sha3",
"unsigned-varint 0.3.3",
]
@@ -3446,7 +3549,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9157e87afbc2ef0d84cc0345423d715f445edde00141c93721c162de35a05e5"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"futures 0.3.5",
"log",
"pin-project",
@@ -3482,13 +3585,13 @@ dependencies = [
[[package]]
name = "net2"
-version = "0.2.33"
+version = "0.2.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
+checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
dependencies = [
"cfg-if",
"libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -3506,14 +3609,14 @@ dependencies = [
[[package]]
name = "node-bench"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
"fs_extra",
"futures 0.3.5",
"hash-db",
"hex",
- "kvdb 0.7.0",
+ "kvdb",
"kvdb-rocksdb",
"lazy_static",
"log",
@@ -3521,7 +3624,7 @@ dependencies = [
"node-runtime",
"node-testing",
"parity-db",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"rand 0.7.3",
"sc-basic-authorship",
"sc-cli",
@@ -3536,6 +3639,7 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-timestamp",
+ "sp-tracing",
"sp-transaction-pool",
"sp-trie",
"structopt",
@@ -3544,7 +3648,7 @@ dependencies = [
[[package]]
name = "node-browser-testing"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -3561,7 +3665,7 @@ dependencies = [
[[package]]
name = "node-cli"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"assert_cmd",
"frame-benchmarking-cli",
@@ -3569,8 +3673,6 @@ dependencies = [
"frame-system",
"futures 0.3.5",
"hex-literal",
- "jsonrpc-core",
- "jsonrpc-pubsub",
"log",
"nix",
"node-executor",
@@ -3629,6 +3731,7 @@ dependencies = [
"structopt",
"substrate-browser-utils",
"substrate-build-script-utils",
+ "substrate-frame-cli",
"tempfile",
"tracing",
"wasm-bindgen",
@@ -3637,9 +3740,9 @@ dependencies = [
[[package]]
name = "node-executor"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "criterion 0.3.1",
+ "criterion",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -3666,12 +3769,12 @@ dependencies = [
"sp-trie",
"substrate-test-client",
"trie-root",
- "wabt",
+ "wat",
]
[[package]]
name = "node-inspect"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
"log",
@@ -3687,7 +3790,7 @@ dependencies = [
[[package]]
name = "node-primitives"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-system",
"parity-scale-codec",
@@ -3700,10 +3803,9 @@ dependencies = [
[[package]]
name = "node-rpc"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"jsonrpc-core",
- "jsonrpc-pubsub",
"node-primitives",
"node-runtime",
"pallet-contracts-rpc",
@@ -3722,26 +3824,27 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
+ "sp-runtime",
"sp-transaction-pool",
"substrate-frame-rpc-system",
]
[[package]]
name = "node-rpc-client"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "env_logger 0.7.1",
"futures 0.1.29",
"hyper 0.12.35",
"jsonrpc-core-client",
"log",
"node-primitives",
"sc-rpc",
+ "sp-tracing",
]
[[package]]
name = "node-runtime"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-executive",
@@ -3810,8 +3913,10 @@ dependencies = [
[[package]]
name = "node-template"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
+ "frame-benchmarking",
+ "frame-benchmarking-cli",
"jsonrpc-core",
"node-template-runtime",
"pallet-transaction-payment-rpc",
@@ -3843,12 +3948,15 @@ dependencies = [
[[package]]
name = "node-template-runtime"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
+ "frame-benchmarking",
"frame-executive",
"frame-support",
"frame-system",
+ "frame-system-benchmarking",
"frame-system-rpc-runtime-api",
+ "hex-literal",
"pallet-aura",
"pallet-balances",
"pallet-grandpa",
@@ -3876,9 +3984,9 @@ dependencies = [
[[package]]
name = "node-testing"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "criterion 0.3.1",
+ "criterion",
"frame-support",
"frame-system",
"fs_extra",
@@ -3917,7 +4025,6 @@ dependencies = [
"sp-timestamp",
"substrate-test-client",
"tempfile",
- "wabt",
]
[[package]]
@@ -3934,9 +4041,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]]
name = "nom"
-version = "5.1.1"
+version = "5.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
dependencies = [
"memchr",
"version_check",
@@ -3965,9 +4072,9 @@ dependencies = [
[[package]]
name = "num-integer"
-version = "0.1.42"
+version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
dependencies = [
"autocfg 1.0.0",
"num-traits",
@@ -3987,9 +4094,9 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.11"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
dependencies = [
"autocfg 1.0.0",
"libm",
@@ -3997,9 +4104,9 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
dependencies = [
"hermit-abi",
"libc",
@@ -4024,18 +4131,27 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.3.1"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
+checksum = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37"
dependencies = [
- "parking_lot 0.9.0",
+ "parking_lot 0.7.1",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
+dependencies = [
+ "parking_lot 0.10.2",
]
[[package]]
name = "oorandom"
-version = "11.1.0"
+version = "11.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
+checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c"
[[package]]
name = "opaque-debug"
@@ -4061,7 +4177,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -4075,7 +4191,7 @@ dependencies = [
[[package]]
name = "pallet-assets"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4089,7 +4205,7 @@ dependencies = [
[[package]]
name = "pallet-atomic-swap"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4104,7 +4220,7 @@ dependencies = [
[[package]]
name = "pallet-aura"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4126,7 +4242,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4144,7 +4260,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4160,7 +4276,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4189,7 +4305,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4203,23 +4319,9 @@ dependencies = [
"sp-std",
]
-[[package]]
-name = "pallet-benchmark"
-version = "2.0.0-rc5"
-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-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4236,7 +4338,7 @@ dependencies = [
[[package]]
name = "pallet-contracts"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"assert_matches",
"bitflags",
@@ -4264,7 +4366,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-primitives"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -4273,7 +4375,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -4292,7 +4394,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc-runtime-api"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"pallet-contracts-primitives",
"parity-scale-codec",
@@ -4303,7 +4405,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4323,7 +4425,7 @@ dependencies = [
[[package]]
name = "pallet-elections"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4339,7 +4441,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4358,7 +4460,7 @@ dependencies = [
[[package]]
name = "pallet-evm"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"evm",
"frame-support",
@@ -4380,7 +4482,7 @@ dependencies = [
[[package]]
name = "pallet-example"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4396,7 +4498,7 @@ dependencies = [
[[package]]
name = "pallet-example-offchain-worker"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4411,7 +4513,7 @@ dependencies = [
[[package]]
name = "pallet-finality-tracker"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4426,23 +4528,9 @@ dependencies = [
"sp-std",
]
-[[package]]
-name = "pallet-generic-asset"
-version = "2.0.0-rc5"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "serde",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
[[package]]
name = "pallet-grandpa"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"finality-grandpa",
"frame-benchmarking",
@@ -4471,7 +4559,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -4488,7 +4576,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4507,27 +4595,43 @@ dependencies = [
[[package]]
name = "pallet-indices"
-version = "2.0.0-rc5"
+version = "2.0.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-keyring",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-membership"
+version = "2.0.0"
dependencies = [
- "frame-benchmarking",
"frame-support",
"frame-system",
- "pallet-balances",
"parity-scale-codec",
"serde",
"sp-core",
"sp-io",
- "sp-keyring",
"sp-runtime",
"sp-std",
]
[[package]]
-name = "pallet-membership"
-version = "2.0.0-rc5"
+name = "pallet-multisig"
+version = "2.0.0"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
+ "pallet-balances",
"parity-scale-codec",
"serde",
"sp-core",
@@ -4537,10 +4641,9 @@ dependencies = [
]
[[package]]
-name = "pallet-multisig"
-version = "2.0.0-rc5"
+name = "pallet-nicks"
+version = "2.0.0"
dependencies = [
- "frame-benchmarking",
"frame-support",
"frame-system",
"pallet-balances",
@@ -4553,12 +4656,11 @@ dependencies = [
]
[[package]]
-name = "pallet-nicks"
-version = "2.0.0-rc5"
+name = "pallet-node-authorization"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
- "pallet-balances",
"parity-scale-codec",
"serde",
"sp-core",
@@ -4569,7 +4671,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4585,7 +4687,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4610,7 +4712,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4627,7 +4729,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4641,7 +4743,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"enumflags2",
"frame-support",
@@ -4657,7 +4759,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4673,7 +4775,7 @@ dependencies = [
[[package]]
name = "pallet-scored-pool"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4688,7 +4790,7 @@ dependencies = [
[[package]]
name = "pallet-session"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4709,7 +4811,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4731,7 +4833,7 @@ dependencies = [
[[package]]
name = "pallet-society"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4747,9 +4849,8 @@ dependencies = [
[[package]]
name = "pallet-staking"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "env_logger 0.7.1",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -4771,6 +4872,7 @@ dependencies = [
"sp-staking",
"sp-std",
"sp-storage",
+ "sp-tracing",
"static_assertions",
"substrate-test-utils",
]
@@ -4798,7 +4900,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -4809,7 +4911,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4823,7 +4925,7 @@ dependencies = [
[[package]]
name = "pallet-template"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4835,7 +4937,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4853,7 +4955,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4871,7 +4973,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -4888,7 +4990,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -4901,7 +5003,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4918,7 +5020,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4934,7 +5036,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -4967,13 +5069,13 @@ dependencies = [
[[package]]
name = "parity-multiaddr"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc20af3143a62c16e7c9e92ea5c6ae49f7d271d97d4d8fe73afc28f0514a3d0f"
+checksum = "2165a93382a93de55868dcbfa11e4a8f99676a9164eee6a2b4a9479ad319c257"
dependencies = [
"arrayref",
"bs58",
- "byteorder",
+ "byteorder 1.3.4",
"data-encoding",
"multihash",
"percent-encoding 2.1.0",
@@ -5030,20 +5132,7 @@ dependencies = [
"tokio 0.1.22",
"tokio-named-pipes",
"tokio-uds",
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "parity-util-mem"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e42755f26e5ea21a6a819d9e63cbd70713e9867a2b767ec2cc65ca7659532c5"
-dependencies = [
- "cfg-if",
- "impl-trait-for-tuples",
- "parity-util-mem-derive",
- "parking_lot 0.10.2",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -5054,14 +5143,14 @@ checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c"
dependencies = [
"cfg-if",
"ethereum-types",
- "hashbrown 0.8.0",
+ "hashbrown 0.8.1",
"impl-trait-for-tuples",
"lru 0.5.3",
"parity-util-mem-derive",
"parking_lot 0.10.2",
"primitive-types",
"smallvec 1.4.1",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -5081,7 +5170,7 @@ version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16ad52817c4d343339b3bc2e26861bd21478eda0b7509acf83505727000512ac"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
]
[[package]]
@@ -5090,11 +5179,39 @@ version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
+[[package]]
+name = "parity-ws"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61"
+dependencies = [
+ "byteorder 1.3.4",
+ "bytes 0.4.12",
+ "httparse",
+ "log",
+ "mio",
+ "mio-extras",
+ "rand 0.7.3",
+ "sha-1",
+ "slab",
+ "url 2.1.1",
+]
+
[[package]]
name = "parking"
-version = "1.0.3"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d4a6da31f8144a32532fe38fe8fb439a6842e0ec633f0037f0144c14e7f907"
+
+[[package]]
+name = "parking_lot"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4029bc3504a62d92e42f30b9095fdef73b8a0b2a06aa41ce2935143b05a1a06"
+checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
+dependencies = [
+ "lock_api 0.1.5",
+ "parking_lot_core 0.4.0",
+]
[[package]]
name = "parking_lot"
@@ -5102,7 +5219,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
dependencies = [
- "lock_api",
+ "lock_api 0.3.4",
"parking_lot_core 0.6.2",
"rustc_version",
]
@@ -5113,8 +5230,32 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
dependencies = [
- "lock_api",
- "parking_lot_core 0.7.1",
+ "lock_api 0.3.4",
+ "parking_lot_core 0.7.2",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
+dependencies = [
+ "instant",
+ "lock_api 0.4.1",
+ "parking_lot_core 0.8.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.9",
]
[[package]]
@@ -5124,33 +5265,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
dependencies = [
"cfg-if",
- "cloudabi",
+ "cloudabi 0.0.3",
"libc",
"redox_syscall",
"rustc_version",
"smallvec 0.6.13",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
name = "parking_lot_core"
-version = "0.7.1"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
+dependencies = [
+ "cfg-if",
+ "cloudabi 0.0.3",
+ "libc",
+ "redox_syscall",
+ "smallvec 1.4.1",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e136c1904604defe99ce5fd71a28d473fa60a12255d511aa78a9ddf11237aeb"
+checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
dependencies = [
"cfg-if",
- "cloudabi",
+ "cloudabi 0.1.0",
+ "instant",
"libc",
"redox_syscall",
"smallvec 1.4.1",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
name = "paste"
-version = "0.1.10"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4fb1930692d1b6a9cfabdde3d06ea0a7d186518e2f4d67660d8970e2fa647a"
+checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
dependencies = [
"paste-impl",
"proc-macro-hack",
@@ -5158,14 +5314,11 @@ dependencies = [
[[package]]
name = "paste-impl"
-version = "0.1.10"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a"
+checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
dependencies = [
"proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
]
[[package]]
@@ -5174,8 +5327,9 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"crypto-mac 0.7.0",
+ "rayon",
]
[[package]]
@@ -5204,9 +5358,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "petgraph"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c127eea4a29ec6c85d153c59dc1213f33ec74cead30fe4730aecc88cc1fd92"
+checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
dependencies = [
"fixedbitset",
"indexmap",
@@ -5234,9 +5388,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.1.4"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
+checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
[[package]]
name = "pin-utils"
@@ -5246,9 +5400,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.17"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
[[package]]
name = "platforms"
@@ -5258,9 +5412,9 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e"
[[package]]
name = "plotters"
-version = "0.2.12"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
+checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
dependencies = [
"js-sys",
"num-traits",
@@ -5289,15 +5443,15 @@ dependencies = [
[[package]]
name = "ppv-lite86"
-version = "0.2.6"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
[[package]]
name = "predicates"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030"
+checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a"
dependencies = [
"difference",
"predicates-core",
@@ -5333,31 +5487,31 @@ dependencies = [
[[package]]
name = "primitive-types"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e4b9943a2da369aec5e96f7c10ebc74fcf434d39590d974b0a3460e6f67fbb"
+checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8"
dependencies = [
"fixed-hash",
"impl-codec",
"impl-rlp",
- "impl-serde 0.3.0",
+ "impl-serde",
"uint",
]
[[package]]
name = "proc-macro-crate"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e"
+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
dependencies = [
"toml",
]
[[package]]
name = "proc-macro-error"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678"
+checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
@@ -5368,9 +5522,9 @@ dependencies = [
[[package]]
name = "proc-macro-error-attr"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53"
+checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
dependencies = [
"proc-macro2",
"quote",
@@ -5381,35 +5535,36 @@ dependencies = [
[[package]]
name = "proc-macro-hack"
-version = "0.5.15"
+version = "0.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63"
+checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
[[package]]
name = "proc-macro-nested"
-version = "0.1.4"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
+checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
[[package]]
name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
dependencies = [
"unicode-xid",
]
[[package]]
name = "prometheus"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd"
+checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae"
dependencies = [
"cfg-if",
"fnv",
"lazy_static",
- "spin",
+ "parking_lot 0.11.0",
+ "regex",
"thiserror",
]
@@ -5419,7 +5574,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"prost-derive",
]
@@ -5429,7 +5584,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"heck",
"itertools 0.8.2",
"log",
@@ -5460,7 +5615,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"prost",
]
@@ -5470,7 +5625,7 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f53bc2558e8376358ebdc28301546471d67336584f6438ed4b7c7457a055fd7"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"log",
"parity-wasm 0.41.0",
]
@@ -5487,7 +5642,7 @@ version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
dependencies = [
- "env_logger 0.7.1",
+ "env_logger",
"log",
"rand 0.7.3",
"rand_core 0.5.1",
@@ -5506,9 +5661,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.6"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
dependencies = [
"proc-macro2",
]
@@ -5539,7 +5694,7 @@ dependencies = [
"libc",
"rand_core 0.3.1",
"rdrand",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -5548,11 +5703,11 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
dependencies = [
- "cloudabi",
+ "cloudabi 0.0.3",
"fuchsia-cprng",
"libc",
"rand_core 0.3.1",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -5571,7 +5726,7 @@ dependencies = [
"rand_os",
"rand_pcg 0.1.2",
"rand_xorshift",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -5667,7 +5822,7 @@ checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
dependencies = [
"libc",
"rand_core 0.4.2",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -5676,13 +5831,13 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
dependencies = [
- "cloudabi",
+ "cloudabi 0.0.3",
"fuchsia-cprng",
"libc",
"rand_core 0.4.2",
"rdrand",
"wasm-bindgen",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -5713,16 +5868,6 @@ dependencies = [
"rand_core 0.3.1",
]
-[[package]]
-name = "rand_xoshiro"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929"
-dependencies = [
- "byteorder",
- "rand_core 0.3.1",
-]
-
[[package]]
name = "raw-cpuid"
version = "7.0.3"
@@ -5742,10 +5887,11 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.3.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
+checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
dependencies = [
+ "autocfg 1.0.0",
"crossbeam-deque",
"either",
"rayon-core",
@@ -5753,9 +5899,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.7.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
+checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
dependencies = [
"crossbeam-deque",
"crossbeam-queue",
@@ -5775,9 +5921,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.1.56"
+version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "redox_users"
@@ -5792,18 +5938,18 @@ dependencies = [
[[package]]
name = "ref-cast"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a214c7875e1b63fc1618db7c80efc0954f6156c9ff07699fd9039e255accdd1"
+checksum = "745c1787167ddae5569661d5ffb8b25ae5fedbf46717eaa92d652221cec72623"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602eb59cda66fcb9aec25841fb76bc01d2b34282dcdd705028da297db6f3eec8"
+checksum = "7d21b475ab879ef0e315ad99067fa25778c3b0377f57f1b00207448dac1a3144"
dependencies = [
"proc-macro2",
"quote",
@@ -5823,9 +5969,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.3.6"
+version = "1.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3"
+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
dependencies = [
"aho-corasick",
"memchr",
@@ -5839,15 +5985,15 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"regex-syntax",
]
[[package]]
name = "regex-syntax"
-version = "0.6.17"
+version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
[[package]]
name = "region"
@@ -5858,37 +6004,16 @@ dependencies = [
"bitflags",
"libc",
"mach",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
name = "remove_dir_all"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-dependencies = [
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "rental"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f"
-dependencies = [
- "rental-impl",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "rental-impl"
-version = "0.5.5"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "winapi 0.3.9",
]
[[package]]
@@ -5899,17 +6024,17 @@ checksum = "e005d658ad26eacc2b6c506dfde519f4e277e328d0eb3379ca61647d70a8f531"
[[package]]
name = "ring"
-version = "0.16.12"
+version = "0.16.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba5a8ec64ee89a76c98c549af81ff14813df09c3e6dc4766c3856da48597a0c"
+checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4"
dependencies = [
"cc",
- "lazy_static",
"libc",
+ "once_cell 1.4.0",
"spin",
"untrusted",
"web-sys",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -5934,9 +6059,9 @@ dependencies = [
[[package]]
name = "rocksdb"
-version = "0.14.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61aa17a99a2413cd71c1106691bf59dad7de0cd5099127f90e9d99c429c40d4a"
+checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6"
dependencies = [
"libc",
"librocksdb-sys",
@@ -5949,7 +6074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
dependencies = [
"libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -6018,9 +6143,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3bba175698996010c4f6dce5e7f173b6eb781fce25d2cfc45e27091ce0b79f6"
+checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da"
dependencies = [
"proc-macro2",
"quote",
@@ -6040,9 +6165,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.3"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "safe-mix"
@@ -6053,6 +6178,26 @@ dependencies = [
"rustc_version",
]
+[[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 0.3.2",
+]
+
+[[package]]
+name = "salsa20-core"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fe6cc1b9f5a5867853ade63099de70f042f7679e408d1ffe52821c9248e6e69"
+dependencies = [
+ "stream-cipher 0.3.2",
+]
+
[[package]]
name = "same-file"
version = "1.0.6"
@@ -6064,11 +6209,11 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"derive_more",
- "env_logger 0.7.1",
+ "either",
"futures 0.3.5",
"futures-timer 3.0.2",
"libp2p",
@@ -6088,13 +6233,14 @@ dependencies = [
"sp-blockchain",
"sp-core",
"sp-runtime",
+ "sp-tracing",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
]
[[package]]
name = "sc-basic-authorship"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -6120,7 +6266,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -6138,9 +6284,10 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"impl-trait-for-tuples",
+ "parity-scale-codec",
"sc-chain-spec-derive",
"sc-network",
"sc-telemetry",
@@ -6153,7 +6300,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -6163,32 +6310,39 @@ dependencies = [
[[package]]
name = "sc-cli"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"ansi_term 0.12.1",
"atty",
+ "bip39",
"chrono",
"derive_more",
- "env_logger 0.7.1",
"fdlimit",
"futures 0.3.5",
+ "hex",
"lazy_static",
+ "libp2p",
"log",
"names",
"nix",
- "parity-util-mem 0.7.0",
+ "parity-scale-codec",
+ "parity-util-mem",
+ "rand 0.7.3",
"regex",
"rpassword",
"sc-client-api",
"sc-informant",
+ "sc-keystore",
"sc-network",
"sc-service",
"sc-telemetry",
"sc-tracing",
"serde",
"serde_json",
+ "sp-application-crypto",
"sp-blockchain",
"sp-core",
+ "sp-io",
"sp-keyring",
"sp-panic-handler",
"sp-runtime",
@@ -6199,20 +6353,23 @@ dependencies = [
"substrate-prometheus-endpoint",
"tempfile",
"time",
- "tokio 0.2.21",
+ "tokio 0.2.22",
+ "tracing",
+ "tracing-log",
+ "tracing-subscriber",
]
[[package]]
name = "sc-client-api"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"derive_more",
"fnv",
"futures 0.3.5",
"hash-db",
"hex-literal",
- "kvdb 0.7.0",
- "kvdb-memorydb 0.6.0",
+ "kvdb",
+ "kvdb-memorydb",
"lazy_static",
"log",
"parity-scale-codec",
@@ -6242,19 +6399,18 @@ dependencies = [
[[package]]
name = "sc-client-db"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"blake2-rfc",
- "env_logger 0.7.1",
"hash-db",
- "kvdb 0.7.0",
- "kvdb-memorydb 0.7.0",
+ "kvdb",
+ "kvdb-memorydb",
"kvdb-rocksdb",
"linked-hash-map",
"log",
"parity-db",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"parking_lot 0.10.2",
"quickcheck",
"sc-client-api",
@@ -6268,6 +6424,7 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"sp-state-machine",
+ "sp-tracing",
"sp-trie",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
@@ -6276,7 +6433,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"sc-client-api",
"sp-blockchain",
@@ -6286,10 +6443,9 @@ dependencies = [
[[package]]
name = "sc-consensus-aura"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
- "env_logger 0.7.1",
"futures 0.3.5",
"futures-timer 3.0.2",
"log",
@@ -6316,6 +6472,7 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"sp-timestamp",
+ "sp-tracing",
"sp-version",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
@@ -6324,10 +6481,9 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
- "env_logger 0.7.1",
"fork-tree",
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -6368,6 +6524,7 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"sp-timestamp",
+ "sp-tracing",
"sp-utils",
"sp-version",
"substrate-prometheus-endpoint",
@@ -6377,7 +6534,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -6405,7 +6562,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -6417,11 +6574,10 @@ dependencies = [
[[package]]
name = "sc-consensus-manual-seal"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"assert_matches",
"derive_more",
- "env_logger 0.7.1",
"futures 0.3.5",
"jsonrpc-core",
"jsonrpc-core-client",
@@ -6430,29 +6586,37 @@ dependencies = [
"parking_lot 0.10.2",
"sc-basic-authorship",
"sc-client-api",
+ "sc-consensus-babe",
+ "sc-consensus-epochs",
+ "sc-keystore",
"sc-transaction-pool",
"serde",
+ "sp-api",
"sp-blockchain",
"sp-consensus",
+ "sp-consensus-babe",
"sp-core",
"sp-inherents",
"sp-runtime",
+ "sp-timestamp",
"sp-transaction-pool",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
"tempfile",
- "tokio 0.2.21",
+ "tokio 0.2.22",
]
[[package]]
name = "sc-consensus-pow"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
"futures 0.3.5",
+ "futures-timer 3.0.2",
"log",
"parity-scale-codec",
+ "parking_lot 0.10.2",
"sc-client-api",
"sp-api",
"sp-block-builder",
@@ -6468,7 +6632,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -6491,7 +6655,7 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"log",
"sc-client-api",
@@ -6504,7 +6668,7 @@ dependencies = [
[[package]]
name = "sc-executor"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"assert_matches",
"derive_more",
@@ -6536,13 +6700,14 @@ dependencies = [
"substrate-test-runtime",
"test-case",
"tracing",
- "wabt",
+ "tracing-subscriber",
"wasmi",
+ "wat",
]
[[package]]
name = "sc-executor-common"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
"log",
@@ -6558,7 +6723,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"log",
"parity-scale-codec",
@@ -6572,7 +6737,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"assert_matches",
"log",
@@ -6590,11 +6755,10 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"assert_matches",
"derive_more",
- "env_logger 0.7.1",
"finality-grandpa",
"fork-tree",
"futures 0.3.5",
@@ -6626,16 +6790,17 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"sp-state-machine",
+ "sp-tracing",
"sp-utils",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.2.21",
+ "tokio 0.2.22",
]
[[package]]
name = "sc-finality-grandpa-rpc"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
"finality-grandpa",
@@ -6648,6 +6813,7 @@ dependencies = [
"log",
"parity-scale-codec",
"sc-block-builder",
+ "sc-client-api",
"sc-finality-grandpa",
"sc-network-test",
"sc-rpc",
@@ -6664,12 +6830,12 @@ dependencies = [
[[package]]
name = "sc-informant"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"ansi_term 0.12.1",
"futures 0.3.5",
"log",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"sc-client-api",
"sc-network",
"sp-blockchain",
@@ -6681,7 +6847,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"derive_more",
"hex",
@@ -6691,13 +6857,13 @@ dependencies = [
"serde_json",
"sp-application-crypto",
"sp-core",
- "subtle 2.2.2",
+ "subtle 2.2.3",
"tempfile",
]
[[package]]
name = "sc-light"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"hash-db",
"lazy_static",
@@ -6715,16 +6881,16 @@ dependencies = [
[[package]]
name = "sc-network"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"assert_matches",
"async-std",
+ "async-trait",
"bitflags",
"bs58",
- "bytes 0.5.4",
+ "bytes 0.5.6",
"derive_more",
"either",
- "env_logger 0.7.1",
"erased-serde",
"fnv",
"fork-tree",
@@ -6761,6 +6927,7 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"sp-test-primitives",
+ "sp-tracing",
"sp-utils",
"substrate-prometheus-endpoint",
"substrate-test-runtime",
@@ -6775,7 +6942,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"async-std",
"futures 0.3.5",
@@ -6793,9 +6960,8 @@ dependencies = [
[[package]]
name = "sc-network-test"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
- "env_logger 0.7.1",
"futures 0.3.5",
"futures-timer 3.0.2",
"libp2p",
@@ -6812,6 +6978,7 @@ dependencies = [
"sp-consensus-babe",
"sp-core",
"sp-runtime",
+ "sp-tracing",
"substrate-test-runtime",
"substrate-test-runtime-client",
"tempfile",
@@ -6819,14 +6986,13 @@ dependencies = [
[[package]]
name = "sc-offchain"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "bytes 0.5.4",
- "env_logger 0.7.1",
+ "bytes 0.5.6",
"fnv",
"futures 0.3.5",
"futures-timer 3.0.2",
- "hyper 0.13.4",
+ "hyper 0.13.7",
"hyper-rustls",
"lazy_static",
"log",
@@ -6843,16 +7009,17 @@ dependencies = [
"sp-core",
"sp-offchain",
"sp-runtime",
+ "sp-tracing",
"sp-transaction-pool",
"sp-utils",
"substrate-test-runtime-client",
"threadpool",
- "tokio 0.2.21",
+ "tokio 0.2.22",
]
[[package]]
name = "sc-peerset"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"futures 0.3.5",
"libp2p",
@@ -6865,7 +7032,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -6873,7 +7040,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"assert_matches",
"futures 0.1.29",
@@ -6912,7 +7079,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -6935,8 +7102,9 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
+ "futures 0.1.29",
"jsonrpc-core",
"jsonrpc-http-server",
"jsonrpc-ipc-server",
@@ -6946,11 +7114,12 @@ dependencies = [
"serde",
"serde_json",
"sp-runtime",
+ "substrate-prometheus-endpoint",
]
[[package]]
name = "sc-runtime-test"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"sp-allocator",
"sp-core",
@@ -6963,7 +7132,7 @@ dependencies = [
[[package]]
name = "sc-service"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"async-std",
"derive_more",
@@ -6978,7 +7147,7 @@ dependencies = [
"lazy_static",
"log",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"parking_lot 0.10.2",
"pin-project",
"rand 0.7.3",
@@ -7015,6 +7184,7 @@ dependencies = [
"sp-runtime",
"sp-session",
"sp-state-machine",
+ "sp-tracing",
"sp-transaction-pool",
"sp-trie",
"sp-utils",
@@ -7022,16 +7192,15 @@ dependencies = [
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.2.21",
+ "tokio 0.2.22",
"tracing",
"wasm-timer",
]
[[package]]
name = "sc-service-test"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "env_logger 0.7.1",
"fdlimit",
"futures 0.1.29",
"futures 0.3.5",
@@ -7055,6 +7224,7 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-storage",
+ "sp-tracing",
"sp-transaction-pool",
"sp-trie",
"substrate-test-runtime",
@@ -7065,12 +7235,11 @@ dependencies = [
[[package]]
name = "sc-state-db"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
- "env_logger 0.7.1",
"log",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"parity-util-mem-derive",
"parking_lot 0.10.2",
"sc-client-api",
@@ -7079,7 +7248,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -7099,7 +7268,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"erased-serde",
"log",
@@ -7111,21 +7280,22 @@ dependencies = [
"slog",
"sp-tracing",
"tracing",
+ "tracing-core",
"tracing-subscriber",
]
[[package]]
name = "sc-transaction-graph"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"assert_matches",
- "criterion 0.3.1",
+ "criterion",
"derive_more",
"futures 0.3.5",
"linked-hash-map",
"log",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"parking_lot 0.10.2",
"retain_mut",
"serde",
@@ -7140,7 +7310,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"assert_matches",
"derive_more",
@@ -7150,7 +7320,7 @@ dependencies = [
"intervalier",
"log",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"parking_lot 0.10.2",
"sc-block-builder",
"sc-client-api",
@@ -7172,12 +7342,12 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.18"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19"
+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
dependencies = [
"lazy_static",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -7193,8 +7363,8 @@ dependencies = [
"merlin",
"rand 0.7.3",
"rand_core 0.5.1",
- "sha2 0.8.1",
- "subtle 2.2.2",
+ "sha2 0.8.2",
+ "subtle 2.2.3",
"zeroize",
]
@@ -7204,6 +7374,12 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+[[package]]
+name = "scopeguard"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+
[[package]]
name = "scopeguard"
version = "1.1.0"
@@ -7221,9 +7397,9 @@ dependencies = [
[[package]]
name = "scroll_derive"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
+checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9"
dependencies = [
"proc-macro2",
"quote",
@@ -7286,6 +7462,15 @@ name = "semver"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
dependencies = [
"semver-parser",
"serde",
@@ -7324,6 +7509,16 @@ dependencies = [
"serde_derive",
]
+[[package]]
+name = "serde_cbor"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
+dependencies = [
+ "half",
+ "serde",
+]
+
[[package]]
name = "serde_derive"
version = "1.0.114"
@@ -7360,9 +7555,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
+checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
dependencies = [
"block-buffer 0.7.3",
"digest 0.8.1",
@@ -7505,12 +7700,12 @@ dependencies = [
"futures-io",
"futures-util",
"libc",
- "once_cell",
+ "once_cell 1.4.0",
"scoped-tls",
"slab",
"socket2",
"wepoll-sys-stjepang",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -7527,7 +7722,7 @@ dependencies = [
"ring",
"rustc_version",
"sha2 0.9.1",
- "subtle 2.2.2",
+ "subtle 2.2.3",
"x25519-dalek",
]
@@ -7540,7 +7735,7 @@ dependencies = [
"cfg-if",
"libc",
"redox_syscall",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -7550,7 +7745,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85457366ae0c6ce56bf05a958aef14cd38513c236568618edbcd9a8c52cb80b0"
dependencies = [
"base64 0.12.3",
- "bytes 0.5.4",
+ "bytes 0.5.6",
"flate2",
"futures 0.3.5",
"httparse",
@@ -7561,7 +7756,7 @@ dependencies = [
[[package]]
name = "sp-allocator"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"derive_more",
"log",
@@ -7572,7 +7767,7 @@ dependencies = [
[[package]]
name = "sp-api"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"hash-db",
"parity-scale-codec",
@@ -7587,7 +7782,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"blake2-rfc",
"proc-macro-crate",
@@ -7598,9 +7793,9 @@ dependencies = [
[[package]]
name = "sp-api-test"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "criterion 0.3.1",
+ "criterion",
"parity-scale-codec",
"rustversion",
"sc-block-builder",
@@ -7617,7 +7812,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"serde",
@@ -7628,7 +7823,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto-test"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"sp-api",
"sp-application-crypto",
@@ -7639,9 +7834,9 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "criterion 0.3.1",
+ "criterion",
"integer-sqrt",
"num-traits",
"parity-scale-codec",
@@ -7655,7 +7850,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic-fuzzer"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"honggfuzz",
"num-bigint",
@@ -7666,7 +7861,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7677,7 +7872,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -7687,7 +7882,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7698,7 +7893,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"derive_more",
"log",
@@ -7714,7 +7909,7 @@ dependencies = [
[[package]]
name = "sp-chain-spec"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"serde",
"serde_json",
@@ -7722,7 +7917,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -7748,7 +7943,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7761,7 +7956,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"merlin",
"parity-scale-codec",
@@ -7779,7 +7974,7 @@ dependencies = [
[[package]]
name = "sp-consensus-pow"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7790,7 +7985,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -7798,7 +7993,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -7809,12 +8004,12 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"base58",
"blake2-rfc",
- "byteorder",
- "criterion 0.2.11",
+ "byteorder 1.3.4",
+ "criterion",
"derive_more",
"dyn-clonable",
"ed25519-dalek",
@@ -7823,14 +8018,14 @@ dependencies = [
"hash256-std-hasher",
"hex",
"hex-literal",
- "impl-serde 0.3.0",
+ "impl-serde",
"lazy_static",
"libsecp256k1",
"log",
"merlin",
"num-traits",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"parking_lot 0.10.2",
"pretty_assertions",
"primitive-types",
@@ -7841,7 +8036,7 @@ dependencies = [
"secrecy",
"serde",
"serde_json",
- "sha2 0.8.1",
+ "sha2 0.8.2",
"sp-debug-derive",
"sp-externalities",
"sp-runtime-interface",
@@ -7850,7 +8045,7 @@ dependencies = [
"sp-storage",
"substrate-bip39",
"tiny-bip39",
- "tiny-keccak 2.0.2",
+ "tiny-keccak",
"twox-hash",
"wasmi",
"zeroize",
@@ -7858,15 +8053,15 @@ dependencies = [
[[package]]
name = "sp-database"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "kvdb 0.7.0",
+ "kvdb",
"parking_lot 0.10.2",
]
[[package]]
name = "sp-debug-derive"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"proc-macro2",
"quote",
@@ -7875,7 +8070,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -7885,7 +8080,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"finality-grandpa",
"log",
@@ -7900,7 +8095,7 @@ dependencies = [
[[package]]
name = "sp-finality-tracker"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -7909,7 +8104,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"derive_more",
"parity-scale-codec",
@@ -7920,7 +8115,7 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"futures 0.3.5",
"hash-db",
@@ -7936,11 +8131,13 @@ dependencies = [
"sp-tracing",
"sp-trie",
"sp-wasm-interface",
+ "tracing",
+ "tracing-core",
]
[[package]]
name = "sp-keyring"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"lazy_static",
"sp-core",
@@ -7950,7 +8147,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"rand 0.7.3",
@@ -7964,7 +8161,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections-compact"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -7977,6 +8174,7 @@ name = "sp-npos-elections-fuzzer"
version = "2.0.0-alpha.5"
dependencies = [
"honggfuzz",
+ "parity-scale-codec",
"rand 0.7.3",
"sp-npos-elections",
"sp-runtime",
@@ -7985,7 +8183,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"sp-api",
"sp-core",
@@ -7995,7 +8193,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"backtrace",
"log",
@@ -8003,7 +8201,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"serde",
"serde_json",
@@ -8012,14 +8210,14 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"either",
"hash256-std-hasher",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"paste",
"rand 0.7.3",
"serde",
@@ -8035,7 +8233,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"primitive-types",
@@ -8047,6 +8245,7 @@ dependencies = [
"sp-runtime-interface-test-wasm",
"sp-state-machine",
"sp-std",
+ "sp-storage",
"sp-tracing",
"sp-wasm-interface",
"static_assertions",
@@ -8055,7 +8254,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -8066,7 +8265,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-test"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"sc-executor",
"sp-core",
@@ -8077,11 +8276,12 @@ dependencies = [
"sp-runtime-interface-test-wasm-deprecated",
"sp-state-machine",
"tracing",
+ "tracing-core",
]
[[package]]
name = "sp-runtime-interface-test-wasm"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"sp-core",
"sp-io",
@@ -8092,7 +8292,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-test-wasm-deprecated"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"sp-core",
"sp-io",
@@ -8103,7 +8303,7 @@ dependencies = [
[[package]]
name = "sp-sandbox"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"assert_matches",
"parity-scale-codec",
@@ -8111,13 +8311,13 @@ dependencies = [
"sp-io",
"sp-std",
"sp-wasm-interface",
- "wabt",
"wasmi",
+ "wat",
]
[[package]]
name = "sp-serializer"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"serde",
"serde_json",
@@ -8125,7 +8325,7 @@ dependencies = [
[[package]]
name = "sp-session"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -8137,7 +8337,7 @@ dependencies = [
[[package]]
name = "sp-staking"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -8146,11 +8346,10 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"hash-db",
"hex-literal",
- "itertools 0.9.0",
"log",
"num-traits",
"parity-scale-codec",
@@ -8162,6 +8361,7 @@ dependencies = [
"sp-externalities",
"sp-panic-handler",
"sp-runtime",
+ "sp-std",
"sp-trie",
"trie-db",
"trie-root",
@@ -8169,13 +8369,14 @@ dependencies = [
[[package]]
name = "sp-std"
-version = "2.0.0-rc5"
+version = "2.0.0"
[[package]]
name = "sp-storage"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "impl-serde 0.2.3",
+ "impl-serde",
+ "parity-scale-codec",
"ref-cast",
"serde",
"sp-debug-derive",
@@ -8184,10 +8385,10 @@ dependencies = [
[[package]]
name = "sp-test-primitives"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"serde",
"sp-application-crypto",
"sp-core",
@@ -8196,7 +8397,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -8209,16 +8410,19 @@ dependencies = [
[[package]]
name = "sp-tracing"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"log",
- "rental",
+ "parity-scale-codec",
+ "sp-std",
"tracing",
+ "tracing-core",
+ "tracing-subscriber",
]
[[package]]
name = "sp-transaction-pool"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -8232,9 +8436,9 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "criterion 0.2.11",
+ "criterion",
"hash-db",
"hex-literal",
"memory-db",
@@ -8250,7 +8454,7 @@ dependencies = [
[[package]]
name = "sp-utils"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"futures 0.3.5",
"futures-core",
@@ -8261,9 +8465,9 @@ dependencies = [
[[package]]
name = "sp-version"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "impl-serde 0.2.3",
+ "impl-serde",
"parity-scale-codec",
"serde",
"sp-runtime",
@@ -8272,7 +8476,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -8288,9 +8492,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "stable_deref_trait"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "static_assertions"
@@ -8342,9 +8546,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
-version = "0.3.13"
+version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6da2e8d107dfd7b74df5ef4d205c6aebee0706c647f6bc6a2d5789905c00fb"
+checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
dependencies = [
"clap",
"lazy_static",
@@ -8353,9 +8557,9 @@ dependencies = [
[[package]]
name = "structopt-derive"
-version = "0.4.6"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a489c87c08fbaf12e386665109dd13470dcc9c4583ea3e10dd2b4523e5ebd9ac"
+checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
dependencies = [
"heck",
"proc-macro-error",
@@ -8387,49 +8591,33 @@ dependencies = [
[[package]]
name = "subkey"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "clap",
- "derive_more",
"frame-system",
- "futures 0.1.29",
- "hex",
- "hex-literal",
- "hyper 0.12.35",
- "itertools 0.8.2",
- "jsonrpc-core-client",
- "libp2p",
"node-primitives",
"node-runtime",
- "pallet-balances",
- "pallet-grandpa",
- "pallet-transaction-payment",
- "parity-scale-codec",
- "rand 0.7.3",
- "rpassword",
- "sc-rpc",
- "serde_json",
+ "sc-cli",
"sp-core",
- "sp-runtime",
- "substrate-bip39",
- "tiny-bip39",
+ "structopt",
+ "substrate-frame-cli",
]
[[package]]
name = "substrate-bip39"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c004e8166d6e0aa3a9d5fa673e5b7098ff25f930de1013a21341988151e681bb"
+checksum = "bed6646a0159b9935b5d045611560eeef842b78d7adc3ba36f5ca325a13a0236"
dependencies = [
"hmac",
"pbkdf2",
"schnorrkel",
- "sha2 0.8.1",
+ "sha2 0.8.2",
+ "zeroize",
]
[[package]]
name = "substrate-browser-utils"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"chrono",
"console_error_panic_hook",
@@ -8454,14 +8642,25 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"platforms",
]
+[[package]]
+name = "substrate-frame-cli"
+version = "2.0.0"
+dependencies = [
+ "frame-system",
+ "sc-cli",
+ "sp-core",
+ "sp-runtime",
+ "structopt",
+]
+
[[package]]
name = "substrate-frame-rpc-support"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -8472,14 +8671,13 @@ dependencies = [
"sc-rpc-api",
"serde",
"sp-storage",
- "tokio 0.2.21",
+ "tokio 0.2.22",
]
[[package]]
name = "substrate-frame-rpc-system"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
- "env_logger 0.7.1",
"frame-system-rpc-runtime-api",
"futures 0.3.5",
"jsonrpc-core",
@@ -8496,26 +8694,27 @@ dependencies = [
"sp-blockchain",
"sp-core",
"sp-runtime",
+ "sp-tracing",
"sp-transaction-pool",
"substrate-test-runtime-client",
]
[[package]]
name = "substrate-prometheus-endpoint"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"async-std",
"derive_more",
"futures-util",
- "hyper 0.13.4",
+ "hyper 0.13.7",
"log",
"prometheus",
- "tokio 0.2.21",
+ "tokio 0.2.22",
]
[[package]]
name = "substrate-test-client"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"futures 0.1.29",
"futures 0.3.5",
@@ -8540,7 +8739,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"cfg-if",
"frame-executive",
@@ -8552,7 +8751,7 @@ dependencies = [
"pallet-babe",
"pallet-timestamp",
"parity-scale-codec",
- "parity-util-mem 0.7.0",
+ "parity-util-mem",
"sc-block-builder",
"sc-executor",
"sc-service",
@@ -8563,6 +8762,7 @@ dependencies = [
"sp-consensus-aura",
"sp-consensus-babe",
"sp-core",
+ "sp-externalities",
"sp-finality-grandpa",
"sp-inherents",
"sp-io",
@@ -8583,7 +8783,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime-client"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"futures 0.3.5",
"parity-scale-codec",
@@ -8603,7 +8803,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime-transaction-pool"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"derive_more",
"futures 0.3.5",
@@ -8618,18 +8818,18 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
-version = "2.0.0-rc5"
+version = "2.0.0"
dependencies = [
"futures 0.3.5",
"sc-service",
"substrate-test-utils-derive",
- "tokio 0.2.21",
+ "tokio 0.2.22",
"trybuild",
]
[[package]]
name = "substrate-test-utils-derive"
-version = "0.8.0-rc5"
+version = "0.8.0"
dependencies = [
"proc-macro-crate",
"quote",
@@ -8642,13 +8842,14 @@ version = "0.1.0"
dependencies = [
"sc-service",
"substrate-test-utils",
- "tokio 0.2.21",
+ "tokio 0.2.22",
]
[[package]]
name = "substrate-wasm-builder"
version = "2.0.0"
dependencies = [
+ "ansi_term 0.12.1",
"atty",
"build-helper",
"cargo_metadata",
@@ -8672,15 +8873,15 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
[[package]]
name = "subtle"
-version = "2.2.2"
+version = "2.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941"
+checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
[[package]]
name = "syn"
-version = "1.0.33"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
+checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
dependencies = [
"proc-macro2",
"quote",
@@ -8700,9 +8901,9 @@ dependencies = [
[[package]]
name = "synstructure"
-version = "0.12.3"
+version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2",
"quote",
@@ -8733,7 +8934,7 @@ dependencies = [
"rand 0.7.3",
"redox_syscall",
"remove_dir_all",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -8769,18 +8970,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.15"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b3d3d2ff68104100ab257bb6bb0cb26c901abe4bd4ba15961f3bf867924012"
+checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.15"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca972988113b7715266f91250ddb98070d033c62a011fa0fcc57434a649310dd"
+checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
dependencies = [
"proc-macro2",
"quote",
@@ -8798,22 +8999,21 @@ dependencies = [
[[package]]
name = "threadpool"
-version = "1.7.1"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
dependencies = [
"num_cpus",
]
[[package]]
name = "time"
-version = "0.1.42"
+version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
dependencies = [
"libc",
- "redox_syscall",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -8824,23 +9024,14 @@ checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2"
dependencies = [
"failure",
"hmac",
- "once_cell",
+ "once_cell 1.4.0",
"pbkdf2",
"rand 0.7.3",
"rustc-hash",
- "sha2 0.8.1",
+ "sha2 0.8.2",
"unicode-normalization",
]
-[[package]]
-name = "tiny-keccak"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2"
-dependencies = [
- "crunchy",
-]
-
[[package]]
name = "tiny-keccak"
version = "2.0.2"
@@ -8852,14 +9043,20 @@ dependencies = [
[[package]]
name = "tinytemplate"
-version = "1.0.3"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a3c6667d3e65eb1bc3aed6fd14011c6cbc3a0665218ab7f5daf040b9ec371a"
+checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
dependencies = [
"serde",
"serde_json",
]
+[[package]]
+name = "tinyvec"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
+
[[package]]
name = "tokio"
version = "0.1.22"
@@ -8886,11 +9083,11 @@ dependencies = [
[[package]]
name = "tokio"
-version = "0.2.21"
+version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58"
+checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"fnv",
"futures-core",
"iovec",
@@ -8904,7 +9101,7 @@ dependencies = [
"signal-hook-registry",
"slab",
"tokio-macros",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -9033,7 +9230,7 @@ checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9"
dependencies = [
"futures-core",
"rustls",
- "tokio 0.2.21",
+ "tokio 0.2.22",
"webpki",
]
@@ -9127,9 +9324,9 @@ dependencies = [
[[package]]
name = "tokio-uds"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5076db410d6fdc6523df7595447629099a1fdc47b3d9f896220780fa48faf798"
+checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0"
dependencies = [
"bytes 0.4.12",
"futures 0.1.29",
@@ -9149,12 +9346,12 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"futures-core",
"futures-sink",
"log",
"pin-project-lite",
- "tokio 0.2.21",
+ "tokio 0.2.22",
]
[[package]]
@@ -9174,20 +9371,21 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
[[package]]
name = "tracing"
-version = "0.1.18"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
+checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c"
dependencies = [
"cfg-if",
+ "log",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
-version = "0.1.9"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b"
+checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
dependencies = [
"proc-macro2",
"quote",
@@ -9196,9 +9394,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.12"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2734b5a028fa697686f16c6d18c2c6a3c7e41513f9a213abb6754c4acb3c8d7"
+checksum = "5bcf46c1f1f06aeea2d6b81f3c863d0930a596c86ad1920d4e5bad6dd1d7119a"
dependencies = [
"lazy_static",
]
@@ -9252,11 +9450,11 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
[[package]]
name = "trie-bench"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24987a413863acfa081fb75051d0c2824cd4c450e2f0a7e03dca93ac989775fc"
+checksum = "af2cc37cac8cc158119982c920cbb9b8243d8540c1d13b8aca84484bfc83a426"
dependencies = [
- "criterion 0.2.11",
+ "criterion",
"hash-db",
"keccak-hasher",
"memory-db",
@@ -9273,7 +9471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39f1a9a9252d38c5337cf0c5392988821a5cf1b2103245016968f2ab41de9e38"
dependencies = [
"hash-db",
- "hashbrown 0.8.0",
+ "hashbrown 0.8.1",
"log",
"rustc-hex",
"smallvec 1.4.1",
@@ -9300,18 +9498,18 @@ dependencies = [
[[package]]
name = "try-lock"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "trybuild"
-version = "1.0.25"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459186ab1afd6d93bd23c2269125f4f7694f8771fe0e64434b4bdc212b94034d"
+checksum = "b7d30fe369fd650072b352b1a9cb9587669de6b89be3b8225544012c1c45292d"
dependencies = [
"dissimilar",
- "glob 0.3.0",
+ "glob",
"lazy_static",
"serde",
"serde_json",
@@ -9319,17 +9517,6 @@ dependencies = [
"toml",
]
-[[package]]
-name = "twofish"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712d261e83e727c8e2dbb75dacac67c36e35db36a958ee504f2164fc052434e1"
-dependencies = [
- "block-cipher-trait",
- "byteorder",
- "opaque-debug 0.2.3",
-]
-
[[package]]
name = "twox-hash"
version = "1.5.0"
@@ -9347,11 +9534,11 @@ checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
[[package]]
name = "uint"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75a4cdd7b87b28840dba13c483b9a88ee6bbf16ba5c951ee1ecfcf723078e0d"
+checksum = "173cd16430c206dc1a430af8a89a0e9c076cf15cb42b4aedb10e8cc8fee73681"
dependencies = [
- "byteorder",
+ "byteorder 1.3.4",
"crunchy",
"rustc-hex",
"static_assertions",
@@ -9377,11 +9564,11 @@ dependencies = [
[[package]]
name = "unicode-normalization"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
+checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
dependencies = [
- "smallvec 1.4.1",
+ "tinyvec",
]
[[package]]
@@ -9392,15 +9579,15 @@ checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
[[package]]
name = "unicode-width"
-version = "0.1.7"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]]
name = "universal-hash"
@@ -9409,7 +9596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
dependencies = [
"generic-array 0.14.3",
- "subtle 2.2.2",
+ "subtle 2.2.3",
]
[[package]]
@@ -9424,17 +9611,27 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "669d776983b692a906c881fcd0cfb34271a48e197e4d6cb8df32b05bfc3d3fa5"
dependencies = [
- "bytes 0.5.4",
+ "bytes 0.5.6",
"futures-io",
"futures-util",
"futures_codec",
]
+[[package]]
+name = "unsigned-varint"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35"
+dependencies = [
+ "futures-io",
+ "futures-util",
+]
+
[[package]]
name = "untrusted"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "url"
@@ -9460,21 +9657,21 @@ dependencies = [
[[package]]
name = "vcpkg"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
+checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
[[package]]
name = "vec_map"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
[[package]]
name = "void"
@@ -9482,29 +9679,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-[[package]]
-name = "wabt"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5c5c1286c6e578416982609f47594265f9d489f9b836157d403ad605a46693"
-dependencies = [
- "serde",
- "serde_derive",
- "serde_json",
- "wabt-sys",
-]
-
-[[package]]
-name = "wabt-sys"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7043ebb3e5d96fad7a8d3ca22ee9880748ff8c3e18092cfb2a49d3b8f9084"
-dependencies = [
- "cc",
- "cmake",
- "glob 0.2.11",
-]
-
[[package]]
name = "wait-timeout"
version = "0.2.0"
@@ -9527,7 +9701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
dependencies = [
"same-file",
- "winapi 0.3.8",
+ "winapi 0.3.9",
"winapi-util",
]
@@ -9587,9 +9761,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.10"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7add542ea1ac7fdaa9dc25e031a6af33b7d63376292bd24140c637d00d1c312a"
+checksum = "8a369c5e1dfb7569e14d62af4da642a3cbc2f9a3652fe586e26ac22222aa4b04"
dependencies = [
"cfg-if",
"js-sys",
@@ -9628,9 +9802,9 @@ checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"
[[package]]
name = "wasm-bindgen-test"
-version = "0.3.10"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648da3460c6d2aa04b715a936329e2e311180efe650b2127d6267f4193ccac14"
+checksum = "fd8e9dad8040e378f0696b017570c6bc929aac373180e06b3d67ac5059c52da3"
dependencies = [
"console_error_panic_hook",
"js-sys",
@@ -9642,9 +9816,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-test-macro"
-version = "0.3.10"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2f86cd78a2aa7b1fb4bb6ed854eccb7f9263089c79542dca1576a1518a8467"
+checksum = "c358c8d2507c1bae25efa069e62ea907aa28700b25c8c33dafb0b15ba4603627"
dependencies = [
"proc-macro2",
"quote",
@@ -9735,7 +9909,7 @@ dependencies = [
"wasmtime-profiling",
"wasmtime-runtime",
"wat",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -9777,11 +9951,11 @@ dependencies = [
"more-asserts",
"rayon",
"serde",
- "sha2 0.8.1",
+ "sha2 0.8.2",
"thiserror",
"toml",
"wasmparser 0.59.0",
- "winapi 0.3.8",
+ "winapi 0.3.9",
"zstd",
]
@@ -9811,7 +9985,7 @@ dependencies = [
"wasmtime-obj",
"wasmtime-profiling",
"wasmtime-runtime",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -9865,7 +10039,7 @@ dependencies = [
"region",
"thiserror",
"wasmtime-environ",
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -9888,9 +10062,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.37"
+version = "0.3.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d6f51648d8c56c366144378a33290049eafdd784071077f6fe37dae64c1c4cb"
+checksum = "8bc359e5dd3b46cb9687a051d50a2fdd228e4ba7cf6fcf861a5365c3d671a642"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -9898,9 +10072,9 @@ dependencies = [
[[package]]
name = "webpki"
-version = "0.21.2"
+version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
+checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae"
dependencies = [
"ring",
"untrusted",
@@ -9950,9 +10124,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
[[package]]
name = "winapi"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
@@ -9972,11 +10146,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
]
[[package]]
@@ -9985,24 +10159,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "ws"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
-dependencies = [
- "byteorder",
- "bytes 0.4.12",
- "httparse",
- "log",
- "mio",
- "mio-extras",
- "rand 0.7.3",
- "sha-1",
- "slab",
- "url 2.1.1",
-]
-
[[package]]
name = "ws2_32-sys"
version = "0.2.1"
@@ -10026,14 +10182,14 @@ dependencies = [
[[package]]
name = "yamux"
-version = "0.4.7"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd37e58a1256a0b328ce9c67d8b62ecdd02f4803ba443df478835cb1a41a637c"
+checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
dependencies = [
"futures 0.3.5",
"log",
"nohash-hasher",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.0",
"rand 0.7.3",
"static_assertions",
]
@@ -10061,18 +10217,18 @@ dependencies = [
[[package]]
name = "zstd"
-version = "0.5.1+zstd.1.4.4"
+version = "0.5.3+zstd.1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5d978b793ae64375b80baf652919b148f6a496ac8802922d9999f5a553194f"
+checksum = "01b32eaf771efa709e8308605bbf9319bf485dc1503179ec0469b611937c0cd8"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
-version = "2.0.3+zstd.1.4.4"
+version = "2.0.5+zstd.1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee25eac9753cfedd48133fa1736cbd23b774e253d89badbeac7d12b23848d3f"
+checksum = "1cfb642e0d27f64729a639c52db457e0ae906e7bc6f5fe8f5c453230400f1055"
dependencies = [
"libc",
"zstd-sys",
@@ -10080,11 +10236,12 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "1.4.15+zstd.1.4.4"
+version = "1.4.17+zstd.1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89719b034dc22d240d5b407fb0a3fe6d29952c181cff9a9f95c0bd40b4f8f7d8"
+checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b"
dependencies = [
"cc",
- "glob 0.3.0",
+ "glob",
+ "itertools 0.9.0",
"libc",
]
diff --git a/Cargo.toml b/Cargo.toml
index f22e3427a70a1eaced1ec29eaf72af859078b09c..99b1d418a5153c19ab2dc3a39d233c43fc7c8b7c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,6 @@ members = [
"frame/babe",
"frame/balances",
"frame/benchmarking",
- "frame/benchmark",
"frame/collective",
"frame/contracts",
"frame/contracts/rpc",
@@ -79,7 +78,6 @@ members = [
"frame/example-offchain-worker",
"frame/executive",
"frame/finality-tracker",
- "frame/generic-asset",
"frame/grandpa",
"frame/identity",
"frame/im-online",
@@ -88,6 +86,7 @@ members = [
"frame/metadata",
"frame/multisig",
"frame/nicks",
+ "frame/node-authorization",
"frame/offences",
"frame/proxy",
"frame/randomness-collective-flip",
@@ -180,6 +179,7 @@ members = [
"utils/build-script-utils",
"utils/fork-tree",
"utils/frame/benchmarking-cli",
+ "utils/frame/frame-utilities-cli",
"utils/frame/rpc/support",
"utils/frame/rpc/system",
"utils/wasm-builder",
@@ -201,7 +201,6 @@ members = [
#
# This list is ordered alphabetically.
[profile.dev.package]
-aes-ctr = { opt-level = 3 }
aes-soft = { opt-level = 3 }
aesni = { opt-level = 3 }
blake2 = { opt-level = 3 }
@@ -215,7 +214,6 @@ crc32fast = { opt-level = 3 }
crossbeam-deque = { opt-level = 3 }
crossbeam-queue = { opt-level = 3 }
crypto-mac = { opt-level = 3 }
-ctr = { opt-level = 3 }
curve25519-dalek = { opt-level = 3 }
ed25519-dalek = { opt-level = 3 }
evm-core = { opt-level = 3 }
diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
index 0c988ebd1a22be49a9e820ed34dedfd01df27ece..8b1a47fd2bf15740e36a28692510985b4d7a28e1 100644
--- a/bin/node-template/node/Cargo.toml
+++ b/bin/node-template/node/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-template"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Anonymous"]
description = "A new FRAME-based Substrate node, ready for hacking."
edition = "2018"
@@ -18,34 +18,44 @@ name = "node-template"
[dependencies]
structopt = "0.3.8"
-sc-cli = { version = "0.8.0-rc5", path = "../../../client/cli", features = ["wasmtime"] }
-sp-core = { version = "2.0.0-rc5", path = "../../../primitives/core" }
-sc-executor = { version = "0.8.0-rc5", path = "../../../client/executor", features = ["wasmtime"] }
-sc-service = { version = "0.8.0-rc5", path = "../../../client/service", features = ["wasmtime"] }
-sp-inherents = { version = "2.0.0-rc5", path = "../../../primitives/inherents" }
-sc-transaction-pool = { version = "2.0.0-rc5", path = "../../../client/transaction-pool" }
-sp-transaction-pool = { version = "2.0.0-rc5", path = "../../../primitives/transaction-pool" }
-sc-consensus-aura = { version = "0.8.0-rc5", path = "../../../client/consensus/aura" }
-sp-consensus-aura = { version = "0.8.0-rc5", path = "../../../primitives/consensus/aura" }
-sp-consensus = { version = "0.8.0-rc5", path = "../../../primitives/consensus/common" }
-sc-consensus = { version = "0.8.0-rc5", path = "../../../client/consensus/common" }
-sc-finality-grandpa = { version = "0.8.0-rc5", path = "../../../client/finality-grandpa" }
-sp-finality-grandpa = { version = "2.0.0-rc5", path = "../../../primitives/finality-grandpa" }
-sc-client-api = { version = "2.0.0-rc5", path = "../../../client/api" }
-sp-runtime = { version = "2.0.0-rc5", path = "../../../primitives/runtime" }
+sc-cli = { version = "0.8.0", path = "../../../client/cli", features = ["wasmtime"] }
+sp-core = { version = "2.0.0", path = "../../../primitives/core" }
+sc-executor = { version = "0.8.0", path = "../../../client/executor", features = ["wasmtime"] }
+sc-service = { version = "0.8.0", path = "../../../client/service", features = ["wasmtime"] }
+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-consensus-aura = { version = "0.8.0", path = "../../../client/consensus/aura" }
+sp-consensus-aura = { version = "0.8.0", path = "../../../primitives/consensus/aura" }
+sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
+sc-finality-grandpa = { version = "0.8.0", path = "../../../client/finality-grandpa" }
+sp-finality-grandpa = { version = "2.0.0", path = "../../../primitives/finality-grandpa" }
+sc-client-api = { version = "2.0.0", path = "../../../client/api" }
+sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
# These dependencies are used for the node template's RPCs
-jsonrpc-core = "14.0.3"
-sc-rpc = { version = "2.0.0-rc5", path = "../../../client/rpc" }
-sp-api = { version = "2.0.0-rc5", path = "../../../primitives/api" }
-sc-rpc-api = { version = "0.8.0-rc5", path = "../../../client/rpc-api" }
-sp-blockchain = { version = "2.0.0-rc5", path = "../../../primitives/blockchain" }
-sp-block-builder = { version = "2.0.0-rc5", path = "../../../primitives/block-builder" }
-sc-basic-authorship = { version = "0.8.0-rc5", path = "../../../client/basic-authorship" }
-substrate-frame-rpc-system = { version = "2.0.0-rc5", path = "../../../utils/frame/rpc/system" }
-pallet-transaction-payment-rpc = { version = "2.0.0-rc5", path = "../../../frame/transaction-payment/rpc/" }
-
-node-template-runtime = { version = "2.0.0-rc5", path = "../runtime" }
+jsonrpc-core = "15.0.0"
+sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
+sp-api = { version = "2.0.0", path = "../../../primitives/api" }
+sc-rpc-api = { version = "0.8.0", path = "../../../client/rpc-api" }
+sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
+sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
+sc-basic-authorship = { version = "0.8.0", path = "../../../client/basic-authorship" }
+substrate-frame-rpc-system = { version = "2.0.0", path = "../../../utils/frame/rpc/system" }
+pallet-transaction-payment-rpc = { version = "2.0.0", path = "../../../frame/transaction-payment/rpc/" }
+
+# These dependencies are used for runtime benchmarking
+frame-benchmarking = { version = "2.0.0", path = "../../../frame/benchmarking" }
+frame-benchmarking-cli = { version = "2.0.0", path = "../../../utils/frame/benchmarking-cli" }
+
+node-template-runtime = { version = "2.0.0", path = "../runtime" }
[build-dependencies]
-substrate-build-script-utils = { version = "2.0.0-rc5", path = "../../../utils/build-script-utils" }
+substrate-build-script-utils = { version = "2.0.0", path = "../../../utils/build-script-utils" }
+
+[features]
+default = []
+runtime-benchmarks = [
+ "node-template-runtime/runtime-benchmarks",
+]
diff --git a/bin/node-template/node/src/cli.rs b/bin/node-template/node/src/cli.rs
index 0091ef7d75912f736c1cbffde84d29e17186038c..f2faf17e4ddf44b724292d014d542b63b594b56f 100644
--- a/bin/node-template/node/src/cli.rs
+++ b/bin/node-template/node/src/cli.rs
@@ -1,5 +1,5 @@
-use sc_cli::{RunCmd, Subcommand};
use structopt::StructOpt;
+use sc_cli::RunCmd;
#[derive(Debug, StructOpt)]
pub struct Cli {
@@ -9,3 +9,31 @@ pub struct Cli {
#[structopt(flatten)]
pub run: RunCmd,
}
+
+#[derive(Debug, StructOpt)]
+pub enum Subcommand {
+ /// Build a chain specification.
+ BuildSpec(sc_cli::BuildSpecCmd),
+
+ /// Validate blocks.
+ CheckBlock(sc_cli::CheckBlockCmd),
+
+ /// Export blocks.
+ ExportBlocks(sc_cli::ExportBlocksCmd),
+
+ /// Export the state of a given block into a chain spec.
+ ExportState(sc_cli::ExportStateCmd),
+
+ /// Import blocks.
+ ImportBlocks(sc_cli::ImportBlocksCmd),
+
+ /// Remove the whole chain.
+ PurgeChain(sc_cli::PurgeChainCmd),
+
+ /// Revert the chain to a previous state.
+ Revert(sc_cli::RevertCmd),
+
+ /// The custom benchmark subcommmand benchmarking runtime pallets.
+ #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
+ Benchmark(frame_benchmarking_cli::BenchmarkCmd),
+}
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index b3f1cfaf11f5592196a6bd9da9ff80d257690b85..2efca0383710844d3a9d1cf6d0ae5851c7005f60 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -15,12 +15,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use crate::chain_spec;
-use crate::cli::Cli;
-use crate::service;
+use crate::{chain_spec, service};
+use crate::cli::{Cli, Subcommand};
use sc_cli::{SubstrateCli, RuntimeVersion, Role, ChainSpec};
use sc_service::PartialComponents;
-use crate::service::new_partial;
+use node_template_runtime::Block;
impl SubstrateCli for Cli {
fn impl_name() -> String {
@@ -67,14 +66,64 @@ pub fn run() -> sc_cli::Result<()> {
let cli = Cli::from_args();
match &cli.subcommand {
- Some(subcommand) => {
- let runner = cli.create_runner(subcommand)?;
- runner.run_subcommand(subcommand, |config| {
- let PartialComponents { client, backend, task_manager, import_queue, .. }
- = new_partial(&config)?;
- Ok((client, backend, import_queue, task_manager))
+ Some(Subcommand::BuildSpec(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
+ },
+ Some(Subcommand::CheckBlock(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, import_queue, ..}
+ = service::new_partial(&config)?;
+ Ok((cmd.run(client, import_queue), task_manager))
})
- }
+ },
+ Some(Subcommand::ExportBlocks(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, ..}
+ = service::new_partial(&config)?;
+ Ok((cmd.run(client, config.database), task_manager))
+ })
+ },
+ Some(Subcommand::ExportState(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, ..}
+ = service::new_partial(&config)?;
+ Ok((cmd.run(client, config.chain_spec), task_manager))
+ })
+ },
+ Some(Subcommand::ImportBlocks(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, import_queue, ..}
+ = service::new_partial(&config)?;
+ Ok((cmd.run(client, import_queue), task_manager))
+ })
+ },
+ Some(Subcommand::PurgeChain(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.sync_run(|config| cmd.run(config.database))
+ },
+ Some(Subcommand::Revert(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, backend, ..}
+ = service::new_partial(&config)?;
+ Ok((cmd.run(client, backend), task_manager))
+ })
+ },
+ Some(Subcommand::Benchmark(cmd)) => {
+ if cfg!(feature = "runtime-benchmarks") {
+ let runner = cli.create_runner(cmd)?;
+
+ runner.sync_run(|config| cmd.run::(config))
+ } else {
+ Err("Benchmarking wasn't enabled when building the node. \
+ You can enable it with `--features runtime-benchmarks`.".into())
+ }
+ },
None => {
let runner = cli.create_runner(&cli.run)?;
runner.run_node_until_exit(|config| match config.role {
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 4eba4fdd093e9b508128ca757742a6c867ddd8bb..3de31dc61ab5175a36838bc01bf3c500619d647b 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -16,6 +16,7 @@ native_executor_instance!(
pub Executor,
node_template_runtime::api::dispatch,
node_template_runtime::native_version,
+ frame_benchmarking::benchmarking::HostFunctions,
);
type FullClient = sc_service::TFullClient;
@@ -27,7 +28,12 @@ pub fn new_partial(config: &Configuration) -> Result,
sc_transaction_pool::FullPool,
(
- sc_finality_grandpa::GrandpaBlockImport,
+ sc_consensus_aura::AuraBlockImport<
+ Block,
+ FullClient,
+ sc_finality_grandpa::GrandpaBlockImport,
+ AuraPair
+ >,
sc_finality_grandpa::LinkHalf
)
>, ServiceError> {
@@ -54,21 +60,22 @@ pub fn new_partial(config: &Configuration) -> Result(
+ let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
sc_consensus_aura::slot_duration(&*client)?,
- aura_block_import,
+ aura_block_import.clone(),
Some(Box::new(grandpa_block_import.clone())),
None,
client.clone(),
inherent_data_providers.clone(),
&task_manager.spawn_handle(),
config.prometheus_registry(),
+ sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
)?;
Ok(sc_service::PartialComponents {
client, backend, task_manager, import_queue, keystore, select_chain, transaction_pool,
inherent_data_providers,
- other: (grandpa_block_import, grandpa_link),
+ other: (aura_block_import, grandpa_link),
})
}
@@ -240,7 +247,7 @@ pub fn new_light(config: Configuration) -> Result {
let finality_proof_request_builder =
finality_proof_import.create_finality_proof_request_builder();
- let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>(
+ let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
sc_consensus_aura::slot_duration(&*client)?,
grandpa_block_import,
None,
@@ -249,6 +256,7 @@ pub fn new_light(config: Configuration) -> Result {
InherentDataProviders::new(),
&task_manager.spawn_handle(),
config.prometheus_registry(),
+ sp_consensus::NeverCanAuthor,
)?;
let finality_proof_provider =
diff --git a/bin/node-template/pallets/template/Cargo.toml b/bin/node-template/pallets/template/Cargo.toml
index 6d8868386e38cf18d4a0ee29b907062affa15610..12b810de186f42627f30e8fc0d33a55ffd20cd6f 100644
--- a/bin/node-template/pallets/template/Cargo.toml
+++ b/bin/node-template/pallets/template/Cargo.toml
@@ -2,11 +2,12 @@
authors = ['Anonymous']
edition = '2018'
name = 'pallet-template'
-version = "2.0.0-rc5"
+version = "2.0.0"
license = "Unlicense"
homepage = "https://substrate.dev"
repository = "https://github.com/paritytech/substrate/"
description = "FRAME pallet template for defining custom runtime logic."
+readme = "README.md"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
@@ -16,27 +17,27 @@ codec = { package = "parity-scale-codec", version = "1.3.4", default-features =
[dependencies.frame-support]
default-features = false
-version = "2.0.0-rc5"
+version = "2.0.0"
path = "../../../../frame/support"
[dependencies.frame-system]
default-features = false
-version = "2.0.0-rc5"
+version = "2.0.0"
path = "../../../../frame/system"
[dev-dependencies.sp-core]
default-features = false
-version = "2.0.0-rc5"
+version = "2.0.0"
path = "../../../../primitives/core"
[dev-dependencies.sp-io]
default-features = false
-version = "2.0.0-rc5"
+version = "2.0.0"
path = "../../../../primitives/io"
[dev-dependencies.sp-runtime]
default-features = false
-version = "2.0.0-rc5"
+version = "2.0.0"
path = "../../../../primitives/runtime"
diff --git a/bin/node-template/pallets/template/README.md b/bin/node-template/pallets/template/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..8d751a42207ddd3f2d4d361248077a468b64f36a
--- /dev/null
+++ b/bin/node-template/pallets/template/README.md
@@ -0,0 +1 @@
+License: Unlicense
\ No newline at end of file
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index 8c3bf2b40473c81b2fa946b3fae86d250f448c3f..a3dff240e4847d518343507f084d6ca4339f7a43 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -42,7 +42,7 @@ impl system::Trait for Test {
type MaximumBlockLength = MaximumBlockLength;
type AvailableBlockRatio = AvailableBlockRatio;
type Version = ();
- type ModuleToIndex = ();
+ type PalletInfo = ();
type AccountData = ();
type OnNewAccount = ();
type OnKilledAccount = ();
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index f4e8697a47d0d43cf14937c685dd50c898ccc103..393578f8d295d96bcc84b3ecf11ac5eec8a3c97d 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-template-runtime"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Anonymous"]
edition = "2018"
license = "Unlicense"
@@ -13,34 +13,39 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
-pallet-aura = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/aura" }
-pallet-balances = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/balances" }
-frame-support = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/support" }
-pallet-grandpa = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/grandpa" }
-pallet-randomness-collective-flip = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/randomness-collective-flip" }
-pallet-sudo = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/sudo" }
-frame-system = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/system" }
-pallet-timestamp = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/transaction-payment" }
-frame-executive = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/executive" }
+pallet-aura = { version = "2.0.0", default-features = false, path = "../../../frame/aura" }
+pallet-balances = { version = "2.0.0", default-features = false, path = "../../../frame/balances" }
+frame-support = { version = "2.0.0", default-features = false, path = "../../../frame/support" }
+pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../../frame/grandpa" }
+pallet-randomness-collective-flip = { version = "2.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
+pallet-sudo = { version = "2.0.0", default-features = false, path = "../../../frame/sudo" }
+frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
+pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment" }
+frame-executive = { version = "2.0.0", default-features = false, path = "../../../frame/executive" }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-api = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/api" }
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "2.0.0-rc5"}
-sp-consensus-aura = { version = "0.8.0-rc5", default-features = false, path = "../../../primitives/consensus/aura" }
-sp-core = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/core" }
-sp-inherents = { path = "../../../primitives/inherents", default-features = false, version = "2.0.0-rc5"}
-sp-offchain = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/offchain" }
-sp-runtime = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/runtime" }
-sp-session = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/session" }
-sp-std = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/std" }
-sp-transaction-pool = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/transaction-pool" }
-sp-version = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/version" }
+sp-api = { version = "2.0.0", default-features = false, path = "../../../primitives/api" }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "2.0.0"}
+sp-consensus-aura = { version = "0.8.0", 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, version = "2.0.0"}
+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" }
# Used for the node template's RPCs
-frame-system-rpc-runtime-api = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
-pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
+frame-system-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
-template = { version = "2.0.0-rc5", default-features = false, path = "../pallets/template", package = "pallet-template" }
+# Used for runtime benchmarking
+frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
+frame-system-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
+hex-literal = { version = "0.3.1", optional = true }
+
+template = { version = "2.0.0", default-features = false, path = "../pallets/template", package = "pallet-template" }
[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
@@ -58,7 +63,7 @@ std = [
"pallet-sudo/std",
"pallet-timestamp/std",
"pallet-transaction-payment/std",
- "pallet-transaction-payment-rpc-runtime-api/std",
+ "pallet-transaction-payment-rpc-runtime-api/std",
"serde",
"sp-api/std",
"sp-block-builder/std",
@@ -72,6 +77,16 @@ std = [
"sp-transaction-pool/std",
"sp-version/std",
"frame-system/std",
- "frame-system-rpc-runtime-api/std",
+ "frame-system-rpc-runtime-api/std",
"template/std",
]
+runtime-benchmarks = [
+ "sp-runtime/runtime-benchmarks",
+ "frame-benchmarking",
+ "frame-support/runtime-benchmarks",
+ "frame-system-benchmarking",
+ "hex-literal",
+ "frame-system/runtime-benchmarks",
+ "pallet-balances/runtime-benchmarks",
+ "pallet-timestamp/runtime-benchmarks",
+]
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 06e34e4551673b69dacb667de0376e99ee36e12b..e96de63731745c5613528ac5bf6b468caf22290e 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -181,7 +181,7 @@ impl frame_system::Trait for Runtime {
/// Converts a module to the index of the module in `construct_runtime!`.
///
/// This type is being generated by `construct_runtime!`.
- type ModuleToIndex = ModuleToIndex;
+ type PalletInfo = PalletInfo;
/// What to do if a new account is created.
type OnNewAccount = ();
/// What to do if an account is fully reaped from the system.
@@ -211,6 +211,8 @@ impl pallet_grandpa::Trait for Runtime {
)>>::IdentificationTuple;
type HandleEquivocation = ();
+
+ type WeightInfo = ();
}
parameter_types! {
@@ -227,9 +229,11 @@ impl pallet_timestamp::Trait for Runtime {
parameter_types! {
pub const ExistentialDeposit: u128 = 500;
+ pub const MaxLocks: u32 = 50;
}
impl pallet_balances::Trait for Runtime {
+ type MaxLocks = MaxLocks;
/// The type for recording an account's balance.
type Balance = Balance;
/// The ubiquitous event type.
@@ -423,7 +427,7 @@ impl_runtime_apis! {
None
}
}
-
+
impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime {
fn account_nonce(account: AccountId) -> Index {
System::account_nonce(account)
@@ -438,4 +442,39 @@ impl_runtime_apis! {
TransactionPayment::query_info(uxt, len)
}
}
+
+ #[cfg(feature = "runtime-benchmarks")]
+ impl frame_benchmarking::Benchmark for Runtime {
+ fn dispatch_benchmark(
+ config: frame_benchmarking::BenchmarkConfig
+ ) -> Result, sp_runtime::RuntimeString> {
+ use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
+
+ use frame_system_benchmarking::Module as SystemBench;
+ impl frame_system_benchmarking::Trait for Runtime {}
+
+ let whitelist: Vec = vec![
+ // Block Number
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
+ // Total Issuance
+ hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
+ // Execution Phase
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
+ // Event Count
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
+ // System Events
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
+ ];
+
+ let mut batches = Vec::::new();
+ let params = (&config, &whitelist);
+
+ add_benchmark!(params, batches, frame_system, SystemBench::);
+ add_benchmark!(params, batches, pallet_balances, Balances);
+ add_benchmark!(params, batches, pallet_timestamp, Timestamp);
+
+ if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
+ Ok(batches)
+ }
+ }
}
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 0f93039c3c1eb48e26f7cfbb95f1296a69f3f77c..c0f5bf889521ca1356aea4e233199602e44f5bbc 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-bench"
-version = "0.8.0-rc5"
+version = "0.8.0"
authors = ["Parity Technologies "]
description = "Substrate node integration benchmarks."
edition = "2018"
@@ -10,27 +10,28 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
log = "0.4.8"
-node-primitives = { version = "2.0.0-rc5", path = "../primitives" }
-node-testing = { version = "2.0.0-rc5", path = "../testing" }
-node-runtime = { version = "2.0.0-rc5", path = "../runtime" }
-sc-cli = { version = "0.8.0-rc5", path = "../../../client/cli" }
-sc-client-api = { version = "2.0.0-rc5", path = "../../../client/api/" }
-sp-runtime = { version = "2.0.0-rc5", path = "../../../primitives/runtime" }
-sp-state-machine = { version = "0.8.0-rc5", path = "../../../primitives/state-machine" }
+node-primitives = { version = "2.0.0", path = "../primitives" }
+node-testing = { version = "2.0.0", path = "../testing" }
+node-runtime = { version = "2.0.0", path = "../runtime" }
+sc-cli = { version = "0.8.0", path = "../../../client/cli" }
+sc-client-api = { version = "2.0.0", path = "../../../client/api/" }
+sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
serde = "1.0.101"
serde_json = "1.0.41"
structopt = "0.3"
derive_more = "0.99.2"
kvdb = "0.7"
-kvdb-rocksdb = "0.9"
-sp-trie = { version = "2.0.0-rc5", path = "../../../primitives/trie" }
-sp-core = { version = "2.0.0-rc5", path = "../../../primitives/core" }
-sp-consensus = { version = "0.8.0-rc5", path = "../../../primitives/consensus/common" }
-sp-transaction-pool = { version = "2.0.0-rc5", path = "../../../primitives/transaction-pool" }
-sc-basic-authorship = { version = "0.8.0-rc5", path = "../../../client/basic-authorship" }
-sp-inherents = { version = "2.0.0-rc5", path = "../../../primitives/inherents" }
-sp-finality-tracker = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/finality-tracker" }
-sp-timestamp = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/timestamp" }
+kvdb-rocksdb = "0.9.1"
+sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
+sp-core = { version = "2.0.0", path = "../../../primitives/core" }
+sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
+sc-basic-authorship = { version = "0.8.0", path = "../../../client/basic-authorship" }
+sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
+sp-finality-tracker = { version = "2.0.0", default-features = false, path = "../../../primitives/finality-tracker" }
+sp-timestamp = { version = "2.0.0", default-features = false, path = "../../../primitives/timestamp" }
+sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
hash-db = "0.15.2"
tempfile = "3.1.0"
fs_extra = "1"
@@ -39,5 +40,5 @@ rand = { version = "0.7.2", features = ["small_rng"] }
lazy_static = "1.4.0"
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
parity-db = { version = "0.1.2" }
-sc-transaction-pool = { version = "2.0.0-rc5", path = "../../../client/transaction-pool" }
+sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/bench/src/main.rs b/bin/node/bench/src/main.rs
index 96ef1d920c1f551cb0a467814599f0e9afbf5ce8..46b659dd88387e94c2d493e3d5975df3e7c28fab 100644
--- a/bin/node/bench/src/main.rs
+++ b/bin/node/bench/src/main.rs
@@ -79,7 +79,7 @@ fn main() {
let opt = Opt::from_args();
if !opt.json {
- sc_cli::init_logger("");
+ sp_tracing::try_init_simple();
}
let mut import_benchmarks = Vec::new();
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index 1f5db1053d741a8b9f8b67311514a20355100198..13d6e057a1e16d418278ea042d9555eb582fe5d3 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-browser-testing"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
description = "Tests for the in-browser light client."
edition = "2018"
@@ -8,8 +8,8 @@ license = "Apache-2.0"
[dependencies]
futures-timer = "3.0.2"
-libp2p = { version = "0.23.0", default-features = false }
-jsonrpc-core = "14.2.0"
+libp2p = { version = "0.28.1", default-features = false }
+jsonrpc-core = "15.0.0"
serde = "1.0.106"
serde_json = "1.0.48"
wasm-bindgen = { version = "=0.2.67", features = ["serde-serialize"] }
@@ -17,5 +17,5 @@ wasm-bindgen-futures = "0.4.10"
wasm-bindgen-test = "0.3.10"
futures = "0.3.4"
-node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0-rc5"}
-sc-rpc-api = { path = "../../../client/rpc-api" , version = "0.8.0-rc5"}
+node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0"}
+sc-rpc-api = { path = "../../../client/rpc-api" , version = "0.8.0"}
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 16ab9bbe8064149ce30b966d4ece9e470ba87c3e..39df211707eaa5743ffe82a7cea23329814b2dc5 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-cli"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
description = "Generic Substrate node implementation in Rust."
build = "build.rs"
@@ -37,87 +37,85 @@ crate-type = ["cdylib", "rlib"]
codec = { package = "parity-scale-codec", version = "1.3.4" }
serde = { version = "1.0.102", features = ["derive"] }
futures = { version = "0.3.1", features = ["compat"] }
-hex-literal = "0.2.1"
-jsonrpc-core = "14.2.0"
-jsonrpc-pubsub = "14.2.0"
+hex-literal = "0.3.1"
log = "0.4.8"
rand = "0.7.2"
structopt = { version = "0.3.8", optional = true }
-tracing = "0.1.18"
+tracing = "0.1.19"
parking_lot = "0.10.0"
# primitives
-sp-authority-discovery = { version = "2.0.0-rc5", path = "../../../primitives/authority-discovery" }
-sp-consensus-babe = { version = "0.8.0-rc5", path = "../../../primitives/consensus/babe" }
-grandpa-primitives = { version = "2.0.0-rc5", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
-sp-core = { version = "2.0.0-rc5", path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0-rc5", path = "../../../primitives/runtime" }
-sp-timestamp = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/timestamp" }
-sp-finality-tracker = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/finality-tracker" }
-sp-inherents = { version = "2.0.0-rc5", path = "../../../primitives/inherents" }
-sp-keyring = { version = "2.0.0-rc5", path = "../../../primitives/keyring" }
-sp-io = { version = "2.0.0-rc5", path = "../../../primitives/io" }
-sp-consensus = { version = "0.8.0-rc5", path = "../../../primitives/consensus/common" }
-sp-transaction-pool = { version = "2.0.0-rc5", path = "../../../primitives/transaction-pool" }
+sp-authority-discovery = { version = "2.0.0", path = "../../../primitives/authority-discovery" }
+sp-consensus-babe = { version = "0.8.0", 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.0", path = "../../../primitives/consensus/common" }
+sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
# client dependencies
-sc-client-api = { version = "2.0.0-rc5", path = "../../../client/api" }
-sc-chain-spec = { version = "2.0.0-rc5", path = "../../../client/chain-spec" }
-sc-consensus = { version = "0.8.0-rc5", path = "../../../client/consensus/common" }
-sc-transaction-pool = { version = "2.0.0-rc5", path = "../../../client/transaction-pool" }
-sc-network = { version = "0.8.0-rc5", path = "../../../client/network" }
-sc-consensus-babe = { version = "0.8.0-rc5", path = "../../../client/consensus/babe" }
-grandpa = { version = "0.8.0-rc5", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-sc-client-db = { version = "0.8.0-rc5", default-features = false, path = "../../../client/db" }
-sc-offchain = { version = "2.0.0-rc5", path = "../../../client/offchain" }
-sc-rpc = { version = "2.0.0-rc5", path = "../../../client/rpc" }
-sc-basic-authorship = { version = "0.8.0-rc5", path = "../../../client/basic-authorship" }
-sc-service = { version = "0.8.0-rc5", default-features = false, path = "../../../client/service" }
-sc-tracing = { version = "2.0.0-rc5", path = "../../../client/tracing" }
-sc-telemetry = { version = "2.0.0-rc5", path = "../../../client/telemetry" }
-sc-authority-discovery = { version = "0.8.0-rc5", path = "../../../client/authority-discovery" }
+sc-client-api = { version = "2.0.0", path = "../../../client/api" }
+sc-chain-spec = { version = "2.0.0", path = "../../../client/chain-spec" }
+sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
+sc-transaction-pool = { version = "2.0.0", path = "../../../client/transaction-pool" }
+sc-network = { version = "0.8.0", path = "../../../client/network" }
+sc-consensus-babe = { version = "0.8.0", path = "../../../client/consensus/babe" }
+grandpa = { version = "0.8.0", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
+sc-client-db = { version = "0.8.0", 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.0", path = "../../../client/basic-authorship" }
+sc-service = { version = "0.8.0", 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.0", path = "../../../client/authority-discovery" }
# frame dependencies
-pallet-indices = { version = "2.0.0-rc5", path = "../../../frame/indices" }
-pallet-timestamp = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/timestamp" }
-pallet-contracts = { version = "2.0.0-rc5", path = "../../../frame/contracts" }
-frame-system = { version = "2.0.0-rc5", path = "../../../frame/system" }
-pallet-balances = { version = "2.0.0-rc5", path = "../../../frame/balances" }
-pallet-transaction-payment = { version = "2.0.0-rc5", path = "../../../frame/transaction-payment" }
-frame-support = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/support" }
-pallet-im-online = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/im-online" }
-pallet-authority-discovery = { version = "2.0.0-rc5", path = "../../../frame/authority-discovery" }
-pallet-staking = { version = "2.0.0-rc5", path = "../../../frame/staking" }
-pallet-grandpa = { version = "2.0.0-rc5", path = "../../../frame/grandpa" }
+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-staking = { version = "2.0.0", path = "../../../frame/staking" }
+pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
# node-specific dependencies
-node-runtime = { version = "2.0.0-rc5", path = "../runtime" }
-node-rpc = { version = "2.0.0-rc5", path = "../rpc" }
-node-primitives = { version = "2.0.0-rc5", path = "../primitives" }
-node-executor = { version = "2.0.0-rc5", path = "../executor" }
+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" }
# CLI-specific dependencies
-sc-cli = { version = "0.8.0-rc5", optional = true, path = "../../../client/cli" }
-frame-benchmarking-cli = { version = "2.0.0-rc5", optional = true, path = "../../../utils/frame/benchmarking-cli" }
-node-inspect = { version = "0.8.0-rc5", optional = true, path = "../inspect" }
+sc-cli = { version = "0.8.0", optional = true, path = "../../../client/cli" }
+frame-benchmarking-cli = { version = "2.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
+node-inspect = { version = "0.8.0", 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 = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.8.0-rc5"}
+browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.8.0"}
[target.'cfg(target_arch="x86_64")'.dependencies]
-node-executor = { version = "2.0.0-rc5", path = "../executor", features = [ "wasmtime" ] }
-sc-cli = { version = "0.8.0-rc5", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] }
-sc-service = { version = "0.8.0-rc5", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] }
-sp-trie = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] }
+node-executor = { version = "2.0.0", path = "../executor", features = [ "wasmtime" ] }
+sc-cli = { version = "0.8.0", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] }
+sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] }
+sp-trie = { version = "2.0.0", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] }
[dev-dependencies]
-sc-keystore = { version = "2.0.0-rc5", path = "../../../client/keystore" }
-sc-consensus = { version = "0.8.0-rc5", path = "../../../client/consensus/common" }
-sc-consensus-babe = { version = "0.8.0-rc5", features = ["test-helpers"], path = "../../../client/consensus/babe" }
-sc-consensus-epochs = { version = "0.8.0-rc5", path = "../../../client/consensus/epochs" }
-sc-service-test = { version = "2.0.0-rc5", path = "../../../client/service/test" }
+sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
+sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
+sc-consensus-babe = { version = "0.8.0", features = ["test-helpers"], path = "../../../client/consensus/babe" }
+sc-consensus-epochs = { version = "0.8.0", path = "../../../client/consensus/epochs" }
+sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
futures = "0.3.4"
tempfile = "3.1.0"
assert_cmd = "1.0"
@@ -128,12 +126,13 @@ platforms = "0.2.1"
[build-dependencies]
structopt = { version = "0.3.8", optional = true }
-node-inspect = { version = "0.8.0-rc5", optional = true, path = "../inspect" }
-frame-benchmarking-cli = { version = "2.0.0-rc5", optional = true, path = "../../../utils/frame/benchmarking-cli" }
-substrate-build-script-utils = { version = "2.0.0-rc5", optional = true, path = "../../../utils/build-script-utils" }
+node-inspect = { version = "0.8.0", optional = true, path = "../inspect" }
+frame-benchmarking-cli = { version = "2.0.0", optional = true, path = "../../../utils/frame/benchmarking-cli" }
+substrate-build-script-utils = { version = "2.0.0", optional = true, path = "../../../utils/build-script-utils" }
+substrate-frame-cli = { version = "2.0.0", optional = true, path = "../../../utils/frame/frame-utilities-cli" }
[build-dependencies.sc-cli]
-version = "0.8.0-rc5"
+version = "0.8.0"
package = "sc-cli"
path = "../../../client/cli"
optional = true
@@ -150,6 +149,7 @@ cli = [
"node-inspect",
"sc-cli",
"frame-benchmarking-cli",
+ "substrate-frame-cli",
"sc-service/db",
"structopt",
"substrate-build-script-utils",
diff --git a/bin/node/cli/browser-demo/build.sh b/bin/node/cli/browser-demo/build.sh
index ea0380b760e31f4037d49509c7852b02baf81501..be52b7a523f0177728181bfa18b8aef614185a26 100755
--- a/bin/node/cli/browser-demo/build.sh
+++ b/bin/node/cli/browser-demo/build.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
cargo +nightly build --release -p node-cli --target wasm32-unknown-unknown --no-default-features --features browser -Z features=itarget
wasm-bindgen ../../../../target/wasm32-unknown-unknown/release/node_cli.wasm --out-dir pkg --target web
-python -m SimpleHTTPServer 8000
+python -m http.server 8000
diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
index e323f7956f169f7523186566dcc0524ed313d347..90824a5572f12f9e50f19703e96f2a9c046c5e40 100644
--- a/bin/node/cli/src/chain_spec.rs
+++ b/bin/node/cli/src/chain_spec.rs
@@ -380,7 +380,7 @@ pub fn local_testnet_config() -> ChainSpec {
#[cfg(test)]
pub(crate) mod tests {
use super::*;
- use crate::service::{new_full_base, new_light_base};
+ use crate::service::{new_full_base, new_light_base, NewFullBase};
use sc_service_test;
use sp_runtime::BuildStorage;
@@ -431,8 +431,9 @@ pub(crate) mod tests {
sc_service_test::connectivity(
integration_test_config_with_two_authorities(),
|config| {
- let (keep_alive, _, client, network, transaction_pool) = new_full_base(config,|_, _| ())?;
- Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
+ let NewFullBase { task_manager, client, network, transaction_pool, .. }
+ = new_full_base(config,|_, _| ())?;
+ Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
},
|config| {
let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs
index 29e916fe0180ec2c8ffde4cacdfba361b24cf86c..6e51dae93793f4ad862f4b1d20bdf1f7fb698103 100644
--- a/bin/node/cli/src/cli.rs
+++ b/bin/node/cli/src/cli.rs
@@ -16,7 +16,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-use sc_cli::RunCmd;
+use sc_cli::{RunCmd, KeySubcommand, SignCmd, VanityCmd, VerifyCmd};
use structopt::StructOpt;
/// An overarching CLI command definition.
@@ -33,9 +33,8 @@ pub struct Cli {
/// Possible subcommands of the main binary.
#[derive(Debug, StructOpt)]
pub enum Subcommand {
- /// A set of base subcommands handled by `sc_cli`.
- #[structopt(flatten)]
- Base(sc_cli::Subcommand),
+ /// Key management cli utilities
+ Key(KeySubcommand),
/// The custom inspect subcommmand for decoding blocks and extrinsics.
#[structopt(
@@ -47,4 +46,37 @@ pub enum Subcommand {
/// The custom benchmark subcommmand benchmarking runtime pallets.
#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
Benchmark(frame_benchmarking_cli::BenchmarkCmd),
+
+ /// Verify a signature for a message, provided on STDIN, with a given (public or secret) key.
+ Verify(VerifyCmd),
+
+ /// Generate a seed that provides a vanity address.
+ Vanity(VanityCmd),
+
+ /// Sign a message, with a given (secret) key.
+ Sign(SignCmd),
+
+ /// Build a chain specification.
+ BuildSpec(sc_cli::BuildSpecCmd),
+
+ /// Build a chain specification with a light client sync state.
+ BuildSyncSpec(sc_cli::BuildSyncSpecCmd),
+
+ /// Validate blocks.
+ CheckBlock(sc_cli::CheckBlockCmd),
+
+ /// Export blocks.
+ ExportBlocks(sc_cli::ExportBlocksCmd),
+
+ /// Export the state of a given block into a chain spec.
+ ExportState(sc_cli::ExportStateCmd),
+
+ /// Import blocks.
+ ImportBlocks(sc_cli::ImportBlocksCmd),
+
+ /// Remove the whole chain.
+ PurgeChain(sc_cli::PurgeChainCmd),
+
+ /// Revert the chain to a previous state.
+ Revert(sc_cli::RevertCmd),
}
diff --git a/bin/node/cli/src/command.rs b/bin/node/cli/src/command.rs
index 69d9a029865783f897d7a47b5a0700a0b88b2f8f..7b84ff5a0583bc094133316e9c9e32302b340cc3 100644
--- a/bin/node/cli/src/command.rs
+++ b/bin/node/cli/src/command.rs
@@ -21,7 +21,7 @@ use node_executor::Executor;
use node_runtime::{Block, RuntimeApi};
use sc_cli::{Result, SubstrateCli, RuntimeVersion, Role, ChainSpec};
use sc_service::PartialComponents;
-use crate::service::new_partial;
+use crate::service::{new_partial, new_full_base, NewFullBase};
impl SubstrateCli for Cli {
fn impl_name() -> String {
@@ -88,18 +88,72 @@ pub fn run() -> Result<()> {
runner.sync_run(|config| cmd.run::(config))
} else {
- println!("Benchmarking wasn't enabled when building the node. \
- You can enable it with `--features runtime-benchmarks`.");
- Ok(())
+ Err("Benchmarking wasn't enabled when building the node. \
+ You can enable it with `--features runtime-benchmarks`.".into())
}
}
- Some(Subcommand::Base(subcommand)) => {
- let runner = cli.create_runner(subcommand)?;
- runner.run_subcommand(subcommand, |config| {
- let PartialComponents { client, backend, task_manager, import_queue, ..}
+ Some(Subcommand::Key(cmd)) => cmd.run(),
+ Some(Subcommand::Sign(cmd)) => cmd.run(),
+ Some(Subcommand::Verify(cmd)) => cmd.run(),
+ Some(Subcommand::Vanity(cmd)) => cmd.run(),
+ Some(Subcommand::BuildSpec(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
+ },
+ Some(Subcommand::BuildSyncSpec(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let chain_spec = config.chain_spec.cloned_box();
+ let network_config = config.network.clone();
+ let NewFullBase { task_manager, client, network_status_sinks, .. }
+ = new_full_base(config, |_, _| ())?;
+
+ Ok((cmd.run(chain_spec, network_config, client, network_status_sinks), task_manager))
+ })
+ },
+ Some(Subcommand::CheckBlock(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, import_queue, ..}
= new_partial(&config)?;
- Ok((client, backend, import_queue, task_manager))
+ Ok((cmd.run(client, import_queue), task_manager))
})
- }
+ },
+ Some(Subcommand::ExportBlocks(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, ..}
+ = new_partial(&config)?;
+ Ok((cmd.run(client, config.database), task_manager))
+ })
+ },
+ Some(Subcommand::ExportState(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, ..}
+ = new_partial(&config)?;
+ Ok((cmd.run(client, config.chain_spec), task_manager))
+ })
+ },
+ Some(Subcommand::ImportBlocks(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, import_queue, ..}
+ = new_partial(&config)?;
+ Ok((cmd.run(client, import_queue), task_manager))
+ })
+ },
+ Some(Subcommand::PurgeChain(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.sync_run(|config| cmd.run(config.database))
+ },
+ Some(Subcommand::Revert(cmd)) => {
+ let runner = cli.create_runner(cmd)?;
+ runner.async_run(|config| {
+ let PartialComponents { client, task_manager, backend, ..}
+ = new_partial(&config)?;
+ Ok((cmd.run(client, backend), task_manager))
+ })
+ },
}
}
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index f9ff096ad4b545c19a3668e301645aec07356032..b15ace6181a8fa0321f5c206fdc6abad7ecd6cbd 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -51,14 +51,17 @@ pub fn new_partial(config: &Configuration) -> Result node_rpc::IoHandler,
(
sc_consensus_babe::BabeBlockImport,
grandpa::LinkHalf,
sc_consensus_babe::BabeLink,
),
- grandpa::SharedVoterState,
+ (
+ grandpa::SharedVoterState,
+ Arc>,
+ ),
)
>, ServiceError> {
let (client, backend, keystore, task_manager) =
@@ -97,6 +100,7 @@ pub fn new_partial(config: &Configuration) -> Result Result Result Result Result,
+ pub network: Arc::Hash>>,
+ pub network_status_sinks: sc_service::NetworkStatusSinks,
+ pub transaction_pool: Arc>,
+}
+
/// Creates a full service from the configuration.
pub fn new_full_base(
config: Configuration,
@@ -157,19 +173,14 @@ pub fn new_full_base(
&sc_consensus_babe::BabeBlockImport,
&sc_consensus_babe::BabeLink,
)
-) -> Result<(
- TaskManager, InherentDataProviders, Arc,
- Arc::Hash>>,
- Arc>,
-), ServiceError> {
+) -> Result {
let sc_service::PartialComponents {
client, backend, mut task_manager, import_queue, keystore, select_chain, transaction_pool,
inherent_data_providers,
other: (rpc_extensions_builder, import_setup, rpc_setup),
} = new_partial(&config)?;
- let finality_proof_provider =
- GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
+ let (shared_voter_state, finality_proof_provider) = rpc_setup;
let (network, network_status_sinks, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
@@ -209,12 +220,11 @@ pub fn new_full_base(
on_demand: None,
remote_blockchain: None,
telemetry_connection_sinks: telemetry_connection_sinks.clone(),
- network_status_sinks,
+ network_status_sinks: network_status_sinks.clone(),
system_rpc_tx,
})?;
let (block_import, grandpa_link, babe_link) = import_setup;
- let shared_voter_state = rpc_setup;
(with_startup_data)(&block_import, &babe_link);
@@ -329,13 +339,16 @@ pub fn new_full_base(
}
network_starter.start_network();
- Ok((task_manager, inherent_data_providers, client, network, transaction_pool))
+ Ok(NewFullBase {
+ task_manager, inherent_data_providers, client, network, network_status_sinks,
+ transaction_pool,
+ })
}
/// Builds a new service for a full client.
pub fn new_full(config: Configuration)
-> Result {
- new_full_base(config, |_, _| ()).map(|(task_manager, _, _, _, _)| {
+ new_full_base(config, |_, _| ()).map(|NewFullBase { task_manager, .. }| {
task_manager
})
}
@@ -385,6 +398,7 @@ pub fn new_light_base(config: Configuration) -> Result<(
inherent_data_providers.clone(),
&task_manager.spawn_handle(),
config.prometheus_registry(),
+ sp_consensus::NeverCanAuthor,
)?;
let finality_proof_provider =
@@ -465,7 +479,7 @@ mod tests {
use sp_finality_tracker;
use sp_keyring::AccountKeyring;
use sc_service_test::TestNetNode;
- use crate::service::{new_full_base, new_light_base};
+ use crate::service::{new_full_base, new_light_base, NewFullBase};
use sp_runtime::traits::IdentifyAccount;
use sp_transaction_pool::{MaintainedTransactionPool, ChainEvent};
use sc_client_api::BlockBackend;
@@ -497,18 +511,19 @@ mod tests {
chain_spec,
|config| {
let mut setup_handles = None;
- let (keep_alive, inherent_data_providers, client, network, transaction_pool) =
- new_full_base(config,
- |
- block_import: &sc_consensus_babe::BabeBlockImport,
- babe_link: &sc_consensus_babe::BabeLink,
- | {
- setup_handles = Some((block_import.clone(), babe_link.clone()));
- }
- )?;
+ let NewFullBase {
+ task_manager, inherent_data_providers, client, network, transaction_pool, ..
+ } = new_full_base(config,
+ |
+ block_import: &sc_consensus_babe::BabeBlockImport,
+ babe_link: &sc_consensus_babe::BabeLink,
+ | {
+ setup_handles = Some((block_import.clone(), babe_link.clone()));
+ }
+ )?;
let node = sc_service_test::TestNetComponents::new(
- keep_alive, client, network, transaction_pool
+ task_manager, client, network, transaction_pool
);
Ok((node, (inherent_data_providers, setup_handles.unwrap())))
},
@@ -659,8 +674,9 @@ mod tests {
sc_service_test::consensus(
crate::chain_spec::tests::integration_test_config_with_two_authorities(),
|config| {
- let (keep_alive, _, client, network, transaction_pool) = new_full_base(config, |_, _| ())?;
- Ok(sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool))
+ let NewFullBase { task_manager, client, network, transaction_pool, .. }
+ = new_full_base(config,|_, _| ())?;
+ Ok(sc_service_test::TestNetComponents::new(task_manager, client, network, transaction_pool))
},
|config| {
let (keep_alive, _, client, network, transaction_pool) = new_light_base(config)?;
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index 6c6920d62be54cd8ea6df35ca9c7e78f43cf7e6e..70cf3c1fd6571c32f80cb38d73b6d7bbf62ddfe1 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-executor"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
description = "Substrate node implementation in Rust."
edition = "2018"
@@ -13,35 +13,35 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4" }
-node-primitives = { version = "2.0.0-rc5", path = "../primitives" }
-node-runtime = { version = "2.0.0-rc5", path = "../runtime" }
-sc-executor = { version = "0.8.0-rc5", path = "../../../client/executor" }
-sp-core = { version = "2.0.0-rc5", path = "../../../primitives/core" }
-sp-io = { version = "2.0.0-rc5", path = "../../../primitives/io" }
-sp-state-machine = { version = "0.8.0-rc5", path = "../../../primitives/state-machine" }
-sp-trie = { version = "2.0.0-rc5", path = "../../../primitives/trie" }
+node-primitives = { version = "2.0.0", path = "../primitives" }
+node-runtime = { version = "2.0.0", path = "../runtime" }
+sc-executor = { version = "0.8.0", path = "../../../client/executor" }
+sp-core = { version = "2.0.0", path = "../../../primitives/core" }
+sp-io = { version = "2.0.0", path = "../../../primitives/io" }
+sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+sp-trie = { version = "2.0.0", path = "../../../primitives/trie" }
trie-root = "0.16.0"
-frame-benchmarking = { version = "2.0.0-rc5", path = "../../../frame/benchmarking" }
+frame-benchmarking = { version = "2.0.0", path = "../../../frame/benchmarking" }
[dev-dependencies]
criterion = "0.3.0"
-frame-support = { version = "2.0.0-rc5", path = "../../../frame/support" }
-frame-system = { version = "2.0.0-rc5", path = "../../../frame/system" }
-node-testing = { version = "2.0.0-rc5", path = "../testing" }
-pallet-balances = { version = "2.0.0-rc5", path = "../../../frame/balances" }
-pallet-contracts = { version = "2.0.0-rc5", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "2.0.0-rc5", path = "../../../frame/grandpa" }
-pallet-im-online = { version = "2.0.0-rc5", path = "../../../frame/im-online" }
-pallet-indices = { version = "2.0.0-rc5", path = "../../../frame/indices" }
-pallet-session = { version = "2.0.0-rc5", path = "../../../frame/session" }
-pallet-timestamp = { version = "2.0.0-rc5", path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "2.0.0-rc5", path = "../../../frame/transaction-payment" }
-pallet-treasury = { version = "2.0.0-rc5", path = "../../../frame/treasury" }
-sp-application-crypto = { version = "2.0.0-rc5", path = "../../../primitives/application-crypto" }
-sp-runtime = { version = "2.0.0-rc5", path = "../../../primitives/runtime" }
-sp-externalities = { version = "0.8.0-rc5", path = "../../../primitives/externalities" }
-substrate-test-client = { version = "2.0.0-rc5", path = "../../../test-utils/client" }
-wabt = "0.9.2"
+frame-support = { version = "2.0.0", path = "../../../frame/support" }
+frame-system = { version = "2.0.0", path = "../../../frame/system" }
+node-testing = { version = "2.0.0", path = "../testing" }
+pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
+pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
+pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
+pallet-im-online = { version = "2.0.0", path = "../../../frame/im-online" }
+pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
+pallet-session = { version = "2.0.0", path = "../../../frame/session" }
+pallet-timestamp = { version = "2.0.0", path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "2.0.0", path = "../../../frame/transaction-payment" }
+pallet-treasury = { version = "2.0.0", path = "../../../frame/treasury" }
+sp-application-crypto = { version = "2.0.0", path = "../../../primitives/application-crypto" }
+sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+sp-externalities = { version = "0.8.0", path = "../../../primitives/externalities" }
+substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
+wat = "1.0"
[features]
wasmtime = [
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index e7744200bccd64fb7bcf44d595e918a7d6c8eab8..723e3a7e4ba62fac313614d0dd2ee400cc9ad526 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -36,7 +36,7 @@ use node_runtime::{
constants::currency::*,
};
use node_primitives::{Balance, Hash};
-use wabt;
+use wat;
use node_testing::keyring::*;
pub mod common;
@@ -164,7 +164,7 @@ fn panic_execution_with_foreign_code_gives_error() {
let mut t = new_test_ext(bloaty_code_unwrap(), false);
t.insert(
>::hashed_key_for(alice()),
- (69u128, 0u8, 0u128, 0u128, 0u128).encode()
+ (69u128, 0u32, 0u128, 0u128, 0u128).encode()
);
t.insert(>::hashed_key().to_vec(), 69_u128.encode());
t.insert(>::hashed_key_for(0), vec![0u8; 32]);
@@ -193,7 +193,7 @@ fn bad_extrinsic_with_native_equivalent_code_gives_error() {
let mut t = new_test_ext(compact_code_unwrap(), false);
t.insert(
>::hashed_key_for(alice()),
- (0u32, 0u8, 69u128, 0u128, 0u128, 0u128).encode()
+ (0u32, 0u32, 69u128, 0u128, 0u128, 0u128).encode()
);
t.insert(>::hashed_key().to_vec(), 69_u128.encode());
t.insert(>::hashed_key_for(0), vec![0u8; 32]);
@@ -222,11 +222,11 @@ fn successful_execution_with_native_equivalent_code_gives_ok() {
let mut t = new_test_ext(compact_code_unwrap(), false);
t.insert(
>::hashed_key_for(alice()),
- (0u32, 0u8, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+ (0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
);
t.insert(
>::hashed_key_for(bob()),
- (0u32, 0u8, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+ (0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
);
t.insert(
>::hashed_key().to_vec(),
@@ -265,11 +265,11 @@ fn successful_execution_with_foreign_code_gives_ok() {
let mut t = new_test_ext(bloaty_code_unwrap(), false);
t.insert(
>::hashed_key_for(alice()),
- (0u32, 0u8, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+ (0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
);
t.insert(
>::hashed_key_for(bob()),
- (0u32, 0u8, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+ (0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
);
t.insert(
>::hashed_key().to_vec(),
@@ -580,7 +580,7 @@ const CODE_TRANSFER: &str = r#"
#[test]
fn deploying_wasm_contract_should_work() {
- let transfer_code = wabt::wat2wasm(CODE_TRANSFER).unwrap();
+ let transfer_code = wat::parse_str(CODE_TRANSFER).unwrap();
let transfer_ch = ::Hashing::hash(&transfer_code);
let addr = ::DetermineContractAddress::contract_address_for(
@@ -702,7 +702,7 @@ fn panic_execution_gives_error() {
let mut t = new_test_ext(bloaty_code_unwrap(), false);
t.insert(
>::hashed_key_for(alice()),
- (0u32, 0u8, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+ (0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
);
t.insert(>::hashed_key().to_vec(), 0_u128.encode());
t.insert(>::hashed_key_for(0), vec![0u8; 32]);
@@ -731,11 +731,11 @@ fn successful_execution_gives_ok() {
let mut t = new_test_ext(compact_code_unwrap(), false);
t.insert(
>::hashed_key_for(alice()),
- (0u32, 0u8, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+ (0u32, 0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
);
t.insert(
>::hashed_key_for(bob()),
- (0u32, 0u8, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
+ (0u32, 0u32, 0 * DOLLARS, 0u128, 0u128, 0u128).encode()
);
t.insert(
>::hashed_key().to_vec(),
diff --git a/bin/node/executor/tests/fees.rs b/bin/node/executor/tests/fees.rs
index b39cf344e6034af0608f848b5ae87722bee5fc28..d04af1d827009f51340daeacc9e055ab6ec5e00e 100644
--- a/bin/node/executor/tests/fees.rs
+++ b/bin/node/executor/tests/fees.rs
@@ -133,11 +133,11 @@ fn transaction_fee_is_correct() {
let mut t = new_test_ext(compact_code_unwrap(), false);
t.insert(
>::hashed_key_for(alice()),
- (0u32, 0u8, 100 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
+ (0u32, 0u32, 100 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
);
t.insert(
>::hashed_key_for(bob()),
- (0u32, 0u8, 10 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
+ (0u32, 0u32, 10 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
);
t.insert(
>::hashed_key().to_vec(),
diff --git a/bin/node/executor/tests/submit_transaction.rs b/bin/node/executor/tests/submit_transaction.rs
index 64c2deedac788ea8681ea54c93ec09125d8e1684..af74c0c0b7c299d521d519230f215b9dd5ac031f 100644
--- a/bin/node/executor/tests/submit_transaction.rs
+++ b/bin/node/executor/tests/submit_transaction.rs
@@ -224,7 +224,7 @@ fn submitted_transaction_should_be_valid() {
let author = extrinsic.signature.clone().unwrap().0;
let address = Indices::lookup(author).unwrap();
let data = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() };
- let account = frame_system::AccountInfo { nonce: 0u32, refcount: 0u8, data };
+ let account = frame_system::AccountInfo { nonce: 0, refcount: 0, data };
>::insert(&address, account);
// check validity
diff --git a/bin/node/inspect/Cargo.toml b/bin/node/inspect/Cargo.toml
index b7f828a5f1e569ae31ecf20e5e6170fe50a023fb..3686ddf27669bfa10a54eab84437c7ae813a4b96 100644
--- a/bin/node/inspect/Cargo.toml
+++ b/bin/node/inspect/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-inspect"
-version = "0.8.0-rc5"
+version = "0.8.0"
authors = ["Parity Technologies "]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "1.3.4" }
derive_more = "0.99"
log = "0.4.8"
-sc-cli = { version = "0.8.0-rc5", path = "../../../client/cli" }
-sc-client-api = { version = "2.0.0-rc5", path = "../../../client/api" }
-sc-service = { version = "0.8.0-rc5", default-features = false, path = "../../../client/service" }
-sp-blockchain = { version = "2.0.0-rc5", path = "../../../primitives/blockchain" }
-sp-core = { version = "2.0.0-rc5", path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0-rc5", path = "../../../primitives/runtime" }
+sc-cli = { version = "0.8.0", path = "../../../client/cli" }
+sc-client-api = { version = "2.0.0", path = "../../../client/api" }
+sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
+sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
+sp-core = { version = "2.0.0", path = "../../../primitives/core" }
+sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
structopt = "0.3.8"
diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml
index 6ff8a05d614326907e98d971e9c9590a4e4dfc09..305764970c149eb54b36939fa6b57e4d59e505a6 100644
--- a/bin/node/primitives/Cargo.toml
+++ b/bin/node/primitives/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-primitives"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
edition = "2018"
license = "Apache-2.0"
@@ -12,13 +12,13 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
-frame-system = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/system" }
-sp-application-crypto = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/application-crypto" }
-sp-core = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/core" }
-sp-runtime = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/runtime" }
+frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
+sp-application-crypto = { version = "2.0.0", default-features = false, path = "../../../primitives/application-crypto" }
+sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
+sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
[dev-dependencies]
-sp-serializer = { version = "2.0.0-rc5", path = "../../../primitives/serializer" }
+sp-serializer = { version = "2.0.0", path = "../../../primitives/serializer" }
pretty_assertions = "0.6.1"
[features]
diff --git a/bin/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml
index d1a76f2ab3754425ebde98508d18745f7155ef55..9f358e901dafa1917c142b4533bbe49436d6537a 100644
--- a/bin/node/rpc-client/Cargo.toml
+++ b/bin/node/rpc-client/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-rpc-client"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
edition = "2018"
license = "Apache-2.0"
@@ -11,10 +11,10 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-env_logger = "0.7.0"
futures = "0.1.29"
hyper = "0.12.35"
-jsonrpc-core-client = { version = "14.2.0", default-features = false, features = ["http"] }
+jsonrpc-core-client = { version = "15.0.0", default-features = false, features = ["http"] }
log = "0.4.8"
-node-primitives = { version = "2.0.0-rc5", path = "../primitives" }
-sc-rpc = { version = "2.0.0-rc5", path = "../../../client/rpc" }
+node-primitives = { version = "2.0.0", path = "../primitives" }
+sp-tracing = { version = "2.0.0", path = "../../../primitives/tracing" }
+sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
diff --git a/bin/node/rpc-client/src/main.rs b/bin/node/rpc-client/src/main.rs
index eadd1c8d472476b6db57570d08a0233d36bea45d..31f1efa28ccd0684c363f577d491ce6e98b34e7f 100644
--- a/bin/node/rpc-client/src/main.rs
+++ b/bin/node/rpc-client/src/main.rs
@@ -35,7 +35,7 @@ use jsonrpc_core_client::{
};
fn main() {
- env_logger::init();
+ sp_tracing::try_init_simple();
rt::run(rt::lazy(|| {
let uri = "http://localhost:9933";
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
index ee11ff4ac8c4956ec6326148394b5acdae9b1e9f..d80b686b5ac932b4e02230d54892921c2e36aba6 100644
--- a/bin/node/rpc/Cargo.toml
+++ b/bin/node/rpc/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-rpc"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
edition = "2018"
license = "Apache-2.0"
@@ -11,25 +11,25 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-jsonrpc-core = "14.2.0"
-jsonrpc-pubsub = "14.2.0"
-node-primitives = { version = "2.0.0-rc5", path = "../primitives" }
-node-runtime = { version = "2.0.0-rc5", path = "../runtime" }
-pallet-contracts-rpc = { version = "0.8.0-rc5", path = "../../../frame/contracts/rpc/" }
-pallet-transaction-payment-rpc = { version = "2.0.0-rc5", path = "../../../frame/transaction-payment/rpc/" }
-sc-client-api = { version = "2.0.0-rc5", path = "../../../client/api" }
-sc-consensus-babe = { version = "0.8.0-rc5", path = "../../../client/consensus/babe" }
-sc-consensus-babe-rpc = { version = "0.8.0-rc5", path = "../../../client/consensus/babe/rpc" }
-sc-consensus-epochs = { version = "0.8.0-rc5", path = "../../../client/consensus/epochs" }
-sc-finality-grandpa = { version = "0.8.0-rc5", path = "../../../client/finality-grandpa" }
-sc-finality-grandpa-rpc = { version = "0.8.0-rc5", path = "../../../client/finality-grandpa/rpc" }
-sc-keystore = { version = "2.0.0-rc5", path = "../../../client/keystore" }
-sc-rpc-api = { version = "0.8.0-rc5", path = "../../../client/rpc-api" }
-sc-rpc = { version = "2.0.0-rc5", path = "../../../client/rpc" }
-sp-api = { version = "2.0.0-rc5", path = "../../../primitives/api" }
-sp-block-builder = { version = "2.0.0-rc5", path = "../../../primitives/block-builder" }
-sp-blockchain = { version = "2.0.0-rc5", path = "../../../primitives/blockchain" }
-sp-consensus = { version = "0.8.0-rc5", path = "../../../primitives/consensus/common" }
-sp-consensus-babe = { version = "0.8.0-rc5", path = "../../../primitives/consensus/babe" }
-sp-transaction-pool = { version = "2.0.0-rc5", path = "../../../primitives/transaction-pool" }
-substrate-frame-rpc-system = { version = "2.0.0-rc5", path = "../../../utils/frame/rpc/system" }
+jsonrpc-core = "15.0.0"
+node-primitives = { version = "2.0.0", path = "../primitives" }
+node-runtime = { version = "2.0.0", path = "../runtime" }
+pallet-contracts-rpc = { version = "0.8.0", path = "../../../frame/contracts/rpc/" }
+pallet-transaction-payment-rpc = { version = "2.0.0", path = "../../../frame/transaction-payment/rpc/" }
+sc-client-api = { version = "2.0.0", path = "../../../client/api" }
+sc-consensus-babe = { version = "0.8.0", path = "../../../client/consensus/babe" }
+sc-consensus-babe-rpc = { version = "0.8.0", path = "../../../client/consensus/babe/rpc" }
+sc-consensus-epochs = { version = "0.8.0", path = "../../../client/consensus/epochs" }
+sc-finality-grandpa = { version = "0.8.0", path = "../../../client/finality-grandpa" }
+sc-finality-grandpa-rpc = { version = "0.8.0", path = "../../../client/finality-grandpa/rpc" }
+sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
+sc-rpc-api = { version = "0.8.0", path = "../../../client/rpc-api" }
+sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
+sp-api = { version = "2.0.0", path = "../../../primitives/api" }
+sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
+sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
+sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sp-consensus-babe = { version = "0.8.0", path = "../../../primitives/consensus/babe" }
+sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }
+substrate-frame-rpc-system = { version = "2.0.0", path = "../../../utils/frame/rpc/system" }
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index a20fb03ebe1e6be0d6c663885971336ce6d8c0f9..55a7adf612119a28d727f9c62e240a9beaed965c 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -32,12 +32,13 @@
use std::sync::Arc;
-use jsonrpc_pubsub::manager::SubscriptionManager;
use node_primitives::{Block, BlockNumber, AccountId, Index, Balance, Hash};
use sc_consensus_babe::{Config, Epoch};
use sc_consensus_babe_rpc::BabeRpcHandler;
use sc_consensus_epochs::SharedEpochChanges;
-use sc_finality_grandpa::{SharedVoterState, SharedAuthoritySet, GrandpaJustificationStream};
+use sc_finality_grandpa::{
+ SharedVoterState, SharedAuthoritySet, FinalityProofProvider, GrandpaJustificationStream
+};
use sc_finality_grandpa_rpc::GrandpaRpcHandler;
use sc_keystore::KeyStorePtr;
pub use sc_rpc_api::DenyUnsafe;
@@ -46,6 +47,7 @@ use sp_block_builder::BlockBuilder;
use sp_blockchain::{Error as BlockChainError, HeaderMetadata, HeaderBackend};
use sp_consensus::SelectChain;
use sp_consensus_babe::BabeApi;
+use sc_rpc::SubscriptionTaskExecutor;
use sp_transaction_pool::TransactionPool;
/// Light client extra dependencies.
@@ -71,19 +73,21 @@ pub struct BabeDeps {
}
/// Extra dependencies for GRANDPA
-pub struct GrandpaDeps {
+pub struct GrandpaDeps {
/// Voting round info.
pub shared_voter_state: SharedVoterState,
/// Authority set info.
pub shared_authority_set: SharedAuthoritySet,
/// Receives notifications about justification events from Grandpa.
pub justification_stream: GrandpaJustificationStream,
- /// Subscription manager to keep track of pubsub subscribers.
- pub subscriptions: SubscriptionManager,
+ /// Executor to drive the subscription manager in the Grandpa RPC handler.
+ pub subscription_executor: SubscriptionTaskExecutor,
+ /// Finality proof provider.
+ pub finality_provider: Arc>,
}
/// Full client dependencies.
-pub struct FullDeps {
+pub struct FullDeps {
/// The client instance to use.
pub client: Arc,
/// Transaction pool instance.
@@ -95,15 +99,15 @@ pub struct FullDeps {
/// BABE specific dependencies.
pub babe: BabeDeps,
/// GRANDPA specific dependencies.
- pub grandpa: GrandpaDeps,
+ pub grandpa: GrandpaDeps,
}
/// A IO handler that uses all Full RPC extensions.
pub type IoHandler = jsonrpc_core::IoHandler;
/// Instantiate all Full RPC extensions.
-pub fn create_full(
- deps: FullDeps,
+pub fn create_full(
+ deps: FullDeps,
) -> jsonrpc_core::IoHandler where
C: ProvideRuntimeApi,
C: HeaderBackend + HeaderMetadata + 'static,
@@ -115,6 +119,8 @@ pub fn create_full(
C::Api: BlockBuilder,
P: TransactionPool + 'static,
SC: SelectChain +'static,
+ B: sc_client_api::Backend + Send + Sync + 'static,
+ B::State: sc_client_api::backend::StateBackend>,
{
use substrate_frame_rpc_system::{FullSystem, SystemApi};
use pallet_contracts_rpc::{Contracts, ContractsApi};
@@ -139,7 +145,8 @@ pub fn create_full(
shared_voter_state,
shared_authority_set,
justification_stream,
- subscriptions,
+ subscription_executor,
+ finality_provider,
} = grandpa;
io.extend_with(
@@ -172,7 +179,8 @@ pub fn create_full(
shared_authority_set,
shared_voter_state,
justification_stream,
- subscriptions,
+ subscription_executor,
+ finality_provider,
)
)
);
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 35ed7400459f297f2b64562bb654cffe56c24b93..47a26c92493d1b03cf6adedd5f06a6076b76eb1f 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-runtime"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
edition = "2018"
build = "build.rs"
@@ -18,76 +18,77 @@ codec = { package = "parity-scale-codec", version = "1.3.4", default-features =
integer-sqrt = { version = "0.1.2" }
serde = { version = "1.0.102", optional = true }
static_assertions = "1.1.0"
-hex-literal = { version = "0.2.1", optional = true }
+hex-literal = { version = "0.3.1", optional = true }
# primitives
-sp-authority-discovery = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/authority-discovery" }
-sp-consensus-babe = { version = "0.8.0-rc5", default-features = false, path = "../../../primitives/consensus/babe" }
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "2.0.0-rc5"}
-sp-inherents = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/inherents" }
-node-primitives = { version = "2.0.0-rc5", default-features = false, path = "../primitives" }
-sp-offchain = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/offchain" }
-sp-core = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/core" }
-sp-std = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/std" }
-sp-api = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/api" }
-sp-runtime = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/runtime" }
-sp-staking = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/staking" }
-sp-keyring = { version = "2.0.0-rc5", optional = true, path = "../../../primitives/keyring" }
-sp-session = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/session" }
-sp-transaction-pool = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/transaction-pool" }
-sp-version = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/version" }
+sp-authority-discovery = { version = "2.0.0", default-features = false, path = "../../../primitives/authority-discovery" }
+sp-consensus-babe = { version = "0.8.0", default-features = false, path = "../../../primitives/consensus/babe" }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "2.0.0"}
+sp-inherents = { version = "2.0.0", default-features = false, path = "../../../primitives/inherents" }
+node-primitives = { version = "2.0.0", default-features = false, path = "../primitives" }
+sp-offchain = { version = "2.0.0", default-features = false, path = "../../../primitives/offchain" }
+sp-core = { version = "2.0.0", default-features = false, path = "../../../primitives/core" }
+sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
+sp-api = { version = "2.0.0", default-features = false, path = "../../../primitives/api" }
+sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-staking = { version = "2.0.0", default-features = false, path = "../../../primitives/staking" }
+sp-keyring = { version = "2.0.0", optional = true, path = "../../../primitives/keyring" }
+sp-session = { version = "2.0.0", default-features = false, path = "../../../primitives/session" }
+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" }
# frame dependencies
-frame-executive = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/executive" }
-frame-benchmarking = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/benchmarking", optional = true }
-frame-support = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/support" }
-frame-system = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/system" }
-frame-system-benchmarking = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
-frame-system-rpc-runtime-api = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
-pallet-authority-discovery = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/authority-discovery" }
-pallet-authorship = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/authorship" }
-pallet-babe = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/babe" }
-pallet-balances = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/balances" }
-pallet-collective = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/collective" }
-pallet-contracts = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/contracts" }
-pallet-contracts-primitives = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/contracts/common/" }
-pallet-contracts-rpc-runtime-api = { version = "0.8.0-rc5", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
-pallet-democracy = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/democracy" }
-pallet-elections-phragmen = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/elections-phragmen" }
-pallet-finality-tracker = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/finality-tracker" }
-pallet-grandpa = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/grandpa" }
-pallet-im-online = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/im-online" }
-pallet-indices = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/indices" }
-pallet-identity = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/identity" }
-pallet-membership = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/membership" }
-pallet-multisig = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/multisig" }
-pallet-offences = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/offences" }
-pallet-offences-benchmarking = { version = "2.0.0-rc5", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
-pallet-proxy = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/proxy" }
-pallet-randomness-collective-flip = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/randomness-collective-flip" }
-pallet-recovery = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/recovery" }
-pallet-session = { version = "2.0.0-rc5", features = ["historical"], path = "../../../frame/session", default-features = false }
-pallet-session-benchmarking = { version = "2.0.0-rc5", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
-pallet-staking = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/staking" }
-pallet-staking-reward-curve = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/staking/reward-curve" }
-pallet-scheduler = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/scheduler" }
-pallet-society = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/society" }
-pallet-sudo = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/sudo" }
-pallet-timestamp = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/timestamp" }
-pallet-treasury = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/treasury" }
-pallet-utility = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/utility" }
-pallet-transaction-payment = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/transaction-payment" }
-pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
-pallet-vesting = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/vesting" }
+frame-executive = { version = "2.0.0", default-features = false, path = "../../../frame/executive" }
+frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/benchmarking", optional = true }
+frame-support = { version = "2.0.0", default-features = false, path = "../../../frame/support" }
+frame-system = { version = "2.0.0", default-features = false, path = "../../../frame/system" }
+frame-system-benchmarking = { version = "2.0.0", default-features = false, path = "../../../frame/system/benchmarking", optional = true }
+frame-system-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
+pallet-authority-discovery = { version = "2.0.0", default-features = false, path = "../../../frame/authority-discovery" }
+pallet-authorship = { version = "2.0.0", default-features = false, path = "../../../frame/authorship" }
+pallet-babe = { version = "2.0.0", default-features = false, path = "../../../frame/babe" }
+pallet-balances = { version = "2.0.0", default-features = false, path = "../../../frame/balances" }
+pallet-collective = { version = "2.0.0", default-features = false, path = "../../../frame/collective" }
+pallet-contracts = { version = "2.0.0", default-features = false, path = "../../../frame/contracts" }
+pallet-contracts-primitives = { version = "2.0.0", default-features = false, path = "../../../frame/contracts/common/" }
+pallet-contracts-rpc-runtime-api = { version = "0.8.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
+pallet-democracy = { version = "2.0.0", default-features = false, path = "../../../frame/democracy" }
+pallet-elections-phragmen = { version = "2.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
+pallet-finality-tracker = { version = "2.0.0", default-features = false, path = "../../../frame/finality-tracker" }
+pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../../frame/grandpa" }
+pallet-im-online = { version = "2.0.0", default-features = false, path = "../../../frame/im-online" }
+pallet-indices = { version = "2.0.0", default-features = false, path = "../../../frame/indices" }
+pallet-identity = { version = "2.0.0", default-features = false, path = "../../../frame/identity" }
+pallet-membership = { version = "2.0.0", default-features = false, path = "../../../frame/membership" }
+pallet-multisig = { version = "2.0.0", default-features = false, path = "../../../frame/multisig" }
+pallet-offences = { version = "2.0.0", default-features = false, path = "../../../frame/offences" }
+pallet-offences-benchmarking = { version = "2.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
+pallet-proxy = { version = "2.0.0", default-features = false, path = "../../../frame/proxy" }
+pallet-randomness-collective-flip = { version = "2.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
+pallet-recovery = { version = "2.0.0", default-features = false, path = "../../../frame/recovery" }
+pallet-session = { version = "2.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
+pallet-session-benchmarking = { version = "2.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
+pallet-staking = { version = "2.0.0", default-features = false, path = "../../../frame/staking" }
+pallet-staking-reward-curve = { version = "2.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
+pallet-scheduler = { version = "2.0.0", default-features = false, path = "../../../frame/scheduler" }
+pallet-society = { version = "2.0.0", default-features = false, path = "../../../frame/society" }
+pallet-sudo = { version = "2.0.0", default-features = false, path = "../../../frame/sudo" }
+pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
+pallet-treasury = { version = "2.0.0", default-features = false, path = "../../../frame/treasury" }
+pallet-utility = { version = "2.0.0", default-features = false, path = "../../../frame/utility" }
+pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment" }
+pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
+pallet-vesting = { version = "2.0.0", default-features = false, path = "../../../frame/vesting" }
[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
[dev-dependencies]
-sp-io = { version = "2.0.0-rc5", path = "../../../primitives/io" }
+sp-io = { version = "2.0.0", path = "../../../primitives/io" }
[features]
default = ["std"]
+with-tracing = [ "frame-executive/with-tracing" ]
std = [
"sp-authority-discovery/std",
"pallet-authority-discovery/std",
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index acc1b072818345d0c90d17ff963ed0c63c3312ff..4d2f11d2f9206a1b6e8f5fe05f8f96ab6459958a 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -83,6 +83,7 @@ use impls::{CurrencyToVoteHandler, Author};
/// Constant values used within the runtime.
pub mod constants;
use constants::{time::*, currency::*};
+use sp_runtime::generic::Era;
/// Weights for pallets used in the runtime.
mod weights;
@@ -108,7 +109,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// and set impl_version to 0. If only runtime
// implementation changes and behavior does not, then leave spec_version as
// is and increment impl_version.
- spec_version: 257,
+ spec_version: 259,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
@@ -178,17 +179,17 @@ impl frame_system::Trait for Runtime {
type MaximumBlockLength = MaximumBlockLength;
type AvailableBlockRatio = AvailableBlockRatio;
type Version = Version;
- type ModuleToIndex = ModuleToIndex;
+ type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData;
type OnNewAccount = ();
type OnKilledAccount = ();
- type SystemWeightInfo = ();
+ type SystemWeightInfo = weights::frame_system::WeightInfo;
}
impl pallet_utility::Trait for Runtime {
type Event = Event;
type Call = Call;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_utility::WeightInfo;
}
parameter_types! {
@@ -206,7 +207,7 @@ impl pallet_multisig::Trait for Runtime {
type DepositBase = DepositBase;
type DepositFactor = DepositFactor;
type MaxSignatories = MaxSignatories;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_multisig::WeightInfo;
}
parameter_types! {
@@ -215,6 +216,9 @@ parameter_types! {
// Additional storage item size of 33 bytes.
pub const ProxyDepositFactor: Balance = deposit(0, 33);
pub const MaxProxies: u16 = 32;
+ pub const AnnouncementDepositBase: Balance = deposit(1, 8);
+ pub const AnnouncementDepositFactor: Balance = deposit(0, 66);
+ pub const MaxPending: u16 = 32;
}
/// The type used to represent the kinds of proxying allowed.
@@ -230,13 +234,20 @@ impl InstanceFilter for ProxyType {
fn filter(&self, c: &Call) -> bool {
match self {
ProxyType::Any => true,
- ProxyType::NonTransfer => !matches!(c,
- Call::Balances(..) | Call::Vesting(pallet_vesting::Call::vested_transfer(..))
- | Call::Indices(pallet_indices::Call::transfer(..))
+ ProxyType::NonTransfer => !matches!(
+ c,
+ Call::Balances(..) |
+ Call::Vesting(pallet_vesting::Call::vested_transfer(..)) |
+ Call::Indices(pallet_indices::Call::transfer(..))
),
- ProxyType::Governance => matches!(c,
- Call::Democracy(..) | Call::Council(..) | Call::Society(..)
- | Call::TechnicalCommittee(..) | Call::Elections(..) | Call::Treasury(..)
+ ProxyType::Governance => matches!(
+ c,
+ Call::Democracy(..) |
+ Call::Council(..) |
+ Call::Society(..) |
+ Call::TechnicalCommittee(..) |
+ Call::Elections(..) |
+ Call::Treasury(..)
),
ProxyType::Staking => matches!(c, Call::Staking(..)),
}
@@ -260,11 +271,16 @@ impl pallet_proxy::Trait for Runtime {
type ProxyDepositBase = ProxyDepositBase;
type ProxyDepositFactor = ProxyDepositFactor;
type MaxProxies = MaxProxies;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_proxy::WeightInfo;
+ type MaxPending = MaxPending;
+ type CallHasher = BlakeTwo256;
+ type AnnouncementDepositBase = AnnouncementDepositBase;
+ type AnnouncementDepositFactor = AnnouncementDepositFactor;
}
parameter_types! {
pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * MaximumBlockWeight::get();
+ pub const MaxScheduledPerBlock: u32 = 50;
}
impl pallet_scheduler::Trait for Runtime {
@@ -274,7 +290,8 @@ impl pallet_scheduler::Trait for Runtime {
type Call = Call;
type MaximumWeight = MaximumSchedulerWeight;
type ScheduleOrigin = EnsureRoot;
- type WeightInfo = ();
+ type MaxScheduledPerBlock = MaxScheduledPerBlock;
+ type WeightInfo = weights::pallet_scheduler::WeightInfo;
}
parameter_types! {
@@ -301,6 +318,8 @@ impl pallet_babe::Trait for Runtime {
type HandleEquivocation =
pallet_babe::EquivocationHandler;
+
+ type WeightInfo = ();
}
parameter_types! {
@@ -312,14 +331,18 @@ impl pallet_indices::Trait for Runtime {
type Currency = Balances;
type Deposit = IndexDeposit;
type Event = Event;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_indices::WeightInfo;
}
parameter_types! {
pub const ExistentialDeposit: Balance = 1 * DOLLARS;
+ // For weight estimation, we assume that the most locks on an individual account will be 50.
+ // This number may need to be adjusted in the future if this assumption no longer holds true.
+ pub const MaxLocks: u32 = 50;
}
impl pallet_balances::Trait for Runtime {
+ type MaxLocks = MaxLocks;
type Balance = Balance;
type DustRemoval = ();
type Event = Event;
@@ -352,7 +375,7 @@ impl pallet_timestamp::Trait for Runtime {
type Moment = Moment;
type OnTimestampSet = Babe;
type MinimumPeriod = MinimumPeriod;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_timestamp::WeightInfo;
}
parameter_types! {
@@ -389,7 +412,7 @@ impl pallet_session::Trait for Runtime {
type SessionHandler = ::KeyTypeIdProviders;
type Keys = SessionKeys;
type DisabledValidatorsThreshold = DisabledValidatorsThreshold;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_session::WeightInfo;
}
impl pallet_session::historical::Trait for Runtime {
@@ -446,7 +469,7 @@ impl pallet_staking::Trait for Runtime {
type MinSolutionScoreBump = MinSolutionScoreBump;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type UnsignedPriority = StakingUnsignedPriority;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_staking::WeightInfo;
}
parameter_types! {
@@ -501,6 +524,7 @@ impl pallet_democracy::Trait for Runtime {
parameter_types! {
pub const CouncilMotionDuration: BlockNumber = 5 * DAYS;
pub const CouncilMaxProposals: u32 = 100;
+ pub const CouncilMaxMembers: u32 = 100;
}
type CouncilCollective = pallet_collective::Instance1;
@@ -510,7 +534,9 @@ impl pallet_collective::Trait for Runtime {
type Event = Event;
type MotionDuration = CouncilMotionDuration;
type MaxProposals = CouncilMaxProposals;
- type WeightInfo = ();
+ type MaxMembers = CouncilMaxMembers;
+ type DefaultVote = pallet_collective::PrimeDefaultVote;
+ type WeightInfo = weights::pallet_collective::WeightInfo;
}
parameter_types! {
@@ -522,8 +548,8 @@ parameter_types! {
pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
}
-// Make sure that there are no more than `MAX_MEMBERS` members elected via elections-phragmen.
-const_assert!(DesiredMembers::get() <= pallet_collective::MAX_MEMBERS);
+// Make sure that there are no more than `MaxMembers` members elected via elections-phragmen.
+const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get());
impl pallet_elections_phragmen::Trait for Runtime {
type Event = Event;
@@ -542,12 +568,13 @@ impl pallet_elections_phragmen::Trait for Runtime {
type DesiredMembers = DesiredMembers;
type DesiredRunnersUp = DesiredRunnersUp;
type TermDuration = TermDuration;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_elections_phragmen::WeightInfo;
}
parameter_types! {
pub const TechnicalMotionDuration: BlockNumber = 5 * DAYS;
pub const TechnicalMaxProposals: u32 = 100;
+ pub const TechnicalMaxMembers: u32 = 100;
}
type TechnicalCollective = pallet_collective::Instance2;
@@ -557,7 +584,9 @@ impl pallet_collective::Trait for Runtime {
type Event = Event;
type MotionDuration = TechnicalMotionDuration;
type MaxProposals = TechnicalMaxProposals;
- type WeightInfo = ();
+ type MaxMembers = TechnicalMaxMembers;
+ type DefaultVote = pallet_collective::PrimeDefaultVote;
+ type WeightInfo = weights::pallet_collective::WeightInfo;
}
type EnsureRootOrHalfCouncil = EnsureOneOf<
@@ -584,8 +613,14 @@ parameter_types! {
pub const TipCountdown: BlockNumber = 1 * DAYS;
pub const TipFindersFee: Percent = Percent::from_percent(20);
pub const TipReportDepositBase: Balance = 1 * DOLLARS;
- pub const TipReportDepositPerByte: Balance = 1 * CENTS;
+ pub const DataDepositPerByte: Balance = 1 * CENTS;
+ pub const BountyDepositBase: Balance = 1 * DOLLARS;
+ pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;
pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
+ pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;
+ pub const MaximumReasonLength: u32 = 16384;
+ pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
+ pub const BountyValueMinimum: Balance = 5 * DOLLARS;
}
impl pallet_treasury::Trait for Runtime {
@@ -605,15 +640,21 @@ impl pallet_treasury::Trait for Runtime {
type TipCountdown = TipCountdown;
type TipFindersFee = TipFindersFee;
type TipReportDepositBase = TipReportDepositBase;
- type TipReportDepositPerByte = TipReportDepositPerByte;
+ type DataDepositPerByte = DataDepositPerByte;
type Event = Event;
- type ProposalRejection = ();
+ type OnSlash = ();
type ProposalBond = ProposalBond;
type ProposalBondMinimum = ProposalBondMinimum;
type SpendPeriod = SpendPeriod;
type Burn = Burn;
+ type BountyDepositBase = BountyDepositBase;
+ type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
+ type BountyUpdatePeriod = BountyUpdatePeriod;
+ type BountyCuratorDeposit = BountyCuratorDeposit;
+ type BountyValueMinimum = BountyValueMinimum;
+ type MaximumReasonLength = MaximumReasonLength;
type BurnDestination = ();
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_treasury::WeightInfo;
}
parameter_types! {
@@ -654,9 +695,9 @@ parameter_types! {
pub const StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2;
}
-
-impl frame_system::offchain::CreateSignedTransaction for Runtime where
- Call: From,
+impl frame_system::offchain::CreateSignedTransaction for Runtime
+ where
+ Call: From,
{
fn create_transaction>(
call: Call,
@@ -664,6 +705,7 @@ impl frame_system::offchain::CreateSignedTransaction for R
account: AccountId,
nonce: Index,
) -> Option<(Call, ::SignaturePayload)> {
+ let tip = 0;
// take the biggest period possible.
let period = BlockHashCount::get()
.checked_next_power_of_two()
@@ -674,22 +716,25 @@ impl frame_system::offchain::CreateSignedTransaction for R
// The `System::block_number` is initialized with `n+1`,
// so the actual block number is `n`.
.saturating_sub(1);
- let tip = 0;
- let extra: SignedExtra = (
+ let era = Era::mortal(period, current_block);
+ let extra = (
frame_system::CheckSpecVersion::::new(),
frame_system::CheckTxVersion::::new(),
frame_system::CheckGenesis::::new(),
- frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)),
+ frame_system::CheckEra::::from(era),
frame_system::CheckNonce::::from(nonce),
frame_system::CheckWeight::::new(),
pallet_transaction_payment::ChargeTransactionPayment::::from(tip),
);
- let raw_payload = SignedPayload::new(call, extra).map_err(|e| {
- debug::warn!("Unable to create signed payload: {:?}", e);
- }).ok()?;
- let signature = raw_payload.using_encoded(|payload| {
- C::sign(payload, public)
- })?;
+ let raw_payload = SignedPayload::new(call, extra)
+ .map_err(|e| {
+ debug::warn!("Unable to create signed payload: {:?}", e);
+ })
+ .ok()?;
+ let signature = raw_payload
+ .using_encoded(|payload| {
+ C::sign(payload, public)
+ })?;
let address = Indices::unlookup(account);
let (call, extra, _) = raw_payload.deconstruct();
Some((call, (address, signature.into(), extra)))
@@ -714,7 +759,7 @@ impl pallet_im_online::Trait for Runtime {
type SessionDuration = SessionDuration;
type ReportUnresponsiveness = Offences;
type UnsignedPriority = ImOnlineUnsignedPriority;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_im_online::WeightInfo;
}
parameter_types! {
@@ -726,7 +771,6 @@ impl pallet_offences::Trait for Runtime {
type IdentificationTuple = pallet_session::historical::IdentificationTuple;
type OnOffenceHandler = Staking;
type WeightSoftLimit = OffencesWeightSoftLimit;
- type WeightInfo = ();
}
impl pallet_authority_discovery::Trait for Runtime {}
@@ -747,6 +791,8 @@ impl pallet_grandpa::Trait for Runtime {
type HandleEquivocation =
pallet_grandpa::EquivocationHandler;
+
+ type WeightInfo = ();
}
parameter_types! {
@@ -781,7 +827,7 @@ impl pallet_identity::Trait for Runtime {
type Slashed = Treasury;
type ForceOrigin = EnsureRootOrHalfCouncil;
type RegistrarOrigin = EnsureRootOrHalfCouncil;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_identity::WeightInfo;
}
parameter_types! {
@@ -838,7 +884,7 @@ impl pallet_vesting::Trait for Runtime {
type Currency = Balances;
type BlockNumberToBalance = ConvertInto;
type MinVestedTransfer = MinVestedTransfer;
- type WeightInfo = ();
+ type WeightInfo = weights::pallet_vesting::WeightInfo;
}
construct_runtime!(
@@ -1122,15 +1168,9 @@ impl_runtime_apis! {
#[cfg(feature = "runtime-benchmarks")]
impl frame_benchmarking::Benchmark for Runtime {
fn dispatch_benchmark(
- pallet: Vec,
- benchmark: Vec,
- lowest_range_values: Vec,
- highest_range_values: Vec,
- steps: Vec,
- repeat: u32,
- extra: bool,
+ config: frame_benchmarking::BenchmarkConfig
) -> Result, sp_runtime::RuntimeString> {
- use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark};
+ use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency issues.
// To get around that, we separated the Session benchmarks into its own crate, which is why
// we need these two lines below.
@@ -1142,25 +1182,23 @@ impl_runtime_apis! {
impl pallet_offences_benchmarking::Trait for Runtime {}
impl frame_system_benchmarking::Trait for Runtime {}
- let whitelist: Vec> = vec![
+ let whitelist: Vec = vec![
// Block Number
- hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec(),
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
// Total Issuance
- hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec(),
+ hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
// Execution Phase
- hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec(),
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
// Event Count
- hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec(),
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
// System Events
- hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec(),
- // Caller 0 Account
- hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da946c154ffd9992e395af90b5b13cc6f295c77033fce8a9045824a6690bbf99c6db269502f0a8d1d2a008542d5690a0749").to_vec(),
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
// Treasury Account
- hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec(),
+ hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(),
];
let mut batches = Vec::::new();
- let params = (&pallet, &benchmark, &lowest_range_values, &highest_range_values, &steps, repeat, &whitelist, extra);
+ let params = (&config, &whitelist);
add_benchmark!(params, batches, pallet_babe, Babe);
add_benchmark!(params, batches, pallet_balances, Balances);
diff --git a/bin/node/runtime/src/weights/frame_system.rs b/bin/node/runtime/src/weights/frame_system.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9522fa75203906ab3c7264154a4b33835375843c
--- /dev/null
+++ b/bin/node/runtime/src/weights/frame_system.rs
@@ -0,0 +1,58 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
+
+#![allow(unused_parens)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl frame_system::WeightInfo for WeightInfo {
+ // WARNING! Some components were not used: ["b"]
+ fn remark() -> Weight {
+ (1305000 as Weight)
+ }
+ fn set_heap_pages() -> Weight {
+ (2023000 as Weight)
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ // WARNING! Some components were not used: ["d"]
+ fn set_changes_trie_config() -> Weight {
+ (10026000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn set_storage(i: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((656000 as Weight).saturating_mul(i as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+ }
+ fn kill_storage(i: u32, ) -> Weight {
+ (4327000 as Weight)
+ .saturating_add((478000 as Weight).saturating_mul(i as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+ }
+ fn kill_prefix(p: u32, ) -> Weight {
+ (8349000 as Weight)
+ .saturating_add((838000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+ }
+ fn suicide() -> Weight {
+ (29247000 as Weight)
+ }
+}
diff --git a/bin/node/runtime/src/weights/mod.rs b/bin/node/runtime/src/weights/mod.rs
index 70bae879ce05cfe002af6114cf2e375a59e594aa..2058227ab2e69e5763414907813b459442a85a6f 100644
--- a/bin/node/runtime/src/weights/mod.rs
+++ b/bin/node/runtime/src/weights/mod.rs
@@ -15,5 +15,20 @@
//! A list of the different weight modules for our runtime.
+pub mod frame_system;
pub mod pallet_balances;
+pub mod pallet_treasury;
+pub mod pallet_collective;
pub mod pallet_democracy;
+pub mod pallet_identity;
+pub mod pallet_indices;
+pub mod pallet_im_online;
+pub mod pallet_multisig;
+pub mod pallet_proxy;
+pub mod pallet_scheduler;
+pub mod pallet_session;
+pub mod pallet_staking;
+pub mod pallet_timestamp;
+pub mod pallet_utility;
+pub mod pallet_vesting;
+pub mod pallet_elections_phragmen;
diff --git a/bin/node/runtime/src/weights/pallet_balances.rs b/bin/node/runtime/src/weights/pallet_balances.rs
index 21a90a97e63a122b62d30bb90c06dedeebf7d98d..bcbc4ced6ef56895d4c62a31a7b0580ad71b9ecf 100644
--- a/bin/node/runtime/src/weights/pallet_balances.rs
+++ b/bin/node/runtime/src/weights/pallet_balances.rs
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//! Weights for the Balances Pallet
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
diff --git a/bin/node/runtime/src/weights/pallet_collective.rs b/bin/node/runtime/src/weights/pallet_collective.rs
new file mode 100644
index 0000000000000000000000000000000000000000..32b4ad02d7aa94c8007429b24bef2f062b310036
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_collective.rs
@@ -0,0 +1,97 @@
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_collective::WeightInfo for WeightInfo {
+ fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((21040000 as Weight).saturating_mul(m as Weight))
+ .saturating_add((173000 as Weight).saturating_mul(n as Weight))
+ .saturating_add((31595000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+ }
+ fn execute(b: u32, m: u32, ) -> Weight {
+ (43359000 as Weight)
+ .saturating_add((4000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((123000 as Weight).saturating_mul(m as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ }
+ fn propose_execute(b: u32, m: u32, ) -> Weight {
+ (54134000 as Weight)
+ .saturating_add((4000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((239000 as Weight).saturating_mul(m as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ }
+ fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
+ (90650000 as Weight)
+ .saturating_add((5000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((152000 as Weight).saturating_mul(m as Weight))
+ .saturating_add((970000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(4 as Weight))
+ }
+ fn vote(m: u32, ) -> Weight {
+ (74460000 as Weight)
+ .saturating_add((290000 as Weight).saturating_mul(m as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
+ (86360000 as Weight)
+ .saturating_add((232000 as Weight).saturating_mul(m as Weight))
+ .saturating_add((954000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
+ (123653000 as Weight)
+ .saturating_add((1000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((287000 as Weight).saturating_mul(m as Weight))
+ .saturating_add((920000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn close_disapproved(m: u32, p: u32, ) -> Weight {
+ (95395000 as Weight)
+ .saturating_add((236000 as Weight).saturating_mul(m as Weight))
+ .saturating_add((965000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
+ (135284000 as Weight)
+ .saturating_add((4000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((218000 as Weight).saturating_mul(m as Weight))
+ .saturating_add((951000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(5 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn disapprove_proposal(p: u32, ) -> Weight {
+ (50500000 as Weight)
+ .saturating_add((966000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_elections_phragmen.rs b/bin/node/runtime/src/weights/pallet_elections_phragmen.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f7ce1620a1f56e6dad23beb7ef7649e8b24eba49
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_elections_phragmen.rs
@@ -0,0 +1,89 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_elections_phragmen::WeightInfo for WeightInfo {
+ fn vote(v: u32, ) -> Weight {
+ (91_489_000 as Weight)
+ .saturating_add((199_000 as Weight).saturating_mul(v as Weight))
+ .saturating_add(DbWeight::get().reads(5 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn vote_update(v: u32, ) -> Weight {
+ (56_511_000 as Weight)
+ .saturating_add((245_000 as Weight).saturating_mul(v as Weight))
+ .saturating_add(DbWeight::get().reads(5 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn remove_voter() -> Weight {
+ (76_714_000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn report_defunct_voter_correct(c: u32, v: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((1_743_000 as Weight).saturating_mul(c as Weight))
+ .saturating_add((31_750_000 as Weight).saturating_mul(v as Weight))
+ .saturating_add(DbWeight::get().reads(7 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn report_defunct_voter_incorrect(c: u32, v: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((1_733_000 as Weight).saturating_mul(c as Weight))
+ .saturating_add((31_861_000 as Weight).saturating_mul(v as Weight))
+ .saturating_add(DbWeight::get().reads(6 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn submit_candidacy(c: u32, ) -> Weight {
+ (74_714_000 as Weight)
+ .saturating_add((315_000 as Weight).saturating_mul(c as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn renounce_candidacy_candidate(c: u32, ) -> Weight {
+ (50_408_000 as Weight)
+ .saturating_add((159_000 as Weight).saturating_mul(c as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn renounce_candidacy_members() -> Weight {
+ (79_626_000 as Weight)
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(4 as Weight))
+ }
+ fn renounce_candidacy_runners_up() -> Weight {
+ (49_715_000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn remove_member_with_replacement() -> Weight {
+ (76_572_000 as Weight)
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(5 as Weight))
+ }
+ fn remove_member_wrong_refund() -> Weight {
+ (8_777_000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_identity.rs b/bin/node/runtime/src/weights/pallet_identity.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2995a7674f8aea92511602ccc20d4f10db631118
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_identity.rs
@@ -0,0 +1,136 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_identity::WeightInfo for WeightInfo {
+ fn add_registrar(r: u32, ) -> Weight {
+ (39_603_000 as Weight)
+ .saturating_add((418_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn set_identity(r: u32, x: u32, ) -> Weight {
+ (110_679_000 as Weight)
+ .saturating_add((389_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((2_985_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn set_subs_new(s: u32, ) -> Weight {
+ (78_697_000 as Weight)
+ .saturating_add((15_225_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+ }
+ fn set_subs_old(p: u32, ) -> Weight {
+ (71_308_000 as Weight)
+ .saturating_add((5_772_000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+ }
+ fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
+ (91_553_000 as Weight)
+ .saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((5_749_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((1_621_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+ }
+ fn request_judgement(r: u32, x: u32, ) -> Weight {
+ (110_856_000 as Weight)
+ .saturating_add((496_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((3_221_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn cancel_request(r: u32, x: u32, ) -> Weight {
+ (96_857_000 as Weight)
+ .saturating_add((311_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((3_204_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn set_fee(r: u32, ) -> Weight {
+ (16_276_000 as Weight)
+ .saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn set_account_id(r: u32, ) -> Weight {
+ (18_530_000 as Weight)
+ .saturating_add((391_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn set_fields(r: u32, ) -> Weight {
+ (16_359_000 as Weight)
+ .saturating_add((379_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn provide_judgement(r: u32, x: u32, ) -> Weight {
+ (72_869_000 as Weight)
+ .saturating_add((423_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((3_187_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+ (123_199_000 as Weight)
+ .saturating_add((71_000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((5_730_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((2_000 as Weight).saturating_mul(x as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+ }
+ fn add_sub(s: u32, ) -> Weight {
+ (110_070_000 as Weight)
+ .saturating_add((262_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn rename_sub(s: u32, ) -> Weight {
+ (37_130_000 as Weight)
+ .saturating_add((79_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn remove_sub(s: u32, ) -> Weight {
+ (103_295_000 as Weight)
+ .saturating_add((235_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn quit_sub(s: u32, ) -> Weight {
+ (65_716_000 as Weight)
+ .saturating_add((227_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_im_online.rs b/bin/node/runtime/src/weights/pallet_im_online.rs
new file mode 100644
index 0000000000000000000000000000000000000000..25daff6a6e18f0bd202eb35f07654e706fd1791e
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_im_online.rs
@@ -0,0 +1,34 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_im_online::WeightInfo for WeightInfo {
+ fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
+ (139830000 as Weight)
+ .saturating_add((211000 as Weight).saturating_mul(k as Weight))
+ .saturating_add((654000 as Weight).saturating_mul(e as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_indices.rs b/bin/node/runtime/src/weights/pallet_indices.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f6a708bbd46b602034fa98b078d84ff8ce8c49d4
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_indices.rs
@@ -0,0 +1,52 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_indices::WeightInfo for WeightInfo {
+ fn claim() -> Weight {
+ (56_237_000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn transfer() -> Weight {
+ (63_665_000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn free() -> Weight {
+ (50_736_000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn force_transfer() -> Weight {
+ (52_361_000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn freeze() -> Weight {
+ (46_483_000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_multisig.rs b/bin/node/runtime/src/weights/pallet_multisig.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1de1d9a67f441e31d209bcef799f19d0d012d438
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_multisig.rs
@@ -0,0 +1,90 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_multisig::WeightInfo for WeightInfo {
+ fn as_multi_threshold_1(z: u32, ) -> Weight {
+ (17_161_000 as Weight)
+ .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+ }
+ fn as_multi_create(s: u32, z: u32, ) -> Weight {
+ (79_857_000 as Weight)
+ .saturating_add((131_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
+ (90_218_000 as Weight)
+ .saturating_add((129_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn as_multi_approve(s: u32, z: u32, ) -> Weight {
+ (48_402_000 as Weight)
+ .saturating_add((132_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
+ (88_390_000 as Weight)
+ .saturating_add((120_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn as_multi_complete(s: u32, z: u32, ) -> Weight {
+ (98_960_000 as Weight)
+ .saturating_add((276_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add((6_000 as Weight).saturating_mul(z as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn approve_as_multi_create(s: u32, ) -> Weight {
+ (80_185_000 as Weight)
+ .saturating_add((121_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn approve_as_multi_approve(s: u32, ) -> Weight {
+ (48_386_000 as Weight)
+ .saturating_add((143_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn approve_as_multi_complete(s: u32, ) -> Weight {
+ (177_181_000 as Weight)
+ .saturating_add((273_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn cancel_as_multi(s: u32, ) -> Weight {
+ (126_334_000 as Weight)
+ .saturating_add((124_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_proxy.rs b/bin/node/runtime/src/weights/pallet_proxy.rs
new file mode 100644
index 0000000000000000000000000000000000000000..92c43cd4853a215edade20d9b281e20ee8559663
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_proxy.rs
@@ -0,0 +1,85 @@
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_proxy::WeightInfo for WeightInfo {
+ fn proxy(p: u32, ) -> Weight {
+ (26127000 as Weight)
+ .saturating_add((214000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ }
+ fn proxy_announced(a: u32, p: u32, ) -> Weight {
+ (55405000 as Weight)
+ .saturating_add((774000 as Weight).saturating_mul(a as Weight))
+ .saturating_add((209000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn remove_announcement(a: u32, p: u32, ) -> Weight {
+ (35879000 as Weight)
+ .saturating_add((783000 as Weight).saturating_mul(a as Weight))
+ .saturating_add((20000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn reject_announcement(a: u32, p: u32, ) -> Weight {
+ (36097000 as Weight)
+ .saturating_add((780000 as Weight).saturating_mul(a as Weight))
+ .saturating_add((12000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn announce(a: u32, p: u32, ) -> Weight {
+ (53769000 as Weight)
+ .saturating_add((675000 as Weight).saturating_mul(a as Weight))
+ .saturating_add((214000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn add_proxy(p: u32, ) -> Weight {
+ (36082000 as Weight)
+ .saturating_add((234000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn remove_proxy(p: u32, ) -> Weight {
+ (32885000 as Weight)
+ .saturating_add((267000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn remove_proxies(p: u32, ) -> Weight {
+ (31735000 as Weight)
+ .saturating_add((215000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn anonymous(p: u32, ) -> Weight {
+ (50907000 as Weight)
+ .saturating_add((61000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn kill_anonymous(p: u32, ) -> Weight {
+ (33926000 as Weight)
+ .saturating_add((208000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_scheduler.rs b/bin/node/runtime/src/weights/pallet_scheduler.rs
new file mode 100644
index 0000000000000000000000000000000000000000..110a0545ed8396c57bcbd8568358956cb77e8ea6
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_scheduler.rs
@@ -0,0 +1,51 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_scheduler::WeightInfo for WeightInfo {
+ fn schedule(s: u32, ) -> Weight {
+ (37_835_000 as Weight)
+ .saturating_add((81_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn cancel(s: u32, ) -> Weight {
+ (34_707_000 as Weight)
+ .saturating_add((3_125_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn schedule_named(s: u32, ) -> Weight {
+ (48_065_000 as Weight)
+ .saturating_add((110_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn cancel_named(s: u32, ) -> Weight {
+ (38_776_000 as Weight)
+ .saturating_add((3_138_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_session.rs b/bin/node/runtime/src/weights/pallet_session.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3973936242a488b529e137343b0d74ef47e76325
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_session.rs
@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_session::WeightInfo for WeightInfo {
+ fn set_keys() -> Weight {
+ (88_411_000 as Weight)
+ .saturating_add(DbWeight::get().reads(6 as Weight))
+ .saturating_add(DbWeight::get().writes(5 as Weight))
+ }
+ fn purge_keys() -> Weight {
+ (51_843_000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(5 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_staking.rs b/bin/node/runtime/src/weights/pallet_staking.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f5a70830b92e7f3c0e54bb46416daef94d89dd17
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_staking.rs
@@ -0,0 +1,170 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Default weights of pallet-staking.
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_staking::WeightInfo for WeightInfo {
+ fn bond() -> Weight {
+ (144278000 as Weight)
+ .saturating_add(DbWeight::get().reads(5 as Weight))
+ .saturating_add(DbWeight::get().writes(4 as Weight))
+ }
+ fn bond_extra() -> Weight {
+ (110715000 as Weight)
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn unbond() -> Weight {
+ (99840000 as Weight)
+ .saturating_add(DbWeight::get().reads(5 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn withdraw_unbonded_update(s: u32, ) -> Weight {
+ (100728000 as Weight)
+ .saturating_add((63000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(5 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn withdraw_unbonded_kill(s: u32, ) -> Weight {
+ (168879000 as Weight)
+ .saturating_add((6666000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(7 as Weight))
+ .saturating_add(DbWeight::get().writes(8 as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+ }
+ fn validate() -> Weight {
+ (35539000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn nominate(n: u32, ) -> Weight {
+ (48596000 as Weight)
+ .saturating_add((308000 as Weight).saturating_mul(n as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn chill() -> Weight {
+ (35144000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn set_payee() -> Weight {
+ (24255000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn set_controller() -> Weight {
+ (52294000 as Weight)
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn set_validator_count() -> Weight {
+ (5185000 as Weight)
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn force_no_eras() -> Weight {
+ (5907000 as Weight)
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn force_new_era() -> Weight {
+ (5917000 as Weight)
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn force_new_era_always() -> Weight {
+ (5952000 as Weight)
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn set_invulnerables(v: u32, ) -> Weight {
+ (6324000 as Weight)
+ .saturating_add((9000 as Weight).saturating_mul(v as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn force_unstake(s: u32, ) -> Weight {
+ (119691000 as Weight)
+ .saturating_add((6681000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(8 as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+ }
+ fn cancel_deferred_slash(s: u32, ) -> Weight {
+ (5820201000 as Weight)
+ .saturating_add((34672000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn payout_stakers_dead_controller(n: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((92486000 as Weight).saturating_mul(n as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
+ }
+ fn payout_stakers_alive_staked(n: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((117324000 as Weight).saturating_mul(n as Weight))
+ .saturating_add(DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
+ .saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
+ }
+ fn rebond(l: u32, ) -> Weight {
+ (71316000 as Weight)
+ .saturating_add((142000 as Weight).saturating_mul(l as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn set_history_depth(e: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((51901000 as Weight).saturating_mul(e as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(4 as Weight))
+ .saturating_add(DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
+ }
+ fn reap_stash(s: u32, ) -> Weight {
+ (147166000 as Weight)
+ .saturating_add((6661000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(8 as Weight))
+ .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+ }
+ fn new_era(v: u32, n: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((1440459000 as Weight).saturating_mul(v as Weight))
+ .saturating_add((182580000 as Weight).saturating_mul(n as Weight))
+ .saturating_add(DbWeight::get().reads(10 as Weight))
+ .saturating_add(DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight)))
+ .saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
+ .saturating_add(DbWeight::get().writes(8 as Weight))
+ .saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
+ }
+ fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight {
+ (0 as Weight)
+ .saturating_add((964000 as Weight).saturating_mul(v as Weight))
+ .saturating_add((432000 as Weight).saturating_mul(n as Weight))
+ .saturating_add((204294000 as Weight).saturating_mul(a as Weight))
+ .saturating_add((9546000 as Weight).saturating_mul(w as Weight))
+ .saturating_add(DbWeight::get().reads(6 as Weight))
+ .saturating_add(DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight)))
+ .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_timestamp.rs b/bin/node/runtime/src/weights/pallet_timestamp.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cfd5f192d35298b512ee75e4d26acf11355ce3ba
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_timestamp.rs
@@ -0,0 +1,34 @@
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
+
+#![allow(unused_parens)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_timestamp::WeightInfo for WeightInfo {
+ // WARNING! Some components were not used: ["t"]
+ fn set() -> Weight {
+ (9133000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ // WARNING! Some components were not used: ["t"]
+ fn on_finalize() -> Weight {
+ (5915000 as Weight)
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_treasury.rs b/bin/node/runtime/src/weights/pallet_treasury.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fe1a3166919f011456bfef97c636196ae5b0ac20
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_treasury.rs
@@ -0,0 +1,140 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_treasury::WeightInfo for WeightInfo {
+ fn propose_spend() -> Weight {
+ (79604000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn reject_proposal() -> Weight {
+ (61001000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn approve_proposal() -> Weight {
+ (17835000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn report_awesome(r: u32, ) -> Weight {
+ (101602000 as Weight)
+ .saturating_add((2000 as Weight).saturating_mul(r as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ // WARNING! Some components were not used: ["r"]
+ fn retract_tip() -> Weight {
+ (82970000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn tip_new(r: u32, t: u32, ) -> Weight {
+ (63995000 as Weight)
+ .saturating_add((2000 as Weight).saturating_mul(r as Weight))
+ .saturating_add((153000 as Weight).saturating_mul(t as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn tip(t: u32, ) -> Weight {
+ (46765000 as Weight)
+ .saturating_add((711000 as Weight).saturating_mul(t as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn close_tip(t: u32, ) -> Weight {
+ (160874000 as Weight)
+ .saturating_add((379000 as Weight).saturating_mul(t as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn propose_bounty(d: u32, ) -> Weight {
+ (86198000 as Weight)
+ .saturating_add((1000 as Weight).saturating_mul(d as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(4 as Weight))
+ }
+ fn approve_bounty() -> Weight {
+ (23063000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn propose_curator() -> Weight {
+ (18890000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn unassign_curator() -> Weight {
+ (66768000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn accept_curator() -> Weight {
+ (69131000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn award_bounty() -> Weight {
+ (48184000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn claim_bounty() -> Weight {
+ (243104000 as Weight)
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(5 as Weight))
+ }
+ fn close_bounty_proposed() -> Weight {
+ (65917000 as Weight)
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn close_bounty_active() -> Weight {
+ (157232000 as Weight)
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(4 as Weight))
+ }
+ fn extend_bounty_expiry() -> Weight {
+ (46216000 as Weight)
+ .saturating_add(DbWeight::get().reads(1 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn on_initialize_proposals(p: u32, ) -> Weight {
+ (119765000 as Weight)
+ .saturating_add((108368000 as Weight).saturating_mul(p as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ .saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight)))
+ }
+ fn on_initialize_bounties(b: u32, ) -> Weight {
+ (112536000 as Weight)
+ .saturating_add((107132000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ .saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_utility.rs b/bin/node/runtime/src/weights/pallet_utility.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c9ae0d7d2333b19bec65e4f5c1556df65b21e086
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_utility.rs
@@ -0,0 +1,35 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_utility::WeightInfo for WeightInfo {
+ fn batch(c: u32, ) -> Weight {
+ (16461000 as Weight)
+ .saturating_add((1982000 as Weight).saturating_mul(c as Weight))
+ }
+ // WARNING! Some components were not used: ["u"]
+ fn as_derivative() -> Weight {
+ (4086000 as Weight)
+ }
+}
diff --git a/bin/node/runtime/src/weights/pallet_vesting.rs b/bin/node/runtime/src/weights/pallet_vesting.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b2a4b57e64415f5a23d65204acdc25c40121f066
--- /dev/null
+++ b/bin/node/runtime/src/weights/pallet_vesting.rs
@@ -0,0 +1,63 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_vesting::WeightInfo for WeightInfo {
+ fn vest_locked(l: u32, ) -> Weight {
+ (82109000 as Weight)
+ .saturating_add((332000 as Weight).saturating_mul(l as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(1 as Weight))
+ }
+ fn vest_unlocked(l: u32, ) -> Weight {
+ (88419000 as Weight)
+ .saturating_add((3000 as Weight).saturating_mul(l as Weight))
+ .saturating_add(DbWeight::get().reads(2 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn vest_other_locked(l: u32, ) -> Weight {
+ (81277000 as Weight)
+ .saturating_add((321000 as Weight).saturating_mul(l as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(2 as Weight))
+ }
+ fn vest_other_unlocked(l: u32, ) -> Weight {
+ (87584000 as Weight)
+ .saturating_add((19000 as Weight).saturating_mul(l as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn vested_transfer(l: u32, ) -> Weight {
+ (185916000 as Weight)
+ .saturating_add((625000 as Weight).saturating_mul(l as Weight))
+ .saturating_add(DbWeight::get().reads(3 as Weight))
+ .saturating_add(DbWeight::get().writes(3 as Weight))
+ }
+ fn force_vested_transfer(l: u32, ) -> Weight {
+ (185916000 as Weight)
+ .saturating_add((625000 as Weight).saturating_mul(l as Weight))
+ .saturating_add(DbWeight::get().reads(4 as Weight))
+ .saturating_add(DbWeight::get().writes(4 as Weight))
+ }
+}
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index a61a344cceed1b3898ca68a92096b241933f5074..3b541b696815b2837755b8e6533e1f04c730c6ef 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-testing"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
description = "Test utilities for Substrate node."
edition = "2018"
@@ -13,40 +13,39 @@ publish = true
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-pallet-balances = { version = "2.0.0-rc5", path = "../../../frame/balances" }
-sc-service = { version = "0.8.0-rc5", features = ["test-helpers", "db"], path = "../../../client/service" }
-sc-client-db = { version = "0.8.0-rc5", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
-sc-client-api = { version = "2.0.0-rc5", path = "../../../client/api/" }
+pallet-balances = { version = "2.0.0", path = "../../../frame/balances" }
+sc-service = { version = "0.8.0", features = ["test-helpers", "db"], path = "../../../client/service" }
+sc-client-db = { version = "0.8.0", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
+sc-client-api = { version = "2.0.0", path = "../../../client/api/" }
codec = { package = "parity-scale-codec", version = "1.3.4" }
-pallet-contracts = { version = "2.0.0-rc5", path = "../../../frame/contracts" }
-pallet-grandpa = { version = "2.0.0-rc5", path = "../../../frame/grandpa" }
-pallet-indices = { version = "2.0.0-rc5", path = "../../../frame/indices" }
-sp-keyring = { version = "2.0.0-rc5", path = "../../../primitives/keyring" }
-node-executor = { version = "2.0.0-rc5", path = "../executor" }
-node-primitives = { version = "2.0.0-rc5", path = "../primitives" }
-node-runtime = { version = "2.0.0-rc5", path = "../runtime" }
-sp-core = { version = "2.0.0-rc5", path = "../../../primitives/core" }
-sp-io = { version = "2.0.0-rc5", path = "../../../primitives/io" }
-frame-support = { version = "2.0.0-rc5", path = "../../../frame/support" }
-pallet-session = { version = "2.0.0-rc5", path = "../../../frame/session" }
-pallet-society = { version = "2.0.0-rc5", path = "../../../frame/society" }
-sp-runtime = { version = "2.0.0-rc5", path = "../../../primitives/runtime" }
-pallet-staking = { version = "2.0.0-rc5", path = "../../../frame/staking" }
-sc-executor = { version = "0.8.0-rc5", path = "../../../client/executor", features = ["wasmtime"] }
-sp-consensus = { version = "0.8.0-rc5", path = "../../../primitives/consensus/common" }
-frame-system = { version = "2.0.0-rc5", path = "../../../frame/system" }
-substrate-test-client = { version = "2.0.0-rc5", path = "../../../test-utils/client" }
-pallet-timestamp = { version = "2.0.0-rc5", path = "../../../frame/timestamp" }
-pallet-transaction-payment = { version = "2.0.0-rc5", path = "../../../frame/transaction-payment" }
-pallet-treasury = { version = "2.0.0-rc5", path = "../../../frame/treasury" }
-wabt = "0.9.2"
-sp-api = { version = "2.0.0-rc5", path = "../../../primitives/api" }
-sp-finality-tracker = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/finality-tracker" }
-sp-timestamp = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/timestamp" }
-sp-block-builder = { version = "2.0.0-rc5", path = "../../../primitives/block-builder" }
-sc-block-builder = { version = "0.8.0-rc5", path = "../../../client/block-builder" }
-sp-inherents = { version = "2.0.0-rc5", path = "../../../primitives/inherents" }
-sp-blockchain = { version = "2.0.0-rc5", path = "../../../primitives/blockchain" }
+pallet-contracts = { version = "2.0.0", path = "../../../frame/contracts" }
+pallet-grandpa = { version = "2.0.0", path = "../../../frame/grandpa" }
+pallet-indices = { version = "2.0.0", path = "../../../frame/indices" }
+sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
+node-executor = { version = "2.0.0", path = "../executor" }
+node-primitives = { version = "2.0.0", path = "../primitives" }
+node-runtime = { version = "2.0.0", path = "../runtime" }
+sp-core = { version = "2.0.0", path = "../../../primitives/core" }
+sp-io = { version = "2.0.0", path = "../../../primitives/io" }
+frame-support = { version = "2.0.0", path = "../../../frame/support" }
+pallet-session = { version = "2.0.0", path = "../../../frame/session" }
+pallet-society = { version = "2.0.0", path = "../../../frame/society" }
+sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
+pallet-staking = { version = "2.0.0", path = "../../../frame/staking" }
+sc-executor = { version = "0.8.0", path = "../../../client/executor", features = ["wasmtime"] }
+sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+frame-system = { version = "2.0.0", path = "../../../frame/system" }
+substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" }
+pallet-timestamp = { version = "2.0.0", path = "../../../frame/timestamp" }
+pallet-transaction-payment = { version = "2.0.0", path = "../../../frame/transaction-payment" }
+pallet-treasury = { version = "2.0.0", path = "../../../frame/treasury" }
+sp-api = { version = "2.0.0", path = "../../../primitives/api" }
+sp-finality-tracker = { version = "2.0.0", default-features = false, path = "../../../primitives/finality-tracker" }
+sp-timestamp = { version = "2.0.0", default-features = false, path = "../../../primitives/timestamp" }
+sp-block-builder = { version = "2.0.0", path = "../../../primitives/block-builder" }
+sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
+sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
+sp-blockchain = { version = "2.0.0", path = "../../../primitives/blockchain" }
log = "0.4.8"
tempfile = "3.1.0"
fs_extra = "1"
@@ -54,4 +53,4 @@ futures = "0.3.1"
[dev-dependencies]
criterion = "0.3.0"
-sc-cli = { version = "0.8.0-rc5", path = "../../../client/cli" }
+sc-cli = { version = "0.8.0", path = "../../../client/cli" }
diff --git a/bin/utils/chain-spec-builder/Cargo.toml b/bin/utils/chain-spec-builder/Cargo.toml
index e90ef12f6815c0bc9db9cd5b6dfdaac9c08c9309..da455e3ec4a6c01a3e72ccf78d09cb99fb1ac1be 100644
--- a/bin/utils/chain-spec-builder/Cargo.toml
+++ b/bin/utils/chain-spec-builder/Cargo.toml
@@ -1,21 +1,22 @@
[package]
name = "chain-spec-builder"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
edition = "2018"
build = "build.rs"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
homepage = "https://substrate.dev"
repository = "https://github.com/paritytech/substrate/"
+readme = "README.md"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
ansi_term = "0.12.1"
-sc-keystore = { version = "2.0.0-rc5", path = "../../../client/keystore" }
-sc-chain-spec = { version = "2.0.0-rc5", path = "../../../client/chain-spec" }
-node-cli = { version = "2.0.0-rc5", path = "../../node/cli" }
-sp-core = { version = "2.0.0-rc5", path = "../../../primitives/core" }
+sc-keystore = { version = "2.0.0", path = "../../../client/keystore" }
+sc-chain-spec = { version = "2.0.0", path = "../../../client/chain-spec" }
+node-cli = { version = "2.0.0", path = "../../node/cli" }
+sp-core = { version = "2.0.0", path = "../../../primitives/core" }
rand = "0.7.2"
structopt = "0.3.8"
diff --git a/bin/utils/chain-spec-builder/README.md b/bin/utils/chain-spec-builder/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3e9ac0bddbdc17539d12893553789983e38ab05f
--- /dev/null
+++ b/bin/utils/chain-spec-builder/README.md
@@ -0,0 +1 @@
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
diff --git a/bin/utils/subkey/Cargo.toml b/bin/utils/subkey/Cargo.toml
index 459df884d688444cc092392d8b7d8c9c5eb10078..fa0b345bc8406f2f4ea33228276fdb712b1b4845 100644
--- a/bin/utils/subkey/Cargo.toml
+++ b/bin/utils/subkey/Cargo.toml
@@ -1,40 +1,28 @@
[package]
name = "subkey"
-version = "2.0.0-rc5"
+version = "2.0.0"
authors = ["Parity Technologies "]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
homepage = "https://substrate.dev"
repository = "https://github.com/paritytech/substrate/"
+readme = "README.md"
+
+[[bin]]
+path = "src/main.rs"
+name = "subkey"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-futures = "0.1.29"
-sp-core = { version = "2.0.0-rc5", path = "../../../primitives/core" }
-node-runtime = { version = "2.0.0-rc5", path = "../../node/runtime" }
-node-primitives = { version = "2.0.0-rc5", path = "../../node/primitives" }
-sp-runtime = { version = "2.0.0-rc5", path = "../../../primitives/runtime" }
-rand = "0.7.2"
-clap = "2.33.0"
-tiny-bip39 = "0.7"
-substrate-bip39 = "0.4.1"
-hex = "0.4.0"
-hex-literal = "0.2.1"
-codec = { package = "parity-scale-codec", version = "1.3.4" }
-frame-system = { version = "2.0.0-rc5", path = "../../../frame/system" }
-pallet-balances = { version = "2.0.0-rc5", path = "../../../frame/balances" }
-pallet-transaction-payment = { version = "2.0.0-rc5", path = "../../../frame/transaction-payment" }
-pallet-grandpa = { version = "2.0.0-rc5", path = "../../../frame/grandpa" }
-rpassword = "4.0.1"
-itertools = "0.8.2"
-derive_more = { version = "0.99.2" }
-sc-rpc = { version = "2.0.0-rc5", path = "../../../client/rpc" }
-jsonrpc-core-client = { version = "14.2.0", features = ["http"] }
-hyper = "0.12.35"
-libp2p = { version = "0.23.0", default-features = false }
-serde_json = "1.0"
+node-runtime = { version = "2.0.0", path = "../../node/runtime" }
+node-primitives = { version = "2.0.0", path = "../../node/primitives" }
+sc-cli = { version = "0.8.0", path = "../../../client/cli" }
+substrate-frame-cli = { version = "2.0.0", path = "../../../utils/frame/frame-utilities-cli" }
+structopt = "0.3.14"
+frame-system = { version = "2.0.0", path = "../../../frame/system" }
+sp-core = { version = "2.0.0", path = "../../../primitives/core" }
[features]
bench = []
diff --git a/bin/utils/subkey/README.adoc b/bin/utils/subkey/README.adoc
index 1fa0753312f0cd6dc1f9a94c42866326bdf4f59d..5ce0d2d324470b51032f5c43c7978fb246691da1 100644
--- a/bin/utils/subkey/README.adoc
+++ b/bin/utils/subkey/README.adoc
@@ -31,7 +31,7 @@ OUTPUT:
`subkey` expects a message to come in on STDIN, one way to sign a message would look like this:
```bash
-echo -n | subkey sign
+echo -n | subkey sign --suri
OUTPUT:
a69da4a6ccbf81dbbbfad235fa12cf8528c18012b991ae89214de8d20d29c1280576ced6eb38b7406d1b7e03231df6dd4a5257546ddad13259356e1c3adfb509
@@ -72,7 +72,7 @@ Will output a signed and encoded `UncheckedMortalCompactExtrinsic` as hex.
=== Inspecting a module ID
```bash
-subkey --network kusama moduleid "py/trsry"
+subkey module-id "py/trsry" --network kusama
OUTPUT:
Public Key URI `F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29` is account:
diff --git a/bin/utils/subkey/README.md b/bin/utils/subkey/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3e9ac0bddbdc17539d12893553789983e38ab05f
--- /dev/null
+++ b/bin/utils/subkey/README.md
@@ -0,0 +1 @@
+License: GPL-3.0-or-later WITH Classpath-exception-2.0
\ No newline at end of file
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..051628e84a193419221d0eccd04f797dc2b56a23
--- /dev/null
+++ b/bin/utils/subkey/src/lib.rs
@@ -0,0 +1,82 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+use structopt::StructOpt;
+use sc_cli::{
+ Error, VanityCmd, SignCmd, VerifyCmd, InsertCmd,
+ GenerateNodeKeyCmd, GenerateCmd, InspectKeyCmd, InspectNodeKeyCmd
+};
+use substrate_frame_cli::ModuleIdCmd;
+use sp_core::crypto::Ss58Codec;
+
+#[derive(Debug, StructOpt)]
+#[structopt(
+ name = "subkey",
+ author = "Parity Team ",
+ about = "Utility for generating and restoring with Substrate keys",
+)]
+pub enum Subkey {
+ /// Generate a random node libp2p key, save it to file or print it to stdout
+ /// and print its peer ID to stderr.
+ GenerateNodeKey(GenerateNodeKeyCmd),
+
+ /// Generate a random account
+ Generate(GenerateCmd),
+
+ /// Gets a public key and a SS58 address from the provided Secret URI
+ Inspect(InspectKeyCmd),
+
+ /// Print the peer ID corresponding to the node key in the given file
+ InspectNodeKey(InspectNodeKeyCmd),
+
+ /// Insert a key to the keystore of a node.
+ Insert(InsertCmd),
+
+ /// Inspect a module ID address
+ ModuleId(ModuleIdCmd),
+
+ /// Sign a message, with a given (secret) key.
+ Sign(SignCmd),
+
+ /// Generate a seed that provides a vanity address.
+ Vanity(VanityCmd),
+
+ /// Verify a signature for a message, provided on STDIN, with a given (public or secret) key.
+ Verify(VerifyCmd),
+}
+
+/// Run the subkey command, given the apropriate runtime.
+pub fn run() -> Result<(), Error>
+ where
+ R: frame_system::Trait,
+ R::AccountId: Ss58Codec
+{
+ match Subkey::from_args() {
+ Subkey::GenerateNodeKey(cmd) => cmd.run()?,
+ Subkey::Generate(cmd) => cmd.run()?,
+ Subkey::Inspect(cmd) => cmd.run()?,
+ Subkey::InspectNodeKey(cmd) => cmd.run()?,
+ Subkey::Insert(cmd) => cmd.run()?,
+ Subkey::ModuleId(cmd) => cmd.run::()?,
+ Subkey::Vanity(cmd) => cmd.run()?,
+ Subkey::Verify(cmd) => cmd.run()?,
+ Subkey::Sign(cmd) => cmd.run()?,
+ };
+
+ Ok(())
+}
diff --git a/bin/utils/subkey/src/main.rs b/bin/utils/subkey/src/main.rs
index 9455e08175aa77a9e13492bfaffdb63819760287..dd14425130b7d32ce9ddb7123929a74aa63da93d 100644
--- a/bin/utils/subkey/src/main.rs
+++ b/bin/utils/subkey/src/main.rs
@@ -16,814 +16,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-#![cfg_attr(feature = "bench", feature(test))]
-#[cfg(feature = "bench")]
-extern crate test;
+//! Subkey utility, based on node_runtime.
-use bip39::{Language, Mnemonic, MnemonicType};
-use clap::{App, ArgMatches, SubCommand};
-use codec::{Decode, Encode};
-use hex_literal::hex;
-use itertools::Itertools;
-use libp2p::identity::{ed25519 as libp2p_ed25519, PublicKey};
-use node_primitives::{Balance, Hash, Index, AccountId, Signature};
-use node_runtime::{BalancesCall, Call, Runtime, SignedPayload, UncheckedExtrinsic, VERSION};
-use serde_json::json;
-use sp_core::{
- crypto::{set_default_ss58_version, Ss58AddressFormat, Ss58Codec},
- ed25519, sr25519, ecdsa, Pair, Public, H256, hexdisplay::HexDisplay,
-};
-use sp_runtime::{traits::{AccountIdConversion, IdentifyAccount, Verify}, generic::Era, ModuleId};
-use std::{
- convert::{TryInto, TryFrom}, io::{stdin, Read}, str::FromStr, path::PathBuf, fs, fmt,
-};
+use node_runtime::Runtime;
-mod rpc;
-mod vanity;
-
-enum OutputType {
- Json,
- Text,
-}
-
-impl<'a> TryFrom<&'a str> for OutputType {
- type Error = ();
-
- fn try_from(s: &'a str) -> Result {
- match s {
- "json" => Ok(OutputType::Json),
- "text" => Ok(OutputType::Text),
- _ => Err(()),
- }
- }
-
-}
-
-trait Crypto: Sized {
- type Pair: Pair;
- type Public: Public + Ss58Codec + AsRef<[u8]> + std::hash::Hash;
- fn pair_from_suri(suri: &str, password: Option<&str>) -> Self::Pair {
- Self::Pair::from_string(suri, password).expect("Invalid phrase")
- }
- fn ss58_from_pair(pair: &Self::Pair) -> String where
- ::Public: PublicT,
- {
- pair.public().into_runtime().into_account().to_ss58check()
- }
- fn public_from_pair(pair: &Self::Pair) -> Self::Public {
- pair.public()
- }
- fn print_from_uri(
- uri: &str,
- password: Option<&str>,
- network_override: Option,
- output: OutputType,
- ) where
- ::Public: PublicT,
- {
- let v = network_override.unwrap_or_default();
- if let Ok((pair, seed)) = Self::Pair::from_phrase(uri, password) {
- let public_key = Self::public_from_pair(&pair);
-
- match output {
- OutputType::Json => {
- let json = json!({
- "secretPhrase": uri,
- "networkId": String::from(v),
- "secretSeed": format_seed::(seed),
- "publicKey": format_public_key::(public_key.clone()),
- "accountId": format_account_id::(public_key),
- "ss58Address": Self::ss58_from_pair(&pair),
- });
- println!("{}", serde_json::to_string_pretty(&json).expect("Json pretty print failed"));
- },
- OutputType::Text => {
- println!("Secret phrase `{}` is account:\n \
- Network ID/version: {}\n \
- Secret seed: {}\n \
- Public key (hex): {}\n \
- Account ID: {}\n \
- SS58 Address: {}",
- uri,
- String::from(v),
- format_seed::(seed),
- format_public_key::(public_key.clone()),
- format_account_id::(public_key),
- Self::ss58_from_pair(&pair),
- );
- },
- }
- } else if let Ok((pair, seed)) = Self::Pair::from_string_with_seed(uri, password) {
- let public_key = Self::public_from_pair(&pair);
-
- match output {
- OutputType::Json => {
- let json = json!({
- "secretKeyUri": uri,
- "networkId": String::from(v),
- "secretSeed": if let Some(seed) = seed { format_seed::(seed) } else { "n/a".into() },
- "publicKey": format_public_key::(public_key.clone()),
- "accountId": format_account_id::(public_key),
- "ss58Address": Self::ss58_from_pair(&pair),
- });
- println!("{}", serde_json::to_string_pretty(&json).expect("Json pretty print failed"));
- },
- OutputType::Text => {
- println!("Secret Key URI `{}` is account:\n \
- Network ID/version: {}\n \
- Secret seed: {}\n \
- Public key (hex): {}\n \
- Account ID: {}\n \
- SS58 Address: {}",
- uri,
- String::from(v),
- if let Some(seed) = seed { format_seed::(seed) } else { "n/a".into() },
- format_public_key::(public_key.clone()),
- format_account_id::(public_key),
- Self::ss58_from_pair(&pair),
- );
- },
- }
- } else if let Ok((public_key, v)) =
- ::Public::from_string_with_version(uri)
- {
- let v = network_override.unwrap_or(v);
-
- match output {
- OutputType::Json => {
- let json = json!({
- "publicKeyUri": uri,
- "networkId": String::from(v),
- "publicKey": format_public_key::(public_key.clone()),
- "accountId": format_account_id::(public_key.clone()),
- "ss58Address": public_key.to_ss58check_with_version(v),
- });
- println!("{}", serde_json::to_string_pretty(&json).expect("Json pretty print failed"));
- },
- OutputType::Text => {
- println!("Public Key URI `{}` is account:\n \
- Network ID/version: {}\n \
- Public key (hex): {}\n \
- Account ID: {}\n \
- SS58 Address: {}",
- uri,
- String::from(v),
- format_public_key::(public_key.clone()),
- format_account_id::(public_key.clone()),
- public_key.to_ss58check_with_version(v),
- );
- },
- }
- } else {
- eprintln!("Invalid phrase/URI given");
- }
- }
-}
-
-struct Ed25519;
-
-impl Crypto for Ed25519 {
- type Pair = ed25519::Pair;
- type Public = ed25519::Public;
-
- fn pair_from_suri(suri: &str, password_override: Option<&str>) -> Self::Pair {
- ed25519::Pair::from_legacy_string(suri, password_override)
- }
-}
-
-struct Sr25519;
-
-impl Crypto for Sr25519 {
- type Pair = sr25519::Pair;
- type Public = sr25519::Public;
-}
-
-struct Ecdsa;
-
-impl Crypto for Ecdsa {
- type Pair = ecdsa::Pair;
- type Public = ecdsa::Public;
-}
-
-type SignatureOf = <::Pair as Pair>::Signature;
-type PublicOf = <::Pair as Pair>::Public;
-type SeedOf = <::Pair as Pair>::Seed;
-type AccountPublic = ::Signer;
-
-trait SignatureT: AsRef<[u8]> + AsMut<[u8]> + Default {
- /// Converts the signature into a runtime account signature, if possible. If not possible, bombs out.
- fn into_runtime(self) -> Signature {
- panic!("This cryptography isn't supported for this runtime.")
- }
-}
-trait PublicT: Sized + AsRef<[u8]> + Ss58Codec {
- /// Converts the public key into a runtime account public key, if possible. If not possible, bombs out.
- fn into_runtime(self) -> AccountPublic {
- panic!("This cryptography isn't supported for this runtime.")
- }
-}
-
-impl SignatureT for sr25519::Signature { fn into_runtime(self) -> Signature { self.into() } }
-impl SignatureT for ed25519::Signature { fn into_runtime(self) -> Signature { self.into() } }
-impl SignatureT for ecdsa::Signature { fn into_runtime(self) -> Signature { self.into() } }
-impl PublicT for sr25519::Public { fn into_runtime(self) -> AccountPublic { self.into() } }
-impl PublicT for ed25519::Public { fn into_runtime(self) -> AccountPublic { self.into() } }
-impl PublicT for ecdsa::Public { fn into_runtime(self) -> AccountPublic { self.into() } }
-
-fn get_usage() -> String {
- let networks = Ss58AddressFormat::all().iter().cloned().map(String::from).join("/");
- let default_network = String::from(Ss58AddressFormat::default());
- format!("
- -e, --ed25519 'Use Ed25519/BIP39 cryptography'
- -k, --secp256k1 'Use SECP256k1/ECDSA/BIP39 cryptography'
- -s, --sr25519 'Use Schnorr/Ristretto x25519/BIP39 cryptography'
- [network] -n, --network 'Specify a network. One of {}. Default is {}'
- [password] -p, --password 'The password for the key'
- --password-interactive 'You will be prompted for the password for the key.'
- [output] -o, --output