diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js
new file mode 100644
index 0000000000000000000000000000000000000000..4a8af91328ff10a724f5bdcd62bfd48b27a0850d
--- /dev/null
+++ b/.github/allowed-actions.js
@@ -0,0 +1,7 @@
+// This is a whitelist of GitHub Actions that are approved for use in this project.
+// If a new or existing workflow file is updated to use an action or action version
+// not listed here, CI will fail.
+
+module.exports = [
+ 'gaurav-nelson/github-action-markdown-link-check@e3c371c731b2f494f856dc5de7f61cea4d519907', // gaurav-nelson/github-action-markdown-link-check@v1.0.8
+]
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d782bb80f7539813325177468804c82534b380a2
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+ - package-ecosystem: "cargo"
+ directory: "/"
+ labels: ["A2-insubstantial", "B0-silent", "C1-low"]
+ schedule:
+ interval: "daily"
diff --git a/.github/workflows/md-link-check.yml b/.github/workflows/md-link-check.yml
index 75948534b3c194430e87e4a2fc6eb8c600c4618e..e15a506c567d99a779137bc069c8efae48bd45ce 100644
--- a/.github/workflows/md-link-check.yml
+++ b/.github/workflows/md-link-check.yml
@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: gaurav-nelson/github-action-markdown-link-check@v1
+ - uses: gaurav-nelson/github-action-markdown-link-check@e3c371c731b2f494f856dc5de7f61cea4d519907
with:
use-quiet-mode: 'yes'
config-file: '.github/workflows/mlc_config.json'
diff --git a/.github/workflows/mlc_config.json b/.github/workflows/mlc_config.json
index f741e987b1b2a771d4b15a478a519ca8e868b60a..ffd0a0319fe60b2a65913e1c4ba34c6b2dfd9a8f 100644
--- a/.github/workflows/mlc_config.json
+++ b/.github/workflows/mlc_config.json
@@ -3,5 +3,11 @@
{
"pattern": "^https://crates.io"
}
+ ],
+ "replacementPatterns": [
+ {
+ "pattern": "%20",
+ "replacement": " "
+ }
]
}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c6e3bf09f49a43da22b9b1ed5163ba0694509ce..07b0dd319cf792dbee99c64b5addc4307ab14dd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -196,7 +196,7 @@ cargo-check-benches:
<<: *docker-env
<<: *test-refs
script:
- - BUILD_DUMMY_WASM_BINARY=1 time cargo +nightly check --benches --all
+ - SKIP_WASM_BUILD=1 time cargo +nightly check --benches --all
- cargo run --release -p node-bench -- ::node::import::native::sr25519::transfer_keep_alive::paritydb::small
- cargo run --release -p node-bench -- ::trie::read::small
- sccache -s
@@ -207,7 +207,7 @@ cargo-check-subkey:
<<: *test-refs
script:
- cd ./bin/utils/subkey
- - BUILD_DUMMY_WASM_BINARY=1 time cargo check --release
+ - SKIP_WASM_BUILD=1 time cargo check --release
- sccache -s
test-deterministic-wasm:
@@ -221,7 +221,7 @@ test-deterministic-wasm:
# build runtime
- cargo build --verbose --release -p node-runtime
# make checksum
- - sha256sum target/release/wbuild/target/wasm32-unknown-unknown/release/node_runtime.wasm > checksum.sha256
+ - sha256sum target/release/wbuild/node-runtime/target/wasm32-unknown-unknown/release/node_runtime.wasm > checksum.sha256
# clean up – FIXME: can we reuse some of the artifacts?
- cargo clean
# build again
@@ -342,7 +342,7 @@ cargo-check-macos:
<<: *docker-env
<<: *test-refs
script:
- - BUILD_DUMMY_WASM_BINARY=1 time cargo check --release
+ - SKIP_WASM_BUILD=1 time cargo check --release
- sccache -s
tags:
- osx
@@ -450,7 +450,7 @@ build-linux-subkey: &build-subkey
- mkdir -p ./artifacts/subkey
script:
- cd ./bin/utils/subkey
- - BUILD_DUMMY_WASM_BINARY=1 time cargo build --release --verbose
+ - SKIP_WASM_BUILD=1 time cargo build --release --verbose
- cd -
- mv ./target/release/subkey ./artifacts/subkey/.
- echo -n "Subkey version = "
@@ -470,7 +470,9 @@ build-rust-doc:
stage: build
<<: *docker-env
<<: *test-refs
- allow_failure: true
+ needs:
+ - job: test-linux-stable
+ artifacts: false
variables:
<<: *default-vars
RUSTFLAGS: -Dwarnings
@@ -482,7 +484,7 @@ build-rust-doc:
- ./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"
+ - SKIP_WASM_BUILD=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
time cargo +nightly doc --no-deps --workspace --all-features --verbose
- mv ./target/doc ./crate-docs
- echo "" > ./crate-docs/index.html
@@ -658,6 +660,8 @@ publish-s3-doc:
needs:
- job: build-rust-doc
artifacts: true
+ - job: build-linux-substrate
+ artifacts: false
<<: *build-refs
<<: *kubernetes-build
variables:
diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 146cc4cfcbdb57f3aa8f2767d3aedcde928a938f..76f89eafbaeee28a638d8407a8058a4e214bfbdc 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -15,7 +15,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//! Weights for {{pallet}}
+//! Autogenerated weights for {{pallet}}
+//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
@@ -44,7 +45,7 @@ pub trait WeightInfo {
/// Weights for {{pallet}} using the Substrate node and recommended hardware.
pub struct SubstrateWeight(PhantomData);
-impl WeightInfo for SubstrateWeight {
+impl WeightInfo for SubstrateWeight {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
@@ -53,6 +54,7 @@ impl WeightInfo for SubstrateWeight {
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
+ // Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
{{~/each}}
{{~#if (ne benchmark.base_reads "0")}}
@@ -81,6 +83,7 @@ impl WeightInfo for () {
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
+ // Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
{{~/each}}
{{~#if (ne benchmark.base_reads "0")}}
diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 73a5a36ff8af9e59cc91b470cd4d46595b776ee2..16fb2d356720171241182618a19c843dbaab70aa 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -9,6 +9,7 @@
# polkadot companion: paritytech/polkadot#567
#
+set -e
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
@@ -92,3 +93,6 @@ cd polkadot
# Test Polkadot pr or master branch with this Substrate commit.
cargo update -p sp-io
time cargo test --all --release --verbose --features=real-overseer
+
+cd parachain/test-parachains/adder/collator/
+time cargo test --release --verbose --locked --features=real-overseer
diff --git a/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json b/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json
index 629b22617b22a970eb1f439179f62711d1bac9b4..a61e8a49bade752ea321ffe62528f24378442834 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-dashboard.json
@@ -756,108 +756,6 @@
"alignLevel": null
}
},
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": null,
- "fill": 1,
- "fillGradient": 0,
- "gridPos": {
- "h": 6,
- "w": 6,
- "x": 0,
- "y": 12
- },
- "hiddenSeries": false,
- "id": 23,
- "legend": {
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
- "nullPointMode": "null",
- "options": {
- "dataLinks": []
- },
- "percentage": false,
- "pointradius": 2,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "[[metric_namespace]]_sync_extra_finality_proofs_active{instance=\"[[instance]]\",network=\"[[network]]\"}",
- "legendFormat": "{{instance}} active",
- "refId": "A"
- },
- {
- "expr": "[[metric_namespace]]_sync_extra_finality_proofs_failed{instance=\"[[instance]]\",network=\"[[network]]\"}",
- "legendFormat": "{{instance}} failed",
- "refId": "B"
- },
- {
- "expr": "[[metric_namespace]]_sync_extra_finality_proofs_importing{instance=\"[[instance]]\",network=\"[[network]]\"}",
- "legendFormat": "{{instance}} importing",
- "refId": "C"
- },
- {
- "expr": "[[metric_namespace]]_sync_extra_finality_proofs_pending{instance=\"[[instance]]\",network=\"[[network]]\"}",
- "legendFormat": "{{instance}} pending",
- "refId": "D"
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeRegions": [],
- "timeShift": null,
- "title": "Sync Proof",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
{
"aliasColors": {},
"bars": false,
diff --git a/Cargo.lock b/Cargo.lock
index 62cb03dedafa32b5e29579b5175bbc5414aae3f7..53c42e08774b50ae9e266d1a4b3c58b450059a90 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,11 +12,11 @@ dependencies = [
[[package]]
name = "addr2line"
-version = "0.13.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
+checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
dependencies = [
- "gimli 0.22.0",
+ "gimli 0.23.0",
]
[[package]]
@@ -31,89 +31,75 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
dependencies = [
- "generic-array 0.14.3",
+ "generic-array 0.14.4",
]
[[package]]
name = "aes"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5"
+checksum = "dd2bc6d3f370b5666245ff421e231cba4353df936e26986d2918e61a8fd6aef6"
dependencies = [
"aes-soft",
"aesni",
- "block-cipher 0.7.1",
+ "block-cipher",
]
[[package]]
name = "aes-gcm"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f5007801316299f922a6198d1d09a0bae95786815d066d5880d13f7c45ead1"
+checksum = "0301c9e9c443494d970a07885e8cf3e587bae8356a1d5abd0999068413f7205f"
dependencies = [
"aead",
"aes",
- "block-cipher 0.7.1",
+ "block-cipher",
"ghash",
- "subtle 2.2.3",
+ "subtle 2.3.0",
]
[[package]]
name = "aes-soft"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"
+checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6"
dependencies = [
- "block-cipher 0.7.1",
+ "block-cipher",
"byteorder",
- "opaque-debug 0.2.3",
+ "opaque-debug 0.3.0",
]
[[package]]
name = "aesni"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264"
+checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a"
dependencies = [
- "block-cipher 0.7.1",
- "opaque-debug 0.2.3",
+ "block-cipher",
+ "opaque-debug 0.3.0",
]
[[package]]
name = "ahash"
-version = "0.2.19"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29661b60bec623f0586702976ff4d0c9942dcb6723161c2df0eea78455cfedfb"
-dependencies = [
- "const-random",
-]
+checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
[[package]]
name = "ahash"
-version = "0.3.8"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
+checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c"
[[package]]
name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
dependencies = [
"memchr",
]
-[[package]]
-name = "alga"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2"
-dependencies = [
- "approx",
- "num-complex",
- "num-traits",
-]
-
[[package]]
name = "ansi_term"
version = "0.11.0"
@@ -134,9 +120,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.31"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
+checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
[[package]]
name = "approx"
@@ -149,9 +135,9 @@ dependencies = [
[[package]]
name = "arbitrary"
-version = "0.4.5"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cb544f1057eaaff4b34f8c4dcf56fc3cd04debd291998405d135017a7c3c0f4"
+checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569"
[[package]]
name = "arc-swap"
@@ -176,9 +162,9 @@ dependencies = [
[[package]]
name = "arrayvec"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "asn1_der"
@@ -214,9 +200,9 @@ dependencies = [
[[package]]
name = "assert_matches"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5"
+checksum = "695579f0f2520f3774bb40461e5adb066459d4e0af4d59d20175484fb8e9edf1"
[[package]]
name = "async-channel"
@@ -231,50 +217,48 @@ dependencies = [
[[package]]
name = "async-executor"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d373d78ded7d0b3fa8039375718cde0aace493f2e34fb60f51cbf567562ca801"
+checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146"
dependencies = [
"async-task",
"concurrent-queue",
"fastrand",
"futures-lite",
- "once_cell 1.4.1",
+ "once_cell",
"vec-arena",
]
[[package]]
name = "async-global-executor"
-version = "1.3.0"
+version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fefeb39da249f4c33af940b779a56723ce45809ef5c54dad84bb538d4ffb6d9e"
+checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04"
dependencies = [
"async-executor",
"async-io",
"futures-lite",
"num_cpus",
- "once_cell 1.4.1",
+ "once_cell",
]
[[package]]
name = "async-io"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38628c78a34f111c5a6b98fc87dfc056cd1590b61afe748b145be4623c56d194"
+checksum = "40a0b2bb8ae20fede194e779150fe283f65a4a08461b496de546ec366b174ad9"
dependencies = [
- "cfg-if",
"concurrent-queue",
"fastrand",
"futures-lite",
"libc",
"log",
- "once_cell 1.4.1",
+ "nb-connect",
+ "once_cell",
"parking",
"polling",
- "socket2",
"vec-arena",
"waker-fn",
- "wepoll-sys-stjepang",
"winapi 0.3.9",
]
@@ -289,15 +273,15 @@ dependencies = [
[[package]]
name = "async-std"
-version = "1.6.5"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9fa76751505e8df1c7a77762f60486f60c71bbd9b8557f4da6ad47d083732ed"
+checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1"
dependencies = [
"async-global-executor",
"async-io",
"async-mutex",
"blocking",
- "crossbeam-utils",
+ "crossbeam-utils 0.8.0",
"futures-channel",
"futures-core",
"futures-io",
@@ -307,8 +291,8 @@ dependencies = [
"log",
"memchr",
"num_cpus",
- "once_cell 1.4.1",
- "pin-project-lite",
+ "once_cell",
+ "pin-project-lite 0.1.11",
"pin-utils",
"slab",
"wasm-bindgen-futures",
@@ -316,9 +300,9 @@ dependencies = [
[[package]]
name = "async-task"
-version = "4.0.2"
+version = "4.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ab27c1aa62945039e44edaeee1dc23c74cc0c303dd5fe0fb462a184f1c3a518"
+checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
[[package]]
name = "async-tls"
@@ -330,14 +314,14 @@ dependencies = [
"futures-io",
"rustls",
"webpki",
- "webpki-roots",
+ "webpki-roots 0.20.0",
]
[[package]]
name = "async-trait"
-version = "0.1.37"
+version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caae68055714ff28740f310927e04f2eba76ff580b16fb18ed90073ee71646f7"
+checksum = "b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0"
dependencies = [
"proc-macro2",
"quote",
@@ -350,7 +334,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
]
[[package]]
@@ -378,21 +362,21 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
[[package]]
name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "backtrace"
-version = "0.3.50"
+version = "0.3.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
+checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
dependencies = [
"addr2line",
- "cfg-if",
+ "cfg-if 1.0.0",
"libc",
"miniz_oxide",
- "object 0.20.0",
+ "object 0.22.0",
"rustc-demangle",
]
@@ -402,12 +386,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
-[[package]]
-name = "base64"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-
[[package]]
name = "base64"
version = "0.12.3"
@@ -438,7 +416,7 @@ checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
dependencies = [
"bitflags",
"cexpr",
- "cfg-if",
+ "cfg-if 0.1.10",
"clang-sys",
"clap",
"env_logger",
@@ -454,21 +432,6 @@ 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"
@@ -487,15 +450,13 @@ dependencies = [
[[package]]
name = "blake2"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471"
+checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4"
dependencies = [
- "byte-tools",
- "byteorder",
"crypto-mac 0.8.0",
"digest 0.9.0",
- "opaque-debug 0.2.3",
+ "opaque-debug 0.3.0",
]
[[package]]
@@ -510,23 +471,12 @@ dependencies = [
[[package]]
name = "blake2b_simd"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.1",
- "constant_time_eq",
-]
-
-[[package]]
-name = "blake2s_simd"
-version = "0.5.10"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
dependencies = [
"arrayref",
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
"constant_time_eq",
]
@@ -549,16 +499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"block-padding 0.2.1",
- "generic-array 0.14.3",
-]
-
-[[package]]
-name = "block-cipher"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10"
-dependencies = [
- "generic-array 0.14.3",
+ "generic-array 0.14.4",
]
[[package]]
@@ -567,7 +508,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80"
dependencies = [
- "generic-array 0.14.3",
+ "generic-array 0.14.4",
]
[[package]]
@@ -596,20 +537,20 @@ dependencies = [
"atomic-waker",
"fastrand",
"futures-lite",
- "once_cell 1.4.1",
+ "once_cell",
]
[[package]]
name = "bs58"
-version = "0.3.1"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
[[package]]
name = "bstr"
-version = "0.2.13"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
+checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
dependencies = [
"lazy_static",
"memchr",
@@ -675,13 +616,12 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
[[package]]
name = "cargo_metadata"
-version = "0.10.1"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052dbdd9db69a339d5fa9ac87bfe2e1319f709119f0345988a597af82bb1011c"
+checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
dependencies = [
- "semver 0.10.0",
+ "semver 0.11.0",
"serde",
- "serde_derive",
"serde_json",
]
@@ -696,9 +636,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.58"
+version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
dependencies = [
"jobserver",
]
@@ -718,26 +658,32 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
[[package]]
name = "chacha20"
-version = "0.4.3"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c0f07ac275808b7bf9a39f2fd013aae1498be83632814c8c4e0bd53f2dc58"
+checksum = "244fbce0d47e97e8ef2f63b81d5e05882cb518c68531eb33194990d7b7e85845"
dependencies = [
- "stream-cipher 0.4.1",
+ "stream-cipher",
"zeroize",
]
[[package]]
name = "chacha20poly1305"
-version = "0.5.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18b0c90556d8e3fec7cf18d84a2f53d27b21288f2fe481b830fadcf809e48205"
+checksum = "9bf18d374d66df0c05cdddd528a7db98f78c28e2519b120855c4f84c5027b1f5"
dependencies = [
"aead",
"chacha20",
"poly1305",
- "stream-cipher 0.4.1",
+ "stream-cipher",
"zeroize",
]
@@ -757,15 +703,17 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.13"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
"js-sys",
+ "libc",
"num-integer",
"num-traits",
"time",
"wasm-bindgen",
+ "winapi 0.3.9",
]
[[package]]
@@ -781,9 +729,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "2.33.1"
+version = "2.33.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
dependencies = [
"ansi_term 0.11.0",
"atty",
@@ -827,39 +775,25 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"wasm-bindgen",
]
[[package]]
name = "console_log"
-version = "0.1.2"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7871d2947441b0fdd8e2bd1ce2a2f75304f896582c0d572162d48290683c48"
+checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
dependencies = [
"log",
"web-sys",
]
[[package]]
-name = "const-random"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02dc82c12dc2ee6e1ded861cf7d582b46f66f796d1b6c93fa28b911ead95da02"
-dependencies = [
- "const-random-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.11"
+name = "const_fn"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc757bbb9544aa296c2ae00c679e81f886b37e28e59097defe0cf524306f6685"
-dependencies = [
- "getrandom 0.2.0",
- "proc-macro-hack",
-]
+checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
[[package]]
name = "constant_time_eq"
@@ -913,7 +847,7 @@ dependencies = [
"log",
"regalloc",
"serde",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"target-lexicon",
"thiserror",
]
@@ -951,7 +885,7 @@ checksum = "2ef419efb4f94ecc02e5d9fbcc910d2bb7f0040e2de570e63a454f883bc891d6"
dependencies = [
"cranelift-codegen",
"log",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"target-lexicon",
]
@@ -983,11 +917,11 @@ dependencies = [
[[package]]
name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
]
[[package]]
@@ -1026,30 +960,65 @@ dependencies = [
"itertools 0.9.0",
]
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.0",
+]
+
[[package]]
name = "crossbeam-deque"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
+ "crossbeam-epoch 0.8.2",
+ "crossbeam-utils 0.7.2",
"maybe-uninit",
]
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch 0.9.0",
+ "crossbeam-utils 0.8.0",
+]
+
[[package]]
name = "crossbeam-epoch"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
dependencies = [
- "autocfg 1.0.0",
- "cfg-if",
- "crossbeam-utils",
+ "autocfg 1.0.1",
+ "cfg-if 0.1.10",
+ "crossbeam-utils 0.7.2",
"lazy_static",
"maybe-uninit",
"memoffset",
- "scopeguard 1.1.0",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "const_fn",
+ "crossbeam-utils 0.8.0",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
]
[[package]]
@@ -1058,8 +1027,8 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
dependencies = [
- "cfg-if",
- "crossbeam-utils",
+ "cfg-if 0.1.10",
+ "crossbeam-utils 0.7.2",
"maybe-uninit",
]
@@ -1069,8 +1038,20 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
dependencies = [
- "autocfg 1.0.0",
- "cfg-if",
+ "autocfg 1.0.1",
+ "cfg-if 0.1.10",
+ "lazy_static",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+dependencies = [
+ "autocfg 1.0.1",
+ "cfg-if 1.0.0",
+ "const_fn",
"lazy_static",
]
@@ -1096,15 +1077,15 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
- "generic-array 0.14.3",
- "subtle 2.2.3",
+ "generic-array 0.14.4",
+ "subtle 2.3.0",
]
[[package]]
name = "csv"
-version = "1.1.3"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
+checksum = "fc4666154fd004af3fd6f1da2e81a96fd5a81927fe8ddb6ecc79e2aa6e138b54"
dependencies = [
"bstr",
"csv-core",
@@ -1133,9 +1114,9 @@ dependencies = [
[[package]]
name = "ctor"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39858aa5bac06462d4dd4b9164848eb81ffc4aa5c479746393598fd193afa227"
+checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
dependencies = [
"quote",
"syn",
@@ -1161,7 +1142,7 @@ dependencies = [
"byteorder",
"digest 0.8.1",
"rand_core 0.5.1",
- "subtle 2.2.3",
+ "subtle 2.3.0",
"zeroize",
]
@@ -1174,21 +1155,21 @@ dependencies = [
"byteorder",
"digest 0.9.0",
"rand_core 0.5.1",
- "subtle 2.2.3",
+ "subtle 2.3.0",
"zeroize",
]
[[package]]
name = "data-encoding"
-version = "2.2.1"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72aa14c04dfae8dd7d8a2b1cb7ca2152618cd01336dbfe704b8dcbf8d41dbd69"
+checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908"
[[package]]
name = "derive_more"
-version = "0.99.9"
+version = "0.99.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76"
+checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
dependencies = [
"proc-macro2",
"quote",
@@ -1216,7 +1197,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
- "generic-array 0.14.3",
+ "generic-array 0.14.4",
]
[[package]]
@@ -1225,7 +1206,16 @@ version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
+ "dirs-sys",
+]
+
+[[package]]
+name = "directories"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
+dependencies = [
"dirs-sys",
]
@@ -1285,15 +1275,15 @@ dependencies = [
[[package]]
name = "dyn-clone"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c53dc3a653e0f64081026e4bf048d48fec9fce90c66e8326ca7292df0ff2d82"
+checksum = "d55796afa1b20c2945ca8eabfc421839f2b766619209f1ede813cf2484f31804"
[[package]]
name = "ed25519"
-version = "1.0.1"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf038a7b6fd7ef78ad3348b63f3a17550877b0e28f8d68bcc94894d1412158bc"
+checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef"
dependencies = [
"signature",
]
@@ -1308,15 +1298,15 @@ dependencies = [
"ed25519",
"rand 0.7.3",
"serde",
- "sha2 0.9.1",
+ "sha2 0.9.2",
"zeroize",
]
[[package]]
name = "either"
-version = "1.6.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "enumflags2"
@@ -1368,9 +1358,9 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eab5ee3df98a279d9b316b1af6ac95422127b1290317e6d18c1743c99418b01"
+checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe"
dependencies = [
"errno-dragonfly",
"libc",
@@ -1387,92 +1377,19 @@ dependencies = [
"libc",
]
-[[package]]
-name = "ethbloom"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71a6567e6fd35589fea0c63b94b4cf2e55573e413901bdbe60ab15cf0e25e5df"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "tiny-keccak",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473aecff686bd8e7b9db0165cbbb53562376b39bf35b427f0c60446a9e1634b0"
-dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "primitive-types",
- "uint",
-]
-
[[package]]
name = "event-listener"
version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
-[[package]]
-name = "evm"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68224b0aa788720ef0c8a23030a4412a021ed73df069a922bee8f0db9ed617e2"
-dependencies = [
- "evm-core",
- "evm-gasometer",
- "evm-runtime",
- "primitive-types",
- "rlp",
- "serde",
- "sha3 0.8.2",
-]
-
-[[package]]
-name = "evm-core"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a040378759577447945c89da1b07d6e33fda32a97a104afe0ec3fa1c382949d"
-dependencies = [
- "primitive-types",
-]
-
-[[package]]
-name = "evm-gasometer"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb5bc051afad6bb0735c82b46656bbdfac41917861307a608b1404a546fec42"
-dependencies = [
- "evm-core",
- "evm-runtime",
- "primitive-types",
-]
-
-[[package]]
-name = "evm-runtime"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7410f5677a52203d3fca02b0eb8f96f9799f3a45cff82946a8ed28379e6b1b04"
-dependencies = [
- "evm-core",
- "primitive-types",
- "sha3 0.8.2",
-]
-
[[package]]
name = "exit-future"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
]
[[package]]
@@ -1529,9 +1446,9 @@ dependencies = [
[[package]]
name = "file-per-thread-logger"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b3937f028664bd0e13df401ba49a4567ccda587420365823242977f06609ed1"
+checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126"
dependencies = [
"env_logger",
"log",
@@ -1544,7 +1461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b"
dependencies = [
"either",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 2.0.2",
"log",
"num-traits",
@@ -1573,11 +1490,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
[[package]]
name = "flate2"
-version = "1.0.16"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
+checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"crc32fast",
"libc",
"libz-sys",
@@ -1597,6 +1514,16 @@ dependencies = [
"parity-scale-codec",
]
+[[package]]
+name = "form_urlencoded"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+dependencies = [
+ "matches",
+ "percent-encoding 2.1.0",
+]
+
[[package]]
name = "frame-benchmarking"
version = "2.0.0"
@@ -1676,13 +1603,13 @@ dependencies = [
"frame-system",
"impl-trait-for-tuples",
"log",
- "once_cell 1.4.1",
+ "once_cell",
"parity-scale-codec",
"parity-util-mem",
"paste 0.1.18",
"pretty_assertions",
"serde",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"sp-api",
"sp-arithmetic",
"sp-core",
@@ -1731,6 +1658,7 @@ version = "2.0.0"
dependencies = [
"frame-metadata",
"frame-support",
+ "frame-system",
"parity-scale-codec",
"pretty_assertions",
"rustversion",
@@ -1797,21 +1725,11 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
[[package]]
name = "fs_extra"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
[[package]]
name = "fuchsia-cprng"
@@ -1837,15 +1755,15 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
[[package]]
name = "futures"
-version = "0.1.29"
+version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
+checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
[[package]]
name = "futures"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
+checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
dependencies = [
"futures-channel",
"futures-core",
@@ -1858,34 +1776,19 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
dependencies = [
"futures-core",
"futures-sink",
]
-[[package]]
-name = "futures-channel-preview"
-version = "0.3.0-alpha.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a"
-dependencies = [
- "futures-core-preview",
-]
-
[[package]]
name = "futures-core"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
-
-[[package]]
-name = "futures-core-preview"
-version = "0.3.0-alpha.19"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
[[package]]
name = "futures-cpupool"
@@ -1893,7 +1796,7 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
"num_cpus",
]
@@ -1903,21 +1806,21 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
dependencies = [
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
"lazy_static",
"log",
"parking_lot 0.9.0",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
"serde",
"serde_json",
]
[[package]]
name = "futures-executor"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
+checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
dependencies = [
"futures-core",
"futures-task",
@@ -1927,30 +1830,30 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
+checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
[[package]]
name = "futures-lite"
-version = "1.11.1"
+version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381a7ad57b1bad34693f63f6f377e1abded7a9c85c9d3eb6771e11c60aaadab9"
+checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658"
dependencies = [
"fastrand",
"futures-core",
"futures-io",
"memchr",
"parking",
- "pin-project-lite",
+ "pin-project-lite 0.1.11",
"waker-fn",
]
[[package]]
name = "futures-macro"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
+checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@@ -1960,17 +1863,17 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
[[package]]
name = "futures-task"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
+checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
dependencies = [
- "once_cell 1.4.1",
+ "once_cell",
]
[[package]]
@@ -1991,11 +1894,11 @@ dependencies = [
[[package]]
name = "futures-util"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
"futures-channel",
"futures-core",
"futures-io",
@@ -2003,25 +1906,13 @@ dependencies = [
"futures-sink",
"futures-task",
"memchr",
- "pin-project 0.4.22",
+ "pin-project 1.0.2",
"pin-utils",
"proc-macro-hack",
"proc-macro-nested",
"slab",
]
-[[package]]
-name = "futures-util-preview"
-version = "0.3.0-alpha.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d"
-dependencies = [
- "futures-channel-preview",
- "futures-core-preview",
- "pin-utils",
- "slab",
-]
-
[[package]]
name = "futures_codec"
version = "0.4.1"
@@ -2029,9 +1920,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
dependencies = [
"bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
"memchr",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
]
[[package]]
@@ -2040,6 +1931,19 @@ version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
+[[package]]
+name = "generator"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustc_version",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "generic-array"
version = "0.12.3"
@@ -2051,35 +1955,33 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.3"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60fb4bb6bba52f78a471264d9a3b7d026cc0af47b22cd2cffbc0b787ca003e63"
+checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
dependencies = [
"typenum",
- "version_check",
]
[[package]]
-name = "getrandom"
-version = "0.1.14"
+name = "generic-array"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
dependencies = [
- "cfg-if",
- "libc",
- "wasi",
- "wasm-bindgen",
+ "typenum",
+ "version_check",
]
[[package]]
name = "getrandom"
-version = "0.2.0"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"libc",
- "wasi",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
]
[[package]]
@@ -2104,9 +2006,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.22.0"
+version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
[[package]]
name = "glob"
@@ -2116,9 +2018,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "globset"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120"
+checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a"
dependencies = [
"aho-corasick",
"bstr",
@@ -2149,7 +2051,7 @@ dependencies = [
"byteorder",
"bytes 0.4.12",
"fnv",
- "futures 0.1.29",
+ "futures 0.1.30",
"http 0.1.21",
"indexmap",
"log",
@@ -2160,9 +2062,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53"
+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
dependencies = [
"bytes 0.5.6",
"fnv",
@@ -2172,9 +2074,10 @@ dependencies = [
"http 0.2.1",
"indexmap",
"slab",
- "tokio 0.2.22",
+ "tokio 0.2.23",
"tokio-util",
"tracing",
+ "tracing-futures",
]
[[package]]
@@ -2185,9 +2088,9 @@ checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
[[package]]
name = "handlebars"
-version = "3.5.0"
+version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcd1b5399b9884f9ae18b5d4105d180720c8f602aeb73d3ceae9d6b1d13a5fa7"
+checksum = "2764f9796c0ddca4b82c07f25dd2cb3db30b9a8f47940e78e1c883d9e95c3db9"
dependencies = [
"log",
"pest",
@@ -2214,32 +2117,21 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
-dependencies = [
- "byteorder",
- "scopeguard 0.3.3",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.6.3"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
+checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
dependencies = [
- "ahash 0.2.19",
- "autocfg 0.1.7",
+ "ahash 0.3.8",
+ "autocfg 1.0.1",
]
[[package]]
name = "hashbrown"
-version = "0.8.1"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
dependencies = [
- "ahash 0.3.8",
- "autocfg 1.0.0",
+ "ahash 0.4.6",
]
[[package]]
@@ -2253,9 +2145,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
dependencies = [
"libc",
]
@@ -2288,6 +2180,16 @@ dependencies = [
"digest 0.8.1",
]
+[[package]]
+name = "hmac"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
+dependencies = [
+ "crypto-mac 0.8.0",
+ "digest 0.9.0",
+]
+
[[package]]
name = "hmac-drbg"
version = "0.2.0"
@@ -2296,14 +2198,14 @@ checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
dependencies = [
"digest 0.8.1",
"generic-array 0.12.3",
- "hmac",
+ "hmac 0.7.1",
]
[[package]]
name = "honggfuzz"
-version = "0.5.49"
+version = "0.5.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832bac18a82ec7d6c21887daa8616b238fe90d5d5e762d0d4b9372cdaa9e097f"
+checksum = "6f085725a5828d7e959f014f624773094dfe20acc91be310ef106923c30594bc"
dependencies = [
"arbitrary",
"lazy_static",
@@ -2339,7 +2241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"http 0.1.21",
"tokio-buf",
]
@@ -2360,6 +2262,12 @@ version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+[[package]]
+name = "httpdate"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+
[[package]]
name = "humantime"
version = "1.3.0"
@@ -2376,7 +2284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"futures-cpupool",
"h2 0.1.26",
"http 0.1.21",
@@ -2390,7 +2298,7 @@ dependencies = [
"time",
"tokio 0.1.22",
"tokio-buf",
- "tokio-executor 0.1.10",
+ "tokio-executor",
"tokio-io",
"tokio-reactor",
"tokio-tcp",
@@ -2401,23 +2309,23 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.13.7"
+version = "0.13.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb"
+checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
dependencies = [
"bytes 0.5.6",
"futures-channel",
"futures-core",
"futures-util",
- "h2 0.2.6",
+ "h2 0.2.7",
"http 0.2.1",
"http-body 0.3.1",
"httparse",
+ "httpdate",
"itoa",
- "pin-project 0.4.22",
+ "pin-project 1.0.2",
"socket2",
- "time",
- "tokio 0.2.22",
+ "tokio 0.2.23",
"tower-service",
"tracing",
"want 0.3.0",
@@ -2432,11 +2340,11 @@ dependencies = [
"bytes 0.5.6",
"ct-logs",
"futures-util",
- "hyper 0.13.7",
+ "hyper 0.13.9",
"log",
"rustls",
"rustls-native-certs",
- "tokio 0.2.22",
+ "tokio 0.2.23",
"tokio-rustls",
"webpki",
]
@@ -2465,9 +2373,9 @@ dependencies = [
[[package]]
name = "if-addrs"
-version = "0.6.4"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12906406f12abf5569643c46b29aec78313dc1537b17dd5c5250169790c4db9"
+checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48"
dependencies = [
"if-addrs-sys",
"libc",
@@ -2476,9 +2384,9 @@ dependencies = [
[[package]]
name = "if-addrs-sys"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e2556f16544202bcfe0aa5d20a01a6b815f736b136b3ad76dc547ee6b5bb1df"
+checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea"
dependencies = [
"cc",
"libc",
@@ -2493,15 +2401,6 @@ dependencies = [
"parity-scale-codec",
]
-[[package]]
-name = "impl-rlp"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5"
-dependencies = [
- "rlp",
-]
-
[[package]]
name = "impl-serde"
version = "0.3.1"
@@ -2524,26 +2423,32 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.5.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
+checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
dependencies = [
- "autocfg 1.0.0",
- "hashbrown 0.8.1",
+ "autocfg 1.0.1",
+ "hashbrown 0.9.1",
"serde",
]
[[package]]
name = "instant"
-version = "0.1.6"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
+checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
+dependencies = [
+ "cfg-if 1.0.0",
+]
[[package]]
name = "integer-sqrt"
-version = "0.1.3"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65877bf7d44897a473350b1046277941cee20b263397e90869c50b6e766088b"
+checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
+dependencies = [
+ "num-traits",
+]
[[package]]
name = "intervalier"
@@ -2551,7 +2456,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 2.0.2",
]
@@ -2611,9 +2516,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.39"
+version = "0.3.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa5a448de267e7358beaf4a5d849518fe9a0c13fce7afd44b06e68550e5562a7"
+checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
dependencies = [
"wasm-bindgen",
]
@@ -2625,7 +2530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7"
dependencies = [
"failure",
- "futures 0.1.29",
+ "futures 0.1.30",
"hyper 0.12.35",
"jsonrpc-core",
"jsonrpc-pubsub",
@@ -2641,7 +2546,7 @@ version = "15.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa"
dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
"log",
"serde",
"serde_derive",
@@ -2784,7 +2689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0315ef2f688e33844400b31f11c263f2b3dc21d8b9355c6891c5f185fae43f9a"
dependencies = [
"parity-util-mem",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
]
[[package]]
@@ -2813,7 +2718,7 @@ dependencies = [
"parking_lot 0.10.2",
"regex",
"rocksdb",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
]
[[package]]
@@ -2822,7 +2727,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2701a1369d6ea4f1b9f606db46e5e2a4a8e47f22530a07823d653f85ab1f6c34"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"js-sys",
"kvdb",
"kvdb-memorydb",
@@ -2841,9 +2746,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lazycell"
-version = "1.2.1"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "leb128"
@@ -2853,9 +2758,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
[[package]]
name = "libc"
-version = "0.2.79"
+version = "0.2.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
[[package]]
name = "libloading"
@@ -2875,13 +2780,13 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
[[package]]
name = "libp2p"
-version = "0.29.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021f703bfef6e3da78ef9828c8a244d639b8d57eedf58360922aca5ff69dfdcd"
+checksum = "724846a3194368fefcac7ebdab12e01b8ac382e3efe399ddbd28851ab34f396f"
dependencies = [
"atomic",
"bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
"lazy_static",
"libp2p-core",
"libp2p-core-derive",
@@ -2904,26 +2809,26 @@ dependencies = [
"libp2p-wasm-ext",
"libp2p-websocket",
"libp2p-yamux",
- "multihash",
"parity-multiaddr",
- "parking_lot 0.11.0",
- "pin-project 1.0.1",
- "smallvec 1.4.1",
+ "parking_lot 0.11.1",
+ "pin-project 1.0.2",
+ "smallvec 1.5.0",
"wasm-timer",
]
[[package]]
name = "libp2p-core"
-version = "0.23.1"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3960524389409633550567e8a9e0684d25a33f4f8408887ff897dd9fdfbdb771"
+checksum = "cc9c96d3a606a696a3a6c0ad3c3352c57bda2082ec9090930f1bd9daf787039f"
dependencies = [
"asn1_der",
"bs58",
+ "bytes 0.5.6",
"ed25519-dalek",
"either",
"fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"lazy_static",
"libsecp256k1",
@@ -2931,26 +2836,26 @@ dependencies = [
"multihash",
"multistream-select",
"parity-multiaddr",
- "parking_lot 0.11.0",
- "pin-project 1.0.1",
+ "parking_lot 0.11.1",
+ "pin-project 1.0.2",
"prost",
"prost-build",
"rand 0.7.3",
"ring",
"rw-stream-sink",
- "sha2 0.9.1",
- "smallvec 1.4.1",
+ "sha2 0.9.2",
+ "smallvec 1.5.0",
"thiserror",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
"void",
"zeroize",
]
[[package]]
name = "libp2p-core-derive"
-version = "0.20.2"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213"
+checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156"
dependencies = [
"quote",
"syn",
@@ -2958,55 +2863,55 @@ dependencies = [
[[package]]
name = "libp2p-deflate"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567962c5c5f8a1282979441300e1739ba939024010757c3dbfab4d462189df77"
+checksum = "5a579d7dd506d0620ba88ccc1754436b7de35ed6c884234f9a226bbfce382640"
dependencies = [
"flate2",
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
]
[[package]]
name = "libp2p-dns"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436280f5fe21a58fcaff82c2606945579241f32bc0eaf2d39321aa4624a66e7f"
+checksum = "15dea5933f570844d7b5222b12b58f7bd52e9ca38cd65a1bd4f35341f053f012"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
"log",
]
[[package]]
name = "libp2p-floodsub"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc175613c5915332fd6458895407ec242ea055ae3b107a586626d5e3349350a"
+checksum = "23070a0838bd9a8adb27e6eba477eeb650c498f9d139383dd0135d20a8170253"
dependencies = [
"cuckoofilter",
"fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
"libp2p-swarm",
"log",
"prost",
"prost-build",
"rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
]
[[package]]
name = "libp2p-gossipsub"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d500ad89ba14de4d18bebdff61a0ce3e769f1c5c5a95026c5da90187e5fff5c9"
+checksum = "65e8f3aa0906fbad435dac23c177eef3cdfaaf62609791bd7f54f8553edcfdf9"
dependencies = [
"base64 0.13.0",
"byteorder",
"bytes 0.5.6",
"fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures_codec",
"hex_fmt",
"libp2p-core",
@@ -3016,124 +2921,123 @@ dependencies = [
"prost",
"prost-build",
"rand 0.7.3",
- "sha2 0.9.1",
- "smallvec 1.4.1",
- "unsigned-varint 0.5.1",
+ "sha2 0.9.2",
+ "smallvec 1.5.0",
+ "unsigned-varint",
"wasm-timer",
]
[[package]]
name = "libp2p-identify"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b90b350e37f398b73d778bd94422f4e6a3afa2c1582742ce2446b8a0dba787"
+checksum = "802fb973a7e0dde3fb9a2113a62bad90338ebe01983b706e1d576d0c2af93cda"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
"libp2p-swarm",
"log",
"prost",
"prost-build",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"wasm-timer",
]
[[package]]
name = "libp2p-kad"
-version = "0.24.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb78341f114bf686d5fe50b33ff1a804d88fb326c0d39ee1c22db4346b21fc27"
+checksum = "6506b7b7982f7626fc96a91bc61be4b1fe7ae9ac23824f0ecefcce21cb39238c"
dependencies = [
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
"bytes 0.5.6",
"either",
"fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures_codec",
"libp2p-core",
"libp2p-swarm",
"log",
- "multihash",
"prost",
"prost-build",
"rand 0.7.3",
- "sha2 0.9.1",
- "smallvec 1.4.1",
+ "sha2 0.9.2",
+ "smallvec 1.5.0",
"uint",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
"void",
"wasm-timer",
]
[[package]]
name = "libp2p-mdns"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b575514fce0a3ccbd065d6aa377bd4d5102001b05c1a22a5eee49c450254ef0f"
+checksum = "4458ec36b5ab2662fb4d5c8bb9b6e1591da0ab6efe8881c7a7670ef033bc8937"
dependencies = [
"async-std",
"data-encoding",
"dns-parser",
"either",
- "futures 0.3.5",
+ "futures 0.3.8",
"lazy_static",
"libp2p-core",
"libp2p-swarm",
"log",
"net2",
"rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"void",
"wasm-timer",
]
[[package]]
name = "libp2p-mplex"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "696c8ee8b42496690b88b0de84a96387caf6e09880bcc8e794bb88afa054e995"
+checksum = "ae2132b14045009b0f8e577a06e1459592ef0a89dedc58f3d4baf4eac956837b"
dependencies = [
"bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures_codec",
"libp2p-core",
"log",
"nohash-hasher",
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
"rand 0.7.3",
- "smallvec 1.4.1",
- "unsigned-varint 0.5.1",
+ "smallvec 1.5.0",
+ "unsigned-varint",
]
[[package]]
name = "libp2p-noise"
-version = "0.25.0"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93c77142e3e5b18fefa7d267305c777c9cbe9b2232ec489979390100bebcc1e6"
+checksum = "b9610a524bef4db383cd96b4ec3ec4722eafa72c7242fa89990b74166760583d"
dependencies = [
"bytes 0.5.6",
"curve25519-dalek 3.0.0",
- "futures 0.3.5",
+ "futures 0.3.8",
"lazy_static",
"libp2p-core",
"log",
"prost",
"prost-build",
"rand 0.7.3",
- "sha2 0.9.1",
+ "sha2 0.9.2",
"snow",
"static_assertions",
- "x25519-dalek 1.1.0",
+ "x25519-dalek",
"zeroize",
]
[[package]]
name = "libp2p-ping"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7257135609e8877f4d286935cbe1e572b2018946881c3e7f63054577074a7ee7"
+checksum = "659adf89356e04f65398bb74ee791b269e63da9e41b37f8dc19eaacd12487bfe"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
"libp2p-swarm",
"log",
@@ -3144,18 +3048,18 @@ dependencies = [
[[package]]
name = "libp2p-plaintext"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c88d59ba3e710a8c8e0535cb4a52e9e46534924cbbea4691f8c3aaad17b58c61"
+checksum = "96dfe26270c91d4ff095030d1fcadd602f3fd84968ebd592829916d0715798a6"
dependencies = [
"bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures_codec",
"libp2p-core",
"log",
"prost",
"prost-build",
- "unsigned-varint 0.5.1",
+ "unsigned-varint",
"void",
]
@@ -3165,58 +3069,58 @@ version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96b3c2d5d26a9500e959a0e19743897239a6c4be78dadf99b70414301a70c006"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"log",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
"rand 0.7.3",
"salsa20",
- "sha3 0.9.1",
+ "sha3",
]
[[package]]
name = "libp2p-request-response"
-version = "0.4.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02ba1aa5727ccc118c09ba5111480873f2fe5608cb304e258fd12c173ecf27c9"
+checksum = "1e952dcc9d2d7e7e45ae8bfcff255723091bd43e3e9a7741a0af8a17fe55b3ed"
dependencies = [
"async-trait",
"bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
"libp2p-swarm",
"log",
- "lru 0.6.0",
+ "lru",
"minicbor",
"rand 0.7.3",
- "smallvec 1.4.1",
- "unsigned-varint 0.5.1",
+ "smallvec 1.5.0",
+ "unsigned-varint",
"wasm-timer",
]
[[package]]
name = "libp2p-swarm"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffa6fa33b16956b8a58afbfebe1406866011a1ab8960765bd36868952d7be6a1"
+checksum = "de333c483f27d02ecf7b6cef814a36f5e1876f15139eefb00225c405350e1c22"
dependencies = [
"either",
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
"log",
"rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"void",
"wasm-timer",
]
[[package]]
name = "libp2p-tcp"
-version = "0.23.0"
+version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0b6f4ef48d9493607fae069deecce0579320a1f3de6cb056770b151018a9a5"
+checksum = "bc28c9ad6dc43f4c3950411cf808639d90307a076330e7996e5e94e70279bde0"
dependencies = [
"async-std",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"if-addrs",
"ipnet",
@@ -3227,23 +3131,23 @@ dependencies = [
[[package]]
name = "libp2p-uds"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945bed3c989a1b290b5a0d4e8fa6e44e01840efb9a5ab3f0d3d174f0e451ac0e"
+checksum = "9d821208d4b9af4b293a56dde470edd9f9fac8bb94a51f4f5327cc29a471b3f3"
dependencies = [
"async-std",
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
"log",
]
[[package]]
name = "libp2p-wasm-ext"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66518a4455e15c283637b4d7b579aef928b75a3fc6c50a41e7e6b9fa86672ca0"
+checksum = "1e6ef400b231ba78e866b860445480ca21ee447e03034138c6d57cf2969d6bf4"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"js-sys",
"libp2p-core",
"parity-send-wrapper",
@@ -3253,33 +3157,33 @@ dependencies = [
[[package]]
name = "libp2p-websocket"
-version = "0.24.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc561870477523245efaaea1b6b743c70115f10c670e62bcbbe4d3153be5f0c"
+checksum = "a5736e2fccdcea6e728bbaf903bddc113be223313ce2c756ad9fe43b5a2b0f06"
dependencies = [
"async-tls",
"either",
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
"log",
"quicksink",
"rustls",
"rw-stream-sink",
"soketto",
- "url 2.1.1",
+ "url 2.2.0",
"webpki",
- "webpki-roots",
+ "webpki-roots 0.21.0",
]
[[package]]
name = "libp2p-yamux"
-version = "0.26.0"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c0c9b6ef7a168c2ae854170b0b6b77550599afe06cc3ac390eb45c5d9c7110"
+checksum = "3be7ac000fa3e42ac09a6e658e48de34ac8ef9fff64a4e6e6b08dcc8f4b0e5f6"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p-core",
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
"thiserror",
"yamux",
]
@@ -3308,18 +3212,17 @@ dependencies = [
"hmac-drbg",
"rand 0.7.3",
"sha2 0.8.2",
- "subtle 2.2.3",
+ "subtle 2.3.0",
"typenum",
]
[[package]]
name = "libz-sys"
-version = "1.0.25"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
+checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
dependencies = [
"cc",
- "libc",
"pkg-config",
"vcpkg",
]
@@ -3341,20 +3244,19 @@ dependencies = [
[[package]]
name = "linregress"
-version = "0.1.7"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9290cf6f928576eeb9c096c6fad9d8d452a0a1a70a2bbffa6e36064eedc0aac9"
+checksum = "0d0ad4b5cc8385a881c561fac3501353d63d2a2b7a357b5064d71815c9a92724"
dependencies = [
- "failure",
"nalgebra",
"statrs",
]
[[package]]
name = "lite-json"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73e713a23ac6e12074c9e96ef2dfb770921e0cb9244c093bd38424209e0e523"
+checksum = "0460d985423a026b4d9b828a7c6eed1bcf606f476322f3f9b507529686a61715"
dependencies = [
"lite-parser",
]
@@ -3368,31 +3270,22 @@ dependencies = [
"paste 0.1.18",
]
-[[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 1.1.0",
+ "scopeguard",
]
[[package]]
name = "lock_api"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
dependencies = [
- "scopeguard 1.1.0",
+ "scopeguard",
]
[[package]]
@@ -3401,34 +3294,29 @@ version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "lru"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237"
-dependencies = [
- "hashbrown 0.6.3",
+ "cfg-if 0.1.10",
]
[[package]]
-name = "lru"
-version = "0.5.3"
+name = "loom"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c456c123957de3a220cd03786e0d86aa542a88b46029973b542f426da6ef34"
+checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed"
dependencies = [
- "hashbrown 0.6.3",
+ "cfg-if 0.1.10",
+ "generator",
+ "scoped-tls",
+ "serde",
+ "serde_json",
]
[[package]]
name = "lru"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111b945ac72ec09eb7bc62a0fbdc3cc6e80555a7245f52a69d3921a75b53b153"
+checksum = "be716eb6878ca2263eb5d00a781aa13264a794f519fe6af4fbb2668b2d5441c0"
dependencies = [
- "hashbrown 0.8.1",
+ "hashbrown 0.9.1",
]
[[package]]
@@ -3484,9 +3372,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
[[package]]
name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "memmap"
@@ -3500,11 +3388,11 @@ dependencies = [
[[package]]
name = "memoffset"
-version = "0.5.5"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
+checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
]
[[package]]
@@ -3514,7 +3402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36f36ddb0b2cdc25d38babba472108798e3477f02be5165f038c5e393e50c57a"
dependencies = [
"hash-db",
- "hashbrown 0.8.1",
+ "hashbrown 0.8.2",
"parity-util-mem",
]
@@ -3538,18 +3426,18 @@ dependencies = [
[[package]]
name = "minicbor"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2ef6aa869726518c5d8206fa5d1337bda8a0442807611be617891c018fa781"
+checksum = "0164190d1771b1458c3742075b057ed55d25cd9dfb930aade99315a1eb1fe12d"
dependencies = [
"minicbor-derive",
]
[[package]]
name = "minicbor-derive"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b3569c0dbfff1b8d5f1434c642b67f5bf81c0f354a3f5f8f180b549dba3c07c"
+checksum = "2e071b3159835ee91df62dbdbfdd7ec366b7ea77c838f43aff4acda6b61bcfb9"
dependencies = [
"proc-macro2",
"quote",
@@ -3558,11 +3446,12 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.4.0"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
+checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
dependencies = [
"adler",
+ "autocfg 1.0.1",
]
[[package]]
@@ -3571,7 +3460,7 @@ version = "0.6.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"fuchsia-zircon",
"fuchsia-zircon-sys",
"iovec",
@@ -3604,7 +3493,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
dependencies = [
"log",
"mio",
- "miow 0.3.5",
+ "miow 0.3.6",
"winapi 0.3.9",
]
@@ -3633,9 +3522,9 @@ dependencies = [
[[package]]
name = "miow"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
dependencies = [
"socket2",
"winapi 0.3.9",
@@ -3649,53 +3538,66 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
[[package]]
name = "multihash"
-version = "0.11.2"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f75db05d738947aa5389863aadafbcf2e509d7ba099dc2ddcdf4fc66bf7a9e03"
+checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe"
dependencies = [
- "blake2b_simd",
- "blake2s_simd",
- "digest 0.8.1",
- "sha-1",
- "sha2 0.8.2",
- "sha3 0.8.2",
- "unsigned-varint 0.3.3",
+ "digest 0.9.0",
+ "generic-array 0.14.4",
+ "multihash-derive",
+ "sha2 0.9.2",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "multihash-derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
]
[[package]]
name = "multimap"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce"
+checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
[[package]]
name = "multistream-select"
-version = "0.8.4"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a6aa6e32fbaf16795142335967214b8564a7a4661eb6dc846ef343a6e00ac1"
+checksum = "dda822043bba2d6da31c4e14041f9794f8fb130a5959289038d0b809d8888614"
dependencies = [
"bytes 0.5.6",
- "futures 0.3.5",
+ "futures 0.3.8",
"log",
- "pin-project 1.0.1",
- "smallvec 1.4.1",
- "unsigned-varint 0.5.1",
+ "pin-project 1.0.2",
+ "smallvec 1.5.0",
+ "unsigned-varint",
]
[[package]]
name = "nalgebra"
-version = "0.18.1"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2"
+checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486"
dependencies = [
- "alga",
"approx",
- "generic-array 0.12.3",
+ "generic-array 0.13.2",
"matrixmultiply",
"num-complex",
"num-rational",
"num-traits",
- "rand 0.6.5",
+ "rand 0.7.3",
+ "rand_distr",
+ "simba",
"typenum",
]
@@ -3708,13 +3610,23 @@ dependencies = [
"rand 0.3.23",
]
+[[package]]
+name = "nb-connect"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "net2"
-version = "0.2.34"
+version = "0.2.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
+checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"libc",
"winapi 0.3.9",
]
@@ -3727,7 +3639,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
dependencies = [
"bitflags",
"cc",
- "cfg-if",
+ "cfg-if 0.1.10",
"libc",
"void",
]
@@ -3738,7 +3650,7 @@ version = "0.8.0"
dependencies = [
"derive_more",
"fs_extra",
- "futures 0.3.5",
+ "futures 0.3.8",
"hash-db",
"hex",
"kvdb",
@@ -3774,7 +3686,7 @@ dependencies = [
name = "node-browser-testing"
version = "2.0.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"jsonrpc-core",
"libp2p",
@@ -3795,7 +3707,7 @@ dependencies = [
"frame-benchmarking-cli",
"frame-support",
"frame-system",
- "futures 0.3.5",
+ "futures 0.3.8",
"hex-literal",
"log",
"nix",
@@ -3962,7 +3874,7 @@ dependencies = [
name = "node-rpc-client"
version = "2.0.0"
dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
"hyper 0.12.35",
"jsonrpc-core-client",
"log",
@@ -3983,6 +3895,7 @@ dependencies = [
"frame-system-rpc-runtime-api",
"hex-literal",
"node-primitives",
+ "pallet-assets",
"pallet-authority-discovery",
"pallet-authorship",
"pallet-babe",
@@ -4035,7 +3948,7 @@ dependencies = [
"sp-transaction-pool",
"sp-version",
"static_assertions",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
]
[[package]]
@@ -4106,7 +4019,7 @@ dependencies = [
"sp-std",
"sp-transaction-pool",
"sp-version",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
]
[[package]]
@@ -4117,7 +4030,7 @@ dependencies = [
"frame-support",
"frame-system",
"fs_extra",
- "futures 0.3.5",
+ "futures 0.3.8",
"log",
"node-executor",
"node-primitives",
@@ -4181,7 +4094,7 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
"num-integer",
"num-traits",
]
@@ -4192,17 +4105,17 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
"num-traits",
]
[[package]]
name = "num-integer"
-version = "0.1.43"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
"num-traits",
]
@@ -4212,7 +4125,7 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
"num-bigint",
"num-integer",
"num-traits",
@@ -4220,11 +4133,11 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
"libm",
]
@@ -4256,21 +4169,18 @@ dependencies = [
]
[[package]]
-name = "once_cell"
-version = "0.1.8"
+name = "object"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37"
-dependencies = [
- "parking_lot 0.7.1",
-]
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
[[package]]
name = "once_cell"
-version = "1.4.1"
+version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
dependencies = [
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
]
[[package]]
@@ -4319,8 +4229,10 @@ dependencies = [
name = "pallet-assets"
version = "2.0.0"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
+ "pallet-balances",
"parity-scale-codec",
"serde",
"sp-core",
@@ -4478,7 +4390,7 @@ dependencies = [
"pallet-timestamp",
"parity-scale-codec",
"parity-wasm 0.41.0",
- "paste 1.0.0",
+ "paste 1.0.3",
"pretty_assertions",
"pwasm-utils 0.16.0",
"rand 0.7.3",
@@ -4597,28 +4509,6 @@ dependencies = [
"substrate-test-utils",
]
-[[package]]
-name = "pallet-evm"
-version = "2.0.0"
-dependencies = [
- "evm",
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "pallet-balances",
- "pallet-timestamp",
- "parity-scale-codec",
- "primitive-types",
- "ripemd160",
- "rlp",
- "serde",
- "sha3 0.8.2",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
[[package]]
name = "pallet-example"
version = "2.0.0"
@@ -5099,7 +4989,7 @@ dependencies = [
"pallet-transaction-payment-rpc-runtime-api",
"parity-scale-codec",
"serde",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"sp-core",
"sp-io",
"sp-runtime",
@@ -5205,9 +5095,9 @@ dependencies = [
[[package]]
name = "parity-multiaddr"
-version = "0.9.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c7ad66970bbab360c97179b60906e2dc4aef1f7fca8ab4e5c5db8c97b16814a"
+checksum = "2f51a30667591b14f96068b2d12f1306d07a41ebd98239d194356d4d9707ac16"
dependencies = [
"arrayref",
"bs58",
@@ -5217,17 +5107,17 @@ dependencies = [
"percent-encoding 2.1.0",
"serde",
"static_assertions",
- "unsigned-varint 0.5.1",
- "url 2.1.1",
+ "unsigned-varint",
+ "url 2.2.0",
]
[[package]]
name = "parity-scale-codec"
-version = "1.3.4"
+version = "1.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d38aeaffc032ec69faa476b3caaca8d4dd7f3f798137ff30359e5c7869ceb6"
+checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861"
dependencies = [
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
"bitvec",
"byte-slice-cast",
"parity-scale-codec-derive",
@@ -5236,9 +5126,9 @@ dependencies = [
[[package]]
name = "parity-scale-codec-derive"
-version = "1.2.1"
+version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd20ff7e0399b274a5f5bb37b712fccb5b3a64b9128200d1c3cc40fe709cb073"
+checksum = "198db82bb1c18fc00176004462dd809b2a6d851669550aa17af6dacd21ae0c14"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5259,11 +5149,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"libc",
"log",
"mio-named-pipes",
- "miow 0.3.5",
+ "miow 0.3.6",
"rand 0.7.3",
"tokio 0.1.22",
"tokio-named-pipes",
@@ -5277,15 +5167,13 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c"
dependencies = [
- "cfg-if",
- "ethereum-types",
- "hashbrown 0.8.1",
+ "cfg-if 0.1.10",
+ "hashbrown 0.8.2",
"impl-trait-for-tuples",
- "lru 0.5.3",
"parity-util-mem-derive",
"parking_lot 0.10.2",
"primitive-types",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"winapi 0.3.9",
]
@@ -5328,9 +5216,9 @@ dependencies = [
"mio",
"mio-extras",
"rand 0.7.3",
- "sha-1",
+ "sha-1 0.8.2",
"slab",
- "url 2.1.1",
+ "url 2.2.0",
]
[[package]]
@@ -5339,16 +5227,6 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
-[[package]]
-name = "parking_lot"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
-dependencies = [
- "lock_api 0.1.5",
- "parking_lot_core 0.4.0",
-]
-
[[package]]
name = "parking_lot"
version = "0.9.0"
@@ -5372,35 +5250,22 @@ dependencies = [
[[package]]
name = "parking_lot"
-version = "0.11.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
dependencies = [
"instant",
- "lock_api 0.4.1",
+ "lock_api 0.4.2",
"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]]
name = "parking_lot_core"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"cloudabi 0.0.3",
"libc",
"redox_syscall",
@@ -5415,11 +5280,11 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"cloudabi 0.0.3",
"libc",
"redox_syscall",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"winapi 0.3.9",
]
@@ -5429,12 +5294,12 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"cloudabi 0.1.0",
"instant",
"libc",
"redox_syscall",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"winapi 0.3.9",
]
@@ -5450,9 +5315,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ddc8e145de01d9180ac7b78b9676f95a9c2447f6a88b2c2a04702211bc5d71"
+checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9"
[[package]]
name = "paste-impl"
@@ -5471,7 +5336,15 @@ checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
dependencies = [
"byteorder",
"crypto-mac 0.7.0",
- "rayon",
+]
+
+[[package]]
+name = "pbkdf2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
+dependencies = [
+ "crypto-mac 0.8.0",
]
[[package]]
@@ -5538,7 +5411,7 @@ checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
dependencies = [
"maplit",
"pest",
- "sha-1",
+ "sha-1 0.8.2",
]
[[package]]
@@ -5553,27 +5426,27 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "0.4.22"
+version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"
dependencies = [
- "pin-project-internal 0.4.22",
+ "pin-project-internal 0.4.27",
]
[[package]]
name = "pin-project"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
+checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
dependencies = [
- "pin-project-internal 1.0.1",
+ "pin-project-internal 1.0.2",
]
[[package]]
name = "pin-project-internal"
-version = "0.4.22"
+version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
dependencies = [
"proc-macro2",
"quote",
@@ -5582,9 +5455,9 @@ dependencies = [
[[package]]
name = "pin-project-internal"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
+checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
dependencies = [
"proc-macro2",
"quote",
@@ -5593,9 +5466,15 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.1.7"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
[[package]]
name = "pin-utils"
@@ -5605,9 +5484,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
[[package]]
name = "platforms"
@@ -5629,41 +5508,41 @@ dependencies = [
[[package]]
name = "polling"
-version = "1.1.0"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0720e0b9ea9d52451cf29d3413ba8a9303f8815d9d9653ef70e03ff73e65566"
+checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"libc",
"log",
- "wepoll-sys-stjepang",
+ "wepoll-sys",
"winapi 0.3.9",
]
[[package]]
name = "poly1305"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b42192ab143ed7619bf888a7f9c6733a9a2153b218e2cd557cfdb52fbf9bb1"
+checksum = "22ce46de8e53ee414ca4d02bfefac75d8c12fba948b76622a40b4be34dfce980"
dependencies = [
"universal-hash",
]
[[package]]
name = "polyval"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a50142b55ab3ed0e9f68dfb3709f1d90d29da24e91033f28b96330643107dc"
+checksum = "a5884790f1ce3553ad55fec37b5aaac5882e0e845a2612df744d6c85c9bf046c"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"universal-hash",
]
[[package]]
name = "ppv-lite86"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "predicates"
@@ -5705,13 +5584,12 @@ dependencies = [
[[package]]
name = "primitive-types"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8"
+checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809"
dependencies = [
"fixed-hash",
"impl-codec",
- "impl-rlp",
"impl-serde",
"uint",
]
@@ -5727,9 +5605,9 @@ dependencies = [
[[package]]
name = "proc-macro-error"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
@@ -5740,22 +5618,20 @@ dependencies = [
[[package]]
name = "proc-macro-error-attr"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2",
"quote",
- "syn",
- "syn-mid",
"version_check",
]
[[package]]
name = "proc-macro-hack"
-version = "0.5.16"
+version = "0.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
[[package]]
name = "proc-macro-nested"
@@ -5778,10 +5654,10 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"fnv",
"lazy_static",
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
"regex",
"thiserror",
]
@@ -5891,7 +5767,7 @@ checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858"
dependencies = [
"futures-core",
"futures-sink",
- "pin-project-lite",
+ "pin-project-lite 0.1.11",
]
[[package]]
@@ -5932,19 +5808,6 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-dependencies = [
- "cloudabi 0.0.3",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "winapi 0.3.9",
-]
-
[[package]]
name = "rand"
version = "0.6.5"
@@ -5970,7 +5833,7 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
dependencies = [
- "getrandom 0.1.14",
+ "getrandom",
"libc",
"rand_chacha 0.2.2",
"rand_core 0.5.1",
@@ -6019,7 +5882,16 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [
- "getrandom 0.1.14",
+ "getrandom",
+]
+
+[[package]]
+name = "rand_distr"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2"
+dependencies = [
+ "rand 0.7.3",
]
[[package]]
@@ -6122,25 +5994,25 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.3.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
dependencies = [
- "autocfg 1.0.0",
- "crossbeam-deque",
+ "autocfg 1.0.1",
+ "crossbeam-deque 0.8.0",
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
-version = "1.7.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
dependencies = [
- "crossbeam-deque",
- "crossbeam-queue",
- "crossbeam-utils",
+ "crossbeam-channel",
+ "crossbeam-deque 0.8.0",
+ "crossbeam-utils 0.8.0",
"lazy_static",
"num_cpus",
]
@@ -6162,29 +6034,29 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "redox_users"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
dependencies = [
- "getrandom 0.1.14",
+ "getrandom",
"redox_syscall",
"rust-argon2",
]
[[package]]
name = "ref-cast"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745c1787167ddae5569661d5ffb8b25ae5fedbf46717eaa92d652221cec72623"
+checksum = "e17626b2f4bcf35b84bf379072a66e28cfe5c3c6ae58b38e4914bb8891dabece"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d21b475ab879ef0e315ad99067fa25778c3b0377f57f1b00207448dac1a3144"
+checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72"
dependencies = [
"proc-macro2",
"quote",
@@ -6199,14 +6071,14 @@ checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8"
dependencies = [
"log",
"rustc-hash",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
]
[[package]]
name = "regex"
-version = "1.3.9"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
dependencies = [
"aho-corasick",
"memchr",
@@ -6226,9 +6098,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
[[package]]
name = "region"
@@ -6251,45 +6123,25 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "retain_mut"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e005d658ad26eacc2b6c506dfde519f4e277e328d0eb3379ca61647d70a8f531"
-
-[[package]]
-name = "ring"
-version = "0.16.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4"
-dependencies = [
- "cc",
- "libc",
- "once_cell 1.4.1",
- "spin",
- "untrusted",
- "web-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ripemd160"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
+[[package]]
+name = "retain_mut"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e005d658ad26eacc2b6c506dfde519f4e277e328d0eb3379ca61647d70a8f531"
[[package]]
-name = "rlp"
-version = "0.4.5"
+name = "ring"
+version = "0.16.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a7d3f9bed94764eac15b8f14af59fac420c236adaff743b7bcc88e265cb4345"
+checksum = "b72b84d47e8ec5a4f2872e8262b8f8256c5be1c938a7d6d3a867a3ba8f722f74"
dependencies = [
- "rustc-hex",
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi 0.3.9",
]
[[package]]
@@ -6304,9 +6156,9 @@ dependencies = [
[[package]]
name = "rpassword"
-version = "4.0.5"
+version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
+checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9"
dependencies = [
"libc",
"winapi 0.3.9",
@@ -6314,21 +6166,21 @@ dependencies = [
[[package]]
name = "rust-argon2"
-version = "0.7.0"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
+checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"
dependencies = [
- "base64 0.11.0",
+ "base64 0.12.3",
"blake2b_simd",
"constant_time_eq",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
]
[[package]]
name = "rustc-demangle"
-version = "0.1.16"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
[[package]]
name = "rustc-hash"
@@ -6353,9 +6205,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.18.0"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac94b333ee2aac3284c5b8a1b7fb4dd11cba88c244e3fe33cdbd047af0eb693"
+checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
dependencies = [
"base64 0.12.3",
"log",
@@ -6378,14 +6230,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
[[package]]
name = "rw-stream-sink"
@@ -6393,8 +6240,8 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
dependencies = [
- "futures 0.3.5",
- "pin-project 0.4.22",
+ "futures 0.3.8",
+ "pin-project 0.4.27",
"static_assertions",
]
@@ -6419,7 +6266,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7f47b10fa80f6969bbbd9c8e7cc998f082979d402a9e10579e2303a87955395"
dependencies = [
- "stream-cipher 0.7.1",
+ "stream-cipher",
]
[[package]]
@@ -6436,10 +6283,9 @@ name = "sc-authority-discovery"
version = "0.8.0"
dependencies = [
"async-trait",
- "bytes 0.5.6",
"derive_more",
"either",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"libp2p",
"log",
@@ -6449,7 +6295,6 @@ dependencies = [
"quickcheck",
"rand 0.7.3",
"sc-client-api",
- "sc-keystore",
"sc-network",
"sc-peerset",
"serde_json",
@@ -6468,7 +6313,7 @@ dependencies = [
name = "sc-basic-authorship"
version = "0.8.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"log",
"parity-scale-codec",
@@ -6487,7 +6332,6 @@ dependencies = [
"sp-transaction-pool",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
- "tokio-executor 0.2.0-alpha.6",
]
[[package]]
@@ -6544,10 +6388,9 @@ version = "0.8.0"
dependencies = [
"ansi_term 0.12.1",
"atty",
- "bip39",
"chrono",
"fdlimit",
- "futures 0.3.5",
+ "futures 0.3.8",
"hex",
"libp2p",
"log",
@@ -6576,7 +6419,8 @@ dependencies = [
"structopt",
"tempfile",
"thiserror",
- "tokio 0.2.22",
+ "tiny-bip39",
+ "tokio 0.2.23",
"tracing",
"tracing-log",
"tracing-subscriber",
@@ -6598,9 +6442,8 @@ version = "2.0.0"
dependencies = [
"derive_more",
"fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
"hash-db",
- "hex-literal",
"kvdb",
"kvdb-memorydb",
"lazy_static",
@@ -6608,7 +6451,6 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.10.2",
"sc-executor",
- "sc-telemetry",
"sp-api",
"sp-blockchain",
"sp-consensus",
@@ -6616,7 +6458,6 @@ dependencies = [
"sp-database",
"sp-externalities",
"sp-inherents",
- "sp-keyring",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
@@ -6629,6 +6470,7 @@ dependencies = [
"sp-version",
"substrate-prometheus-endpoint",
"substrate-test-runtime",
+ "thiserror",
]
[[package]]
@@ -6680,7 +6522,7 @@ name = "sc-consensus-aura"
version = "0.8.0"
dependencies = [
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"log",
"parity-scale-codec",
@@ -6720,7 +6562,7 @@ version = "0.8.0"
dependencies = [
"derive_more",
"fork-tree",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"log",
"merlin",
@@ -6773,7 +6615,7 @@ name = "sc-consensus-babe-rpc"
version = "0.8.0"
dependencies = [
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -6815,7 +6657,7 @@ version = "0.8.0"
dependencies = [
"assert_matches",
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -6843,7 +6685,7 @@ dependencies = [
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
"tempfile",
- "tokio 0.2.22",
+ "tokio 0.2.23",
]
[[package]]
@@ -6851,7 +6693,7 @@ name = "sc-consensus-pow"
version = "0.8.0"
dependencies = [
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"log",
"parity-scale-codec",
@@ -6873,7 +6715,7 @@ dependencies = [
name = "sc-consensus-slots"
version = "0.8.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"log",
"parity-scale-codec",
@@ -6892,6 +6734,7 @@ dependencies = [
"sp-state-machine",
"sp-trie",
"substrate-test-runtime-client",
+ "thiserror",
]
[[package]]
@@ -6952,14 +6795,13 @@ name = "sc-executor-common"
version = "0.8.0"
dependencies = [
"derive_more",
- "log",
"parity-scale-codec",
"parity-wasm 0.41.0",
"sp-allocator",
"sp-core",
- "sp-runtime-interface",
"sp-serializer",
"sp-wasm-interface",
+ "thiserror",
"wasmi",
]
@@ -7003,12 +6845,12 @@ dependencies = [
"derive_more",
"finality-grandpa",
"fork-tree",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"log",
"parity-scale-codec",
"parking_lot 0.10.2",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
"rand 0.7.3",
"sc-block-builder",
"sc-client-api",
@@ -7037,7 +6879,7 @@ dependencies = [
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.2.22",
+ "tokio 0.2.23",
]
[[package]]
@@ -7046,7 +6888,7 @@ version = "0.8.0"
dependencies = [
"derive_more",
"finality-grandpa",
- "futures 0.3.5",
+ "futures 0.3.8",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -7075,7 +6917,7 @@ name = "sc-informant"
version = "0.8.0"
dependencies = [
"ansi_term 0.12.1",
- "futures 0.3.5",
+ "futures 0.3.8",
"log",
"parity-util-mem",
"sc-client-api",
@@ -7093,7 +6935,7 @@ version = "2.0.0"
dependencies = [
"async-trait",
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-util",
"hex",
"merlin",
@@ -7103,7 +6945,7 @@ dependencies = [
"sp-application-crypto",
"sp-core",
"sp-keystore",
- "subtle 2.2.3",
+ "subtle 2.3.0",
"tempfile",
]
@@ -7140,7 +6982,7 @@ dependencies = [
"erased-serde",
"fnv",
"fork-tree",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"futures_codec",
"hex",
@@ -7149,11 +6991,11 @@ dependencies = [
"linked-hash-map",
"linked_hash_set",
"log",
- "lru 0.4.3",
+ "lru",
"nohash-hasher",
"parity-scale-codec",
- "parking_lot 0.10.2",
- "pin-project 0.4.22",
+ "parking_lot 0.11.1",
+ "pin-project 0.4.27",
"prost",
"prost-build",
"quickcheck",
@@ -7165,7 +7007,7 @@ dependencies = [
"serde_json",
"slog",
"slog_derive",
- "smallvec 0.6.13",
+ "smallvec 1.5.0",
"sp-arithmetic",
"sp-blockchain",
"sp-consensus",
@@ -7180,7 +7022,7 @@ dependencies = [
"substrate-test-runtime-client",
"tempfile",
"thiserror",
- "unsigned-varint 0.4.0",
+ "unsigned-varint",
"void",
"wasm-timer",
"zeroize",
@@ -7191,11 +7033,11 @@ name = "sc-network-gossip"
version = "0.8.0"
dependencies = [
"async-std",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"libp2p",
"log",
- "lru 0.4.3",
+ "lru",
"quickcheck",
"rand 0.7.3",
"sc-network",
@@ -7208,7 +7050,7 @@ dependencies = [
name = "sc-network-test"
version = "0.8.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"libp2p",
"log",
@@ -7236,9 +7078,9 @@ version = "2.0.0"
dependencies = [
"bytes 0.5.6",
"fnv",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
- "hyper 0.13.7",
+ "hyper 0.13.9",
"hyper-rustls",
"lazy_static",
"log",
@@ -7260,14 +7102,14 @@ dependencies = [
"sp-utils",
"substrate-test-runtime-client",
"threadpool",
- "tokio 0.2.22",
+ "tokio 0.2.23",
]
[[package]]
name = "sc-peerset"
version = "2.0.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"libp2p",
"log",
"rand 0.7.3",
@@ -7289,8 +7131,8 @@ name = "sc-rpc"
version = "2.0.0"
dependencies = [
"assert_matches",
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
"hash-db",
"jsonrpc-core",
"jsonrpc-pubsub",
@@ -7299,11 +7141,13 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.10.2",
"sc-block-builder",
+ "sc-cli",
"sc-client-api",
"sc-executor",
"sc-keystore",
"sc-network",
"sc-rpc-api",
+ "sc-tracing",
"sc-transaction-pool",
"serde_json",
"sp-api",
@@ -7329,7 +7173,7 @@ name = "sc-rpc-api"
version = "0.8.0"
dependencies = [
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -7351,7 +7195,7 @@ dependencies = [
name = "sc-rpc-server"
version = "2.0.0"
dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
"jsonrpc-core",
"jsonrpc-http-server",
"jsonrpc-ipc-server",
@@ -7375,7 +7219,7 @@ dependencies = [
"sp-sandbox",
"sp-std",
"sp-tasks",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
]
[[package]]
@@ -7383,11 +7227,10 @@ name = "sc-service"
version = "0.8.0"
dependencies = [
"async-std",
- "derive_more",
- "directories",
+ "directories 3.0.1",
"exit-future",
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"hash-db",
"jsonrpc-core",
@@ -7397,7 +7240,7 @@ dependencies = [
"parity-scale-codec",
"parity-util-mem",
"parking_lot 0.10.2",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
"rand 0.7.3",
"sc-block-builder",
"sc-chain-spec",
@@ -7442,7 +7285,8 @@ dependencies = [
"substrate-test-runtime",
"substrate-test-runtime-client",
"tempfile",
- "tokio 0.2.22",
+ "thiserror",
+ "tokio 0.2.23",
"tracing",
"tracing-futures",
"wasm-timer",
@@ -7453,8 +7297,8 @@ name = "sc-service-test"
version = "2.0.0"
dependencies = [
"fdlimit",
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
"hex-literal",
"log",
"parity-scale-codec",
@@ -7495,6 +7339,7 @@ dependencies = [
"parking_lot 0.10.2",
"sc-client-api",
"sp-core",
+ "thiserror",
]
[[package]]
@@ -7513,18 +7358,19 @@ dependencies = [
"serde_json",
"sp-blockchain",
"sp-runtime",
+ "thiserror",
]
[[package]]
name = "sc-telemetry"
version = "2.0.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"libp2p",
"log",
"parking_lot 0.10.2",
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
"rand 0.7.3",
"serde",
"slog",
@@ -7539,9 +7385,13 @@ dependencies = [
name = "sc-tracing"
version = "2.0.0"
dependencies = [
+ "ansi_term 0.12.1",
"erased-serde",
+ "lazy_static",
"log",
+ "once_cell",
"parking_lot 0.10.2",
+ "regex",
"rustc-hash",
"sc-telemetry",
"serde",
@@ -7550,6 +7400,7 @@ dependencies = [
"sp-tracing",
"tracing",
"tracing-core",
+ "tracing-log",
"tracing-subscriber",
]
@@ -7560,7 +7411,7 @@ dependencies = [
"assert_matches",
"criterion",
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"linked-hash-map",
"log",
"parity-scale-codec",
@@ -7574,6 +7425,7 @@ dependencies = [
"sp-transaction-pool",
"sp-utils",
"substrate-test-runtime",
+ "thiserror",
"wasm-timer",
]
@@ -7582,8 +7434,7 @@ name = "sc-transaction-pool"
version = "2.0.0"
dependencies = [
"assert_matches",
- "derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-diagnose",
"hex",
"intervalier",
@@ -7606,6 +7457,7 @@ dependencies = [
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
+ "thiserror",
"wasm-timer",
]
@@ -7626,14 +7478,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
dependencies = [
"arrayref",
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
"curve25519-dalek 2.1.0",
- "getrandom 0.1.14",
+ "getrandom",
"merlin",
"rand 0.7.3",
"rand_core 0.5.1",
"sha2 0.8.2",
- "subtle 2.2.3",
+ "subtle 2.3.0",
"zeroize",
]
@@ -7643,12 +7495,6 @@ 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"
@@ -7657,18 +7503,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scroll"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
+checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
dependencies = [
"scroll_derive",
]
[[package]]
name = "scroll_derive"
-version = "0.10.2"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9"
+checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d"
dependencies = [
"proc-macro2",
"quote",
@@ -7687,9 +7533,9 @@ dependencies = [
[[package]]
name = "secrecy"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f"
+checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0"
dependencies = [
"zeroize",
]
@@ -7723,7 +7569,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
dependencies = [
- "semver-parser",
+ "semver-parser 0.7.0",
]
[[package]]
@@ -7732,16 +7578,16 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
dependencies = [
- "semver-parser",
+ "semver-parser 0.7.0",
]
[[package]]
name = "semver"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
dependencies = [
- "semver-parser",
+ "semver-parser 0.10.1",
"serde",
]
@@ -7752,10 +7598,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
-name = "send_wrapper"
-version = "0.2.0"
+name = "semver-parser"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0eddf2e8f50ced781f288c19f18621fa72a3779e3cb58dbf23b07469b0abeb4"
+checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
+dependencies = [
+ "pest",
+]
[[package]]
name = "send_wrapper"
@@ -7771,9 +7620,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
[[package]]
name = "serde"
-version = "1.0.116"
+version = "1.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
+checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
dependencies = [
"serde_derive",
]
@@ -7790,9 +7639,9 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.116"
+version = "1.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
+checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
dependencies = [
"proc-macro2",
"quote",
@@ -7801,9 +7650,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.58"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4"
+checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
dependencies = [
"itoa",
"ryu",
@@ -7822,6 +7671,19 @@ dependencies = [
"opaque-debug 0.2.3",
]
+[[package]]
+name = "sha-1"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if 1.0.0",
+ "cpuid-bool",
+ "digest 0.9.0",
+ "opaque-debug 0.3.0",
+]
+
[[package]]
name = "sha2"
version = "0.8.2"
@@ -7836,30 +7698,17 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
+checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
dependencies = [
"block-buffer 0.9.0",
- "cfg-if",
+ "cfg-if 1.0.0",
"cpuid-bool",
"digest 0.9.0",
"opaque-debug 0.3.0",
]
-[[package]]
-name = "sha3"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
-dependencies = [
- "block-buffer 0.7.3",
- "byte-tools",
- "digest 0.8.1",
- "keccak",
- "opaque-debug 0.2.3",
-]
-
[[package]]
name = "sha3"
version = "0.9.1"
@@ -7874,11 +7723,12 @@ dependencies = [
[[package]]
name = "sharded-slab"
-version = "0.0.9"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06d5a3f5166fb5b42a5439f2eee8b9de149e235961e3eb21c5808fc3ea17ff3e"
+checksum = "7b4921be914e16899a80adefb821f8ddb7974e3f1250223575a44ed994882127"
dependencies = [
"lazy_static",
+ "loom",
]
[[package]]
@@ -7889,19 +7739,30 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
[[package]]
name = "signal-hook-registry"
-version = "1.2.0"
+version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
+checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab"
dependencies = [
- "arc-swap",
"libc",
]
[[package]]
name = "signature"
-version = "1.1.0"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210"
+
+[[package]]
+name = "simba"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65211b7b6fc3f14ff9fc7a2011a434e3e6880585bd2e9e9396315ae24cbf7852"
+checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2"
+dependencies = [
+ "approx",
+ "num-complex",
+ "num-traits",
+ "paste 0.1.18",
+]
[[package]]
name = "slab"
@@ -7964,15 +7825,15 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.4.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f"
+checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85"
[[package]]
name = "snow"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32bf8474159a95551661246cda4976e89356999e3cbfef36f493dacc3fae1e8e"
+checksum = "795dd7aeeee24468e5a32661f6d27f7b5cbed802031b2d7640c7b10f8fb2dd50"
dependencies = [
"aes-gcm",
"blake2",
@@ -7981,18 +7842,18 @@ dependencies = [
"rand_core 0.5.1",
"ring",
"rustc_version",
- "sha2 0.9.1",
- "subtle 2.2.3",
- "x25519-dalek 0.6.0",
+ "sha2 0.9.2",
+ "subtle 2.3.0",
+ "x25519-dalek",
]
[[package]]
name = "socket2"
-version = "0.3.12"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"libc",
"redox_syscall",
"winapi 0.3.9",
@@ -8000,29 +7861,29 @@ dependencies = [
[[package]]
name = "soketto"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85457366ae0c6ce56bf05a958aef14cd38513c236568618edbcd9a8c52cb80b0"
+checksum = "b5c71ed3d54db0a699f4948e1bb3e45b450fa31fe602621dee6680361d569c88"
dependencies = [
"base64 0.12.3",
"bytes 0.5.6",
"flate2",
- "futures 0.3.5",
+ "futures 0.3.8",
"httparse",
"log",
"rand 0.7.3",
- "sha-1",
+ "sha-1 0.9.2",
]
[[package]]
name = "sp-allocator"
version = "2.0.0"
dependencies = [
- "derive_more",
"log",
"sp-core",
"sp-std",
"sp-wasm-interface",
+ "thiserror",
]
[[package]]
@@ -8038,6 +7899,7 @@ dependencies = [
"sp-std",
"sp-test-primitives",
"sp-version",
+ "thiserror",
]
[[package]]
@@ -8156,11 +8018,12 @@ dependencies = [
name = "sp-blockchain"
version = "2.0.0"
dependencies = [
+ "futures 0.3.8",
"log",
- "lru 0.4.3",
+ "lru",
"parity-scale-codec",
"parking_lot 0.10.2",
- "sp-block-builder",
+ "sp-api",
"sp-consensus",
"sp-database",
"sp-runtime",
@@ -8180,7 +8043,7 @@ dependencies = [
name = "sp-consensus"
version = "0.8.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"libp2p",
"log",
@@ -8274,7 +8137,7 @@ dependencies = [
"criterion",
"dyn-clonable",
"ed25519-dalek",
- "futures 0.3.5",
+ "futures 0.3.8",
"hash-db",
"hash256-std-hasher",
"hex",
@@ -8371,7 +8234,7 @@ dependencies = [
name = "sp-io"
version = "2.0.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"hash-db",
"libsecp256k1",
"log",
@@ -8406,7 +8269,7 @@ version = "0.8.0"
dependencies = [
"async-trait",
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"merlin",
"parity-scale-codec",
"parking_lot 0.10.2",
@@ -8468,7 +8331,6 @@ name = "sp-panic-handler"
version = "2.0.0"
dependencies = [
"backtrace",
- "log",
]
[[package]]
@@ -8497,7 +8359,6 @@ dependencies = [
"sp-application-crypto",
"sp-arithmetic",
"sp-core",
- "sp-inherents",
"sp-io",
"sp-state-machine",
"sp-std",
@@ -8507,6 +8368,7 @@ dependencies = [
name = "sp-runtime-interface"
version = "2.0.0"
dependencies = [
+ "impl-trait-for-tuples",
"parity-scale-codec",
"primitive-types",
"rustversion",
@@ -8559,7 +8421,7 @@ dependencies = [
"sp-io",
"sp-runtime-interface",
"sp-std",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
]
[[package]]
@@ -8570,7 +8432,7 @@ dependencies = [
"sp-io",
"sp-runtime-interface",
"sp-std",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
]
[[package]]
@@ -8628,7 +8490,7 @@ dependencies = [
"parking_lot 0.10.2",
"pretty_assertions",
"rand 0.7.3",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"sp-core",
"sp-externalities",
"sp-panic-handler",
@@ -8711,13 +8573,14 @@ name = "sp-transaction-pool"
version = "2.0.0"
dependencies = [
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"log",
"parity-scale-codec",
"serde",
"sp-api",
"sp-blockchain",
"sp-runtime",
+ "thiserror",
]
[[package]]
@@ -8742,7 +8605,7 @@ dependencies = [
name = "sp-utils"
version = "2.0.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"futures-core",
"futures-timer 3.0.2",
"lazy_static",
@@ -8790,20 +8653,11 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "statrs"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10102ac8d55e35db2b3fafc26f81ba8647da2e15879ab686a67e6d19af2685e8"
-dependencies = [
- "rand 0.5.6",
-]
-
-[[package]]
-name = "stream-cipher"
-version = "0.4.1"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88"
+checksum = "cce16f6de653e88beca7bd13780d08e09d4489dbca1f9210e041bc4852481382"
dependencies = [
- "generic-array 0.14.3",
+ "rand 0.7.3",
]
[[package]]
@@ -8812,8 +8666,8 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89"
dependencies = [
- "block-cipher 0.8.0",
- "generic-array 0.14.3",
+ "block-cipher",
+ "generic-array 0.14.4",
]
[[package]]
@@ -8833,9 +8687,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
-version = "0.3.15"
+version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
+checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8"
dependencies = [
"clap",
"lazy_static",
@@ -8844,9 +8698,9 @@ dependencies = [
[[package]]
name = "structopt-derive"
-version = "0.4.8"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
+checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8"
dependencies = [
"heck",
"proc-macro-error",
@@ -8895,8 +8749,8 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bed6646a0159b9935b5d045611560eeef842b78d7adc3ba36f5ca325a13a0236"
dependencies = [
- "hmac",
- "pbkdf2",
+ "hmac 0.7.1",
+ "pbkdf2 0.3.0",
"schnorrkel",
"sha2 0.8.2",
"zeroize",
@@ -8909,8 +8763,8 @@ dependencies = [
"chrono",
"console_error_panic_hook",
"console_log",
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
"futures-timer 3.0.2",
"js-sys",
"kvdb-web",
@@ -8951,14 +8805,14 @@ version = "2.0.0"
dependencies = [
"frame-support",
"frame-system",
- "futures 0.3.5",
+ "futures 0.3.8",
"jsonrpc-client-transports",
"jsonrpc-core",
"parity-scale-codec",
"sc-rpc-api",
"serde",
"sp-storage",
- "tokio 0.2.22",
+ "tokio 0.2.23",
]
[[package]]
@@ -8966,7 +8820,7 @@ name = "substrate-frame-rpc-system"
version = "2.0.0"
dependencies = [
"frame-system-rpc-runtime-api",
- "futures 0.3.5",
+ "futures 0.3.8",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -8993,18 +8847,18 @@ dependencies = [
"async-std",
"derive_more",
"futures-util",
- "hyper 0.13.7",
+ "hyper 0.13.9",
"log",
"prometheus",
- "tokio 0.2.22",
+ "tokio 0.2.23",
]
[[package]]
name = "substrate-test-client"
version = "2.0.0"
dependencies = [
- "futures 0.1.29",
- "futures 0.3.5",
+ "futures 0.1.30",
+ "futures 0.3.8",
"hash-db",
"hex",
"parity-scale-codec",
@@ -9029,7 +8883,7 @@ dependencies = [
name = "substrate-test-runtime"
version = "2.0.0"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"frame-executive",
"frame-support",
"frame-system",
@@ -9065,7 +8919,7 @@ dependencies = [
"sp-trie",
"sp-version",
"substrate-test-runtime-client",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder",
"trie-db",
]
@@ -9073,7 +8927,7 @@ dependencies = [
name = "substrate-test-runtime-client"
version = "2.0.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"parity-scale-codec",
"sc-block-builder",
"sc-client-api",
@@ -9094,7 +8948,7 @@ name = "substrate-test-runtime-transaction-pool"
version = "2.0.0"
dependencies = [
"derive_more",
- "futures 0.3.5",
+ "futures 0.3.8",
"parity-scale-codec",
"parking_lot 0.10.2",
"sc-transaction-graph",
@@ -9108,10 +8962,10 @@ dependencies = [
name = "substrate-test-utils"
version = "2.0.0"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"sc-service",
"substrate-test-utils-derive",
- "tokio 0.2.22",
+ "tokio 0.2.23",
"trybuild",
]
@@ -9130,29 +8984,23 @@ version = "0.1.0"
dependencies = [
"sc-service",
"substrate-test-utils",
- "tokio 0.2.22",
+ "tokio 0.2.23",
]
[[package]]
name = "substrate-wasm-builder"
-version = "2.0.1"
+version = "3.0.0"
dependencies = [
"ansi_term 0.12.1",
"atty",
"build-helper",
"cargo_metadata",
- "fs2",
- "itertools 0.8.2",
"tempfile",
"toml",
"walkdir",
"wasm-gc-api",
]
-[[package]]
-name = "substrate-wasm-builder-runner"
-version = "2.0.0"
-
[[package]]
name = "subtle"
version = "1.0.0"
@@ -9161,32 +9009,21 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
[[package]]
name = "subtle"
-version = "2.2.3"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
+checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
[[package]]
name = "syn"
-version = "1.0.44"
+version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
-[[package]]
-name = "syn-mid"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "synstructure"
version = "0.12.4"
@@ -9217,7 +9054,7 @@ version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"libc",
"rand 0.7.3",
"redox_syscall",
@@ -9227,9 +9064,9 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "bf11676eb135389f21fcda654382c4859bbfc1d2f36e4425a2f829bb41b1e20e"
dependencies = [
"winapi-util",
]
@@ -9258,18 +9095,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.21"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
+checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.21"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
+checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
dependencies = [
"proc-macro2",
"quote",
@@ -9296,28 +9133,31 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.43"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
"winapi 0.3.9",
]
[[package]]
name = "tiny-bip39"
-version = "0.7.3"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2"
+checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8"
dependencies = [
- "failure",
- "hmac",
- "once_cell 1.4.1",
- "pbkdf2",
+ "anyhow",
+ "hmac 0.8.1",
+ "once_cell",
+ "pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",
- "sha2 0.8.2",
+ "sha2 0.9.2",
+ "thiserror",
"unicode-normalization",
+ "zeroize",
]
[[package]]
@@ -9341,9 +9181,18 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "0.3.3"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
@@ -9352,16 +9201,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"mio",
"num_cpus",
"tokio-codec",
"tokio-current-thread",
- "tokio-executor 0.1.10",
+ "tokio-executor",
"tokio-fs",
"tokio-io",
"tokio-reactor",
- "tokio-sync 0.1.8",
+ "tokio-sync",
"tokio-tcp",
"tokio-threadpool",
"tokio-timer",
@@ -9371,9 +9220,9 @@ dependencies = [
[[package]]
name = "tokio"
-version = "0.2.22"
+version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
+checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"
dependencies = [
"bytes 0.5.6",
"fnv",
@@ -9385,7 +9234,7 @@ dependencies = [
"mio",
"mio-uds",
"num_cpus",
- "pin-project-lite",
+ "pin-project-lite 0.1.11",
"signal-hook-registry",
"slab",
"tokio-macros",
@@ -9400,7 +9249,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
dependencies = [
"bytes 0.4.12",
"either",
- "futures 0.1.29",
+ "futures 0.1.30",
]
[[package]]
@@ -9410,7 +9259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"tokio-io",
]
@@ -9420,8 +9269,8 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
dependencies = [
- "futures 0.1.29",
- "tokio-executor 0.1.10",
+ "futures 0.1.30",
+ "tokio-executor",
]
[[package]]
@@ -9430,19 +9279,8 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
dependencies = [
- "crossbeam-utils",
- "futures 0.1.29",
-]
-
-[[package]]
-name = "tokio-executor"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee9ceecf69145923834ea73f32ba40c790fd877b74a7817dd0b089f1eb9c7c8"
-dependencies = [
- "futures-util-preview",
- "lazy_static",
- "tokio-sync 0.2.0-alpha.6",
+ "crossbeam-utils 0.7.2",
+ "futures 0.1.30",
]
[[package]]
@@ -9451,7 +9289,7 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
"tokio-io",
"tokio-threadpool",
]
@@ -9463,15 +9301,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"log",
]
[[package]]
name = "tokio-macros"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
+checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [
"proc-macro2",
"quote",
@@ -9485,7 +9323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"mio",
"mio-named-pipes",
"tokio 0.1.22",
@@ -9497,28 +9335,28 @@ version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
dependencies = [
- "crossbeam-utils",
- "futures 0.1.29",
+ "crossbeam-utils 0.7.2",
+ "futures 0.1.30",
"lazy_static",
"log",
"mio",
"num_cpus",
"parking_lot 0.9.0",
"slab",
- "tokio-executor 0.1.10",
+ "tokio-executor",
"tokio-io",
- "tokio-sync 0.1.8",
+ "tokio-sync",
]
[[package]]
name = "tokio-rustls"
-version = "0.14.0"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9"
+checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
dependencies = [
"futures-core",
"rustls",
- "tokio 0.2.22",
+ "tokio 0.2.23",
"webpki",
]
@@ -9528,7 +9366,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
]
[[package]]
@@ -9538,18 +9376,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
dependencies = [
"fnv",
- "futures 0.1.29",
-]
-
-[[package]]
-name = "tokio-sync"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1aaeb685540f7407ea0e27f1c9757d258c7c6bf4e3eb19da6fc59b747239d2"
-dependencies = [
- "fnv",
- "futures-core-preview",
- "futures-util-preview",
+ "futures 0.1.30",
]
[[package]]
@@ -9559,7 +9386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"iovec",
"mio",
"tokio-io",
@@ -9572,15 +9399,15 @@ version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
dependencies = [
- "crossbeam-deque",
+ "crossbeam-deque 0.7.3",
"crossbeam-queue",
- "crossbeam-utils",
- "futures 0.1.29",
+ "crossbeam-utils 0.7.2",
+ "futures 0.1.30",
"lazy_static",
"log",
"num_cpus",
"slab",
- "tokio-executor 0.1.10",
+ "tokio-executor",
]
[[package]]
@@ -9589,10 +9416,10 @@ version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
dependencies = [
- "crossbeam-utils",
- "futures 0.1.29",
+ "crossbeam-utils 0.7.2",
+ "futures 0.1.30",
"slab",
- "tokio-executor 0.1.10",
+ "tokio-executor",
]
[[package]]
@@ -9602,7 +9429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"log",
"mio",
"tokio-codec",
@@ -9617,7 +9444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.29",
+ "futures 0.1.30",
"iovec",
"libc",
"log",
@@ -9638,15 +9465,15 @@ dependencies = [
"futures-core",
"futures-sink",
"log",
- "pin-project-lite",
- "tokio 0.2.22",
+ "pin-project-lite 0.1.11",
+ "tokio 0.2.23",
]
[[package]]
name = "toml"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
dependencies = [
"serde",
]
@@ -9659,13 +9486,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
[[package]]
name = "tracing"
-version = "0.1.21"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
+checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"log",
- "pin-project-lite",
+ "pin-project-lite 0.2.0",
"tracing-attributes",
"tracing-core",
]
@@ -9696,7 +9523,7 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
dependencies = [
- "pin-project 0.4.22",
+ "pin-project 0.4.27",
"tracing",
]
@@ -9723,9 +9550,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.2.13"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ef0a5e15477aa303afbfac3a44cba9b6430fdaad52423b1e6c0dbbe28c3eedd"
+checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401"
dependencies = [
"ansi_term 0.12.1",
"chrono",
@@ -9735,7 +9562,7 @@ dependencies = [
"serde",
"serde_json",
"sharded-slab",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"thread_local",
"tracing",
"tracing-core",
@@ -9767,15 +9594,15 @@ dependencies = [
[[package]]
name = "trie-db"
-version = "0.22.0"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f1a9a9252d38c5337cf0c5392988821a5cf1b2103245016968f2ab41de9e38"
+checksum = "9e55f7ace33d6237e14137e386f4e1672e2a5c6bbc97fef9f438581a143971f0"
dependencies = [
"hash-db",
- "hashbrown 0.8.1",
+ "hashbrown 0.8.2",
"log",
"rustc-hex",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
]
[[package]]
@@ -9806,8 +9633,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "trybuild"
version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7d30fe369fd650072b352b1a9cb9587669de6b89be3b8225544012c1c45292d"
+source = "git+https://github.com/bkchr/trybuild.git?branch=bkchr-use-workspace-cargo-lock#0eaad05ba8a32a743751ff52b57a7d9f57da4869"
dependencies = [
"dissimilar",
"glob",
@@ -9820,11 +9646,13 @@ dependencies = [
[[package]]
name = "twox-hash"
-version = "1.5.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56"
+checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
dependencies = [
+ "cfg-if 0.1.10",
"rand 0.7.3",
+ "static_assertions",
]
[[package]]
@@ -9841,9 +9669,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
[[package]]
name = "uint"
-version = "0.8.3"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173cd16430c206dc1a430af8a89a0e9c076cf15cb42b4aedb10e8cc8fee73681"
+checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177"
dependencies = [
"byteorder",
"crunchy",
@@ -9871,18 +9699,18 @@ dependencies = [
[[package]]
name = "unicode-normalization"
-version = "0.1.13"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae"
[[package]]
name = "unicode-width"
@@ -9902,26 +9730,8 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
dependencies = [
- "generic-array 0.14.3",
- "subtle 2.2.3",
-]
-
-[[package]]
-name = "unsigned-varint"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f67332660eb59a6f1eb24ff1220c9e8d01738a8503c6002e30bcfe4bd9f2b4a9"
-
-[[package]]
-name = "unsigned-varint"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "669d776983b692a906c881fcd0cfb34271a48e197e4d6cb8df32b05bfc3d3fa5"
-dependencies = [
- "bytes 0.5.6",
- "futures-io",
- "futures-util",
- "futures_codec",
+ "generic-array 0.14.4",
+ "subtle 2.3.0",
]
[[package]]
@@ -9955,10 +9765,11 @@ dependencies = [
[[package]]
name = "url"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
dependencies = [
+ "form_urlencoded",
"idna 0.2.0",
"matches",
"percent-encoding 2.1.0",
@@ -10005,9 +9816,9 @@ dependencies = [
[[package]]
name = "waker-fn"
-version = "1.0.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]]
name = "walkdir"
@@ -10026,7 +9837,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
dependencies = [
- "futures 0.1.29",
+ "futures 0.1.30",
"log",
"try-lock",
]
@@ -10047,13 +9858,19 @@ version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
[[package]]
name = "wasm-bindgen"
-version = "0.2.67"
+version = "0.2.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
+checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"serde",
"serde_json",
"wasm-bindgen-macro",
@@ -10061,9 +9878,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.67"
+version = "0.2.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0"
+checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
dependencies = [
"bumpalo",
"lazy_static",
@@ -10076,11 +9893,11 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.12"
+version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a369c5e1dfb7569e14d62af4da642a3cbc2f9a3652fe586e26ac22222aa4b04"
+checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"js-sys",
"wasm-bindgen",
"web-sys",
@@ -10088,9 +9905,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.67"
+version = "0.2.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
+checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -10098,9 +9915,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.67"
+version = "0.2.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
+checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
dependencies = [
"proc-macro2",
"quote",
@@ -10111,15 +9928,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.67"
+version = "0.2.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"
+checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
[[package]]
name = "wasm-bindgen-test"
-version = "0.3.12"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd8e9dad8040e378f0696b017570c6bc929aac373180e06b3d67ac5059c52da3"
+checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64"
dependencies = [
"console_error_panic_hook",
"js-sys",
@@ -10131,9 +9948,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-test-macro"
-version = "0.3.12"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c358c8d2507c1bae25efa069e62ea907aa28700b25c8c33dafb0b15ba4603627"
+checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585"
dependencies = [
"proc-macro2",
"quote",
@@ -10152,15 +9969,14 @@ dependencies = [
[[package]]
name = "wasm-timer"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c5e65a08699c9c4334ba136597ab22b85dccd4b65dd1e36ccf8f723a95b54"
+checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"js-sys",
- "parking_lot 0.9.0",
+ "parking_lot 0.11.1",
"pin-utils",
- "send_wrapper 0.2.0",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
@@ -10210,13 +10026,13 @@ checksum = "1cd3c4f449382779ef6e0a7c3ec6752ae614e20a42e4100000c3efdc973100e2"
dependencies = [
"anyhow",
"backtrace",
- "cfg-if",
+ "cfg-if 0.1.10",
"lazy_static",
"libc",
"log",
"region",
"rustc-demangle",
- "smallvec 1.4.1",
+ "smallvec 1.5.0",
"target-lexicon",
"wasmparser 0.59.0",
"wasmtime-environ",
@@ -10252,12 +10068,12 @@ dependencies = [
"anyhow",
"base64 0.12.3",
"bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
"cranelift-codegen",
"cranelift-entity",
"cranelift-frontend",
"cranelift-wasm",
- "directories",
+ "directories 2.0.2",
"errno",
"file-per-thread-logger",
"indexmap",
@@ -10281,7 +10097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e914c013c7a9f15f4e429d5431f2830fb8adb56e40567661b69c5ec1d645be23"
dependencies = [
"anyhow",
- "cfg-if",
+ "cfg-if 0.1.10",
"cranelift-codegen",
"cranelift-entity",
"cranelift-frontend",
@@ -10324,7 +10140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e8d4d1af8dd5f7096cfcc89dd668d358e52980c38cce199643372ffd6590e27"
dependencies = [
"anyhow",
- "cfg-if",
+ "cfg-if 0.1.10",
"gimli 0.21.0",
"lazy_static",
"libc",
@@ -10344,7 +10160,7 @@ checksum = "3a25f140bbbaadb07c531cba99ce1a966dba216138dc1b2a0ddecec851a01a93"
dependencies = [
"backtrace",
"cc",
- "cfg-if",
+ "cfg-if 0.1.10",
"indexmap",
"lazy_static",
"libc",
@@ -10359,27 +10175,27 @@ dependencies = [
[[package]]
name = "wast"
-version = "21.0.0"
+version = "27.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5"
+checksum = "c2c3ef5f6a72dffa44c24d5811123f704e18a1dbc83637d347b1852b41d3835c"
dependencies = [
"leb128",
]
[[package]]
name = "wat"
-version = "1.0.22"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c"
+checksum = "835cf59c907f67e2bbc20f50157e08f35006fe2a8444d8ec9f5683e22f937045"
dependencies = [
"wast",
]
[[package]]
name = "web-sys"
-version = "0.3.39"
+version = "0.3.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bc359e5dd3b46cb9687a051d50a2fdd228e4ba7cf6fcf861a5365c3d671a642"
+checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -10405,10 +10221,19 @@ dependencies = [
]
[[package]]
-name = "wepoll-sys-stjepang"
-version = "1.0.6"
+name = "webpki-roots"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376"
+dependencies = [
+ "webpki",
+]
+
+[[package]]
+name = "wepoll-sys"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694"
+checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
dependencies = [
"cc",
]
@@ -10475,17 +10300,6 @@ dependencies = [
"winapi-build",
]
-[[package]]
-name = "x25519-dalek"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
-dependencies = [
- "curve25519-dalek 2.1.0",
- "rand_core 0.5.1",
- "zeroize",
-]
-
[[package]]
name = "x25519-dalek"
version = "1.1.0"
@@ -10503,28 +10317,28 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
dependencies = [
- "futures 0.3.5",
+ "futures 0.3.8",
"log",
"nohash-hasher",
- "parking_lot 0.11.0",
+ "parking_lot 0.11.1",
"rand 0.7.3",
"static_assertions",
]
[[package]]
name = "zeroize"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8"
+checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a"
dependencies = [
"zeroize_derive",
]
[[package]]
name = "zeroize_derive"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
+checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16"
dependencies = [
"proc-macro2",
"quote",
diff --git a/Cargo.toml b/Cargo.toml
index b78c4da05580185bdd307e59955cfc3278f36c56..6a007a209f1fab2058880db643aba43305fb4d99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,7 +59,6 @@ members = [
"client/transaction-pool",
"client/transaction-pool/graph",
"utils/prometheus",
- "utils/wasm-builder-runner",
"frame/assets",
"frame/aura",
"frame/atomic-swap",
@@ -75,7 +74,6 @@ members = [
"frame/democracy",
"frame/elections-phragmen",
"frame/elections",
- "frame/evm",
"frame/example",
"frame/example-offchain-worker",
"frame/example-parallel",
@@ -209,7 +207,6 @@ aesni = { opt-level = 3 }
blake2 = { opt-level = 3 }
blake2-rfc = { opt-level = 3 }
blake2b_simd = { opt-level = 3 }
-blake2s_simd = { opt-level = 3 }
chacha20poly1305 = { opt-level = 3 }
cranelift-codegen = { opt-level = 3 }
cranelift-wasm = { opt-level = 3 }
@@ -219,8 +216,6 @@ crossbeam-queue = { opt-level = 3 }
crypto-mac = { opt-level = 3 }
curve25519-dalek = { opt-level = 3 }
ed25519-dalek = { opt-level = 3 }
-evm-core = { opt-level = 3 }
-evm-runtime = { opt-level = 3 }
flate2 = { opt-level = 3 }
futures-channel = { opt-level = 3 }
hashbrown = { opt-level = 3 }
diff --git a/bin/node-template/README.md b/bin/node-template/README.md
index c1aeefe895095a4bd34de39b5d447615f212f06f..8c8b82a14bb86975bda14410d6313500b0388cbe 100644
--- a/bin/node-template/README.md
+++ b/bin/node-template/README.md
@@ -157,7 +157,7 @@ Review the [FRAME runtime implementation](./runtime/src/lib.rs) included in this
the following:
- This file configures several pallets to include in the runtime. Each pallet configuration is
- defined by a code block that begins with `impl $PALLET_NAME::Trait for Runtime`.
+ defined by a code block that begins with `impl $PALLET_NAME::Config for Runtime`.
- The pallets are composed into a single runtime by way of the
[`construct_runtime!`](https://crates.parity.io/frame_support/macro.construct_runtime.html)
macro, which is part of the core
@@ -181,8 +181,8 @@ A FRAME pallet is compromised of a number of blockchain primitives:
- Events: Substrate uses [events](https://substrate.dev/docs/en/knowledgebase/runtime/events) to
notify users of important changes in the runtime.
- Errors: When a dispatchable fails, it returns an error.
-- Trait: The `Trait` configuration interface is used to define the types and parameters upon which
- a FRAME pallet depends.
+- Config: The `Config` configuration interface is used to define the types and parameters upon
+ which a FRAME pallet depends.
## Generate a Custom Node Template
diff --git a/bin/node-template/node/src/cli.rs b/bin/node-template/node/src/cli.rs
index f2faf17e4ddf44b724292d014d542b63b594b56f..947123a6bbf5b927edc33c4a3d6d370cee359d28 100644
--- a/bin/node-template/node/src/cli.rs
+++ b/bin/node-template/node/src/cli.rs
@@ -12,6 +12,8 @@ pub struct Cli {
#[derive(Debug, StructOpt)]
pub enum Subcommand {
+ /// Key management cli utilities
+ Key(sc_cli::KeySubcommand),
/// Build a chain specification.
BuildSpec(sc_cli::BuildSpecCmd),
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
index ac950b50483acafde212f4cfa7d4bcff34c5ca55..5c41643a2932f67479ec5cf0529a48248f7f5b1f 100644
--- a/bin/node-template/node/src/command.rs
+++ b/bin/node-template/node/src/command.rs
@@ -66,6 +66,7 @@ pub fn run() -> sc_cli::Result<()> {
let cli = Cli::from_args();
match &cli.subcommand {
+ Some(Subcommand::Key(cmd)) => cmd.run(),
Some(Subcommand::BuildSpec(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index d85de7c840dfd04c60f212e19ae947520ce0c87b..1fa1a372a05d36cad15973de5d62c4f8563c0d77 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -9,7 +9,7 @@ use sp_inherents::InherentDataProviders;
use sc_executor::native_executor_instance;
pub use sc_executor::NativeExecutor;
use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
-use sc_finality_grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider, SharedVoterState};
+use sc_finality_grandpa::SharedVoterState;
// Our native executor instance.
native_executor_instance!(
@@ -64,7 +64,6 @@ pub fn new_partial(config: &Configuration) -> Result Result Result {
+pub fn new_full(mut config: Configuration) -> Result {
let sc_service::PartialComponents {
client, backend, mut task_manager, import_queue, keystore_container,
select_chain, transaction_pool, inherent_data_providers,
other: (block_import, grandpa_link),
} = new_partial(&config)?;
- let finality_proof_provider =
- GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
+ config.network.notifications_protocols.push(sc_finality_grandpa::GRANDPA_PROTOCOL_NAME.into());
let (network, network_status_sinks, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
@@ -99,8 +97,6 @@ pub fn new_full(config: Configuration) -> Result {
import_queue,
on_demand: None,
block_announce_validator_builder: None,
- finality_proof_request_builder: None,
- finality_proof_provider: Some(finality_proof_provider.clone()),
})?;
if config.offchain_worker.enabled {
@@ -216,8 +212,6 @@ pub fn new_full(config: Configuration) -> Result {
"grandpa-voter",
sc_finality_grandpa::run_grandpa_voter(grandpa_config)?
);
- } else {
- sc_finality_grandpa::setup_disabled_grandpa(network)?;
}
network_starter.start_network();
@@ -225,10 +219,14 @@ pub fn new_full(config: Configuration) -> Result {
}
/// Builds a new service for a light client.
-pub fn new_light(config: Configuration) -> Result {
+pub fn new_light(mut config: Configuration) -> Result {
let (client, backend, keystore_container, mut task_manager, on_demand) =
sc_service::new_light_parts::(&config)?;
+ config.network.notifications_protocols.push(sc_finality_grandpa::GRANDPA_PROTOCOL_NAME.into());
+
+ let select_chain = sc_consensus::LongestChain::new(backend.clone());
+
let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
config.transaction_pool.clone(),
config.prometheus_registry(),
@@ -237,19 +235,21 @@ pub fn new_light(config: Configuration) -> Result {
on_demand.clone(),
));
- let grandpa_block_import = sc_finality_grandpa::light_block_import(
- client.clone(), backend.clone(), &(client.clone() as Arc<_>),
- Arc::new(on_demand.checker().clone()) as Arc<_>,
+ let (grandpa_block_import, _) = sc_finality_grandpa::block_import(
+ client.clone(),
+ &(client.clone() as Arc<_>),
+ select_chain.clone(),
)?;
- let finality_proof_import = grandpa_block_import.clone();
- let finality_proof_request_builder =
- finality_proof_import.create_finality_proof_request_builder();
+
+ let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
+ grandpa_block_import.clone(),
+ client.clone(),
+ );
let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
sc_consensus_aura::slot_duration(&*client)?,
- grandpa_block_import,
- None,
- Some(Box::new(finality_proof_import)),
+ aura_block_import,
+ Some(Box::new(grandpa_block_import)),
client.clone(),
InherentDataProviders::new(),
&task_manager.spawn_handle(),
@@ -257,9 +257,6 @@ pub fn new_light(config: Configuration) -> Result {
sp_consensus::NeverCanAuthor,
)?;
- let finality_proof_provider =
- GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
-
let (network, network_status_sinks, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
@@ -269,8 +266,6 @@ pub fn new_light(config: Configuration) -> Result {
import_queue,
on_demand: Some(on_demand.clone()),
block_announce_validator_builder: None,
- finality_proof_request_builder: Some(finality_proof_request_builder),
- finality_proof_provider: Some(finality_proof_provider),
})?;
if config.offchain_worker.enabled {
diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 729a71278aa9f1c2f37760274b547253799871fb..24de4f2f50dd5cc76678ee0931c02cd5cab3cd31 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -14,9 +14,9 @@ mod mock;
mod tests;
/// Configure the pallet by specifying the parameters and types on which it depends.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
/// Because this pallet emits events, it depends on the runtime's definition of an event.
- type Event: From> + Into<::Event>;
+ type Event: From> + Into<::Event>;
}
// The pallet's runtime storage items.
@@ -25,7 +25,7 @@ decl_storage! {
// A unique name is used to ensure that the pallet's storage items are isolated.
// This name may be updated, but each pallet in the runtime must use a unique name.
// ---------------------------------vvvvvvvvvvvvvv
- trait Store for Module as TemplateModule {
+ trait Store for Module as TemplateModule {
// Learn more about declaring storage items:
// https://substrate.dev/docs/en/knowledgebase/runtime/storage#declaring-storage-items
Something get(fn something): Option;
@@ -35,7 +35,7 @@ decl_storage! {
// Pallets use events to inform users when important changes are made.
// https://substrate.dev/docs/en/knowledgebase/runtime/events
decl_event!(
- pub enum Event where AccountId = ::AccountId {
+ pub enum Event where AccountId = ::AccountId {
/// Event documentation should end with an array that provides descriptive names for event
/// parameters. [something, who]
SomethingStored(u32, AccountId),
@@ -44,7 +44,7 @@ decl_event!(
// Errors inform users that something went wrong.
decl_error! {
- pub enum Error for Module {
+ pub enum Error for Module {
/// Error names should be descriptive.
NoneValue,
/// Errors should have helpful documentation associated with them.
@@ -56,7 +56,7 @@ decl_error! {
// These functions materialize as "extrinsics", which are often compared to transactions.
// Dispatchable functions must be annotated with a weight and must return a DispatchResult.
decl_module! {
- pub struct Module for enum Call where origin: T::Origin {
+ pub struct Module for enum Call where origin: T::Origin {
// Errors must be initialized if they are used by the pallet.
type Error = Error;
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index a3dff240e4847d518343507f084d6ca4339f7a43..84af63a1c3bb8c0a5b21b33511385d0ff5f1be0a 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -1,8 +1,8 @@
-use crate::{Module, Trait};
+use crate::{Module, Config};
use sp_core::H256;
-use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
+use frame_support::{impl_outer_origin, parameter_types};
use sp_runtime::{
- traits::{BlakeTwo256, IdentityLookup}, testing::Header, Perbill,
+ traits::{BlakeTwo256, IdentityLookup}, testing::Header,
};
use frame_system as system;
@@ -16,13 +16,13 @@ impl_outer_origin! {
pub struct Test;
parameter_types! {
pub const BlockHashCount: u64 = 250;
- pub const MaximumBlockWeight: Weight = 1024;
- pub const MaximumBlockLength: u32 = 2 * 1024;
- pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
}
-impl system::Trait for Test {
+impl system::Config for Test {
type BaseCallFilter = ();
+ type BlockWeights = ();
+ type BlockLength = ();
+ type DbWeight = ();
type Origin = Origin;
type Call = ();
type Index = u64;
@@ -34,13 +34,6 @@ impl system::Trait for Test {
type Header = Header;
type Event = ();
type BlockHashCount = BlockHashCount;
- type MaximumBlockWeight = MaximumBlockWeight;
- type DbWeight = ();
- type BlockExecutionWeight = ();
- type ExtrinsicBaseWeight = ();
- type MaximumExtrinsicWeight = MaximumBlockWeight;
- type MaximumBlockLength = MaximumBlockLength;
- type AvailableBlockRatio = AvailableBlockRatio;
type Version = ();
type PalletInfo = ();
type AccountData = ();
@@ -49,7 +42,7 @@ impl system::Trait for Test {
type SystemWeightInfo = ();
}
-impl Trait for Test {
+impl Config for Test {
type Event = ();
}
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index ed5a114b813f814e05688a2900dbfa1b288dd7d8..f1b15070ddde90b3f159ae13a49481c3a189a379 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -48,7 +48,7 @@ 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 = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
+substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
[features]
default = ["std"]
diff --git a/bin/node-template/runtime/build.rs b/bin/node-template/runtime/build.rs
index 9654139121f6f50e2c649a28e79852c8598e630f..9b53d2457dffdc09ea4789b644e6d2b2a3cfc0f5 100644
--- a/bin/node-template/runtime/build.rs
+++ b/bin/node-template/runtime/build.rs
@@ -1,9 +1,8 @@
-use wasm_builder_runner::WasmBuilder;
+use substrate_wasm_builder::WasmBuilder;
fn main() {
WasmBuilder::new()
.with_current_project()
- .with_wasm_builder_from_crates("2.0.1")
.export_heap_base()
.import_memory()
.build()
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index d67a5bde964571336d19b26bae5737ed0c5d48c0..51df3dd5a3e4507e2ca51435a5126d0c4941b245 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -13,7 +13,7 @@ use sp_runtime::{
transaction_validity::{TransactionValidity, TransactionSource},
};
use sp_runtime::traits::{
- BlakeTwo256, Block as BlockT, IdentityLookup, Verify, IdentifyAccount, NumberFor, Saturating,
+ BlakeTwo256, Block as BlockT, AccountIdLookup, Verify, IdentifyAccount, NumberFor,
};
use sp_api::impl_runtime_apis;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -126,29 +126,33 @@ pub fn native_version() -> NativeVersion {
}
}
+const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
+
parameter_types! {
+ pub const Version: RuntimeVersion = VERSION;
pub const BlockHashCount: BlockNumber = 2400;
/// We allow for 2 seconds of compute with a 6 second average block time.
- pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
- pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
- /// Assume 10% of weight for average on_initialize calls.
- pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()
- .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();
- pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;
- pub const Version: RuntimeVersion = VERSION;
+ pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights
+ ::with_sensible_defaults(2 * WEIGHT_PER_SECOND, NORMAL_DISPATCH_RATIO);
+ pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength
+ ::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
}
// Configure FRAME pallets to include in runtime.
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
/// The basic call filter to use in dispatchable.
type BaseCallFilter = ();
+ /// Block & extrinsics weights: base values and limits.
+ type BlockWeights = BlockWeights;
+ /// The maximum length of a block (in bytes).
+ type BlockLength = BlockLength;
/// The identifier used to distinguish between accounts.
type AccountId = AccountId;
/// The aggregated dispatch type that is available for extrinsics.
type Call = Call;
/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
- type Lookup = IdentityLookup;
+ type Lookup = AccountIdLookup;
/// The index type for storing how many extrinsics an account has signed.
type Index = Index;
/// The index type for blocks.
@@ -165,24 +169,8 @@ impl frame_system::Trait for Runtime {
type Origin = Origin;
/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
type BlockHashCount = BlockHashCount;
- /// Maximum weight of each block.
- type MaximumBlockWeight = MaximumBlockWeight;
/// The weight of database operations that the runtime can invoke.
type DbWeight = RocksDbWeight;
- /// The weight of the overhead invoked on the block import process, independent of the
- /// extrinsics included in that block.
- type BlockExecutionWeight = BlockExecutionWeight;
- /// The base weight of any extrinsic processed by the runtime, independent of the
- /// logic of that extrinsic. (Signature verification, nonce increment, fee, etc...)
- type ExtrinsicBaseWeight = ExtrinsicBaseWeight;
- /// The maximum weight that a single extrinsic of `Normal` dispatch class can have,
- /// idependent of the logic of that extrinsics. (Roughly max block weight - average on
- /// initialize cost).
- type MaximumExtrinsicWeight = MaximumExtrinsicWeight;
- /// Maximum size of all encoded transactions (in bytes) that are allowed in one block.
- type MaximumBlockLength = MaximumBlockLength;
- /// Portion of the block weight that is available to all normal transactions.
- type AvailableBlockRatio = AvailableBlockRatio;
/// Version of the runtime.
type Version = Version;
/// Converts a module to the index of the module in `construct_runtime!`.
@@ -199,11 +187,11 @@ impl frame_system::Trait for Runtime {
type SystemWeightInfo = ();
}
-impl pallet_aura::Trait for Runtime {
+impl pallet_aura::Config for Runtime {
type AuthorityId = AuraId;
}
-impl pallet_grandpa::Trait for Runtime {
+impl pallet_grandpa::Config for Runtime {
type Event = Event;
type Call = Call;
@@ -226,7 +214,7 @@ parameter_types! {
pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
}
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
/// A timestamp: milliseconds since the unix epoch.
type Moment = u64;
type OnTimestampSet = Aura;
@@ -239,7 +227,7 @@ parameter_types! {
pub const MaxLocks: u32 = 50;
}
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
type MaxLocks = MaxLocks;
/// The type for recording an account's balance.
type Balance = Balance;
@@ -255,20 +243,20 @@ parameter_types! {
pub const TransactionByteFee: Balance = 1;
}
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
type OnChargeTransaction = CurrencyAdapter;
type TransactionByteFee = TransactionByteFee;
type WeightToFee = IdentityFee;
type FeeMultiplierUpdate = ();
}
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
type Event = Event;
type Call = Call;
}
/// Configure the pallet template in pallets/template.
-impl template::Trait for Runtime {
+impl template::Config for Runtime {
type Event = Event;
}
@@ -293,7 +281,7 @@ construct_runtime!(
);
/// The address format for describing accounts.
-pub type Address = AccountId;
+pub type Address = sp_runtime::MultiAddress;
/// Block header type as expected by this runtime.
pub type Header = generic::Header;
/// Block type as expected by this runtime.
@@ -457,7 +445,7 @@ impl_runtime_apis! {
use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
use frame_system_benchmarking::Module as SystemBench;
- impl frame_system_benchmarking::Trait for Runtime {}
+ impl frame_system_benchmarking::Config for Runtime {}
let whitelist: Vec = vec![
// Block Number
diff --git a/bin/node/bench/src/tempdb.rs b/bin/node/bench/src/tempdb.rs
index 4020fd1029368209c71c2a1d5ce59bc6a0c140a3..abce7daa518bfa75361b84fb69229f3d780752dc 100644
--- a/bin/node/bench/src/tempdb.rs
+++ b/bin/node/bench/src/tempdb.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 std::{io, sync::Arc};
+use std::{io, path::PathBuf, sync::Arc};
use kvdb::{KeyValueDB, DBTransaction};
use kvdb_rocksdb::{DatabaseConfig, Database};
@@ -124,7 +124,7 @@ impl Clone for TempDatabase {
.map(|f_result|
f_result.expect("failed to read file in seed db")
.path()
- ).collect();
+ ).collect::>();
fs_extra::copy_items(
&self_db_files,
new_dir.path(),
diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml
index c90c4a293f49a619337c5df8a6a05320a22ed376..f1cad30aede176c676cd0c2d86441e5ec255e0fe 100644
--- a/bin/node/browser-testing/Cargo.toml
+++ b/bin/node/browser-testing/Cargo.toml
@@ -8,13 +8,13 @@ license = "Apache-2.0"
[dependencies]
futures-timer = "3.0.2"
-libp2p = { version = "0.29.1", default-features = false }
+libp2p = { version = "0.31.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"] }
-wasm-bindgen-futures = "0.4.10"
-wasm-bindgen-test = "0.3.10"
+wasm-bindgen = { version = "=0.2.68", features = ["serde-serialize"] }
+wasm-bindgen-futures = "0.4.18"
+wasm-bindgen-test = "0.3.18"
futures = "0.3.4"
node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0"}
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 26a23ce36ecc0fd6c6a5a4e61133551e242db7bf..6574ccb733b52a3d48a77e38be10e5b358bb328e 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -41,7 +41,7 @@ hex-literal = "0.3.1"
log = "0.4.8"
rand = "0.7.2"
structopt = { version = "0.3.8", optional = true }
-tracing = "0.1.19"
+tracing = "0.1.22"
parking_lot = "0.10.0"
# primitives
@@ -102,7 +102,7 @@ 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 }
+wasm-bindgen-futures = { version = "0.4.18", optional = true }
browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.8.0"}
[target.'cfg(target_arch="x86_64")'.dependencies]
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 3bc406b84fc67481b94535829b06dc372c258b84..5eb8e35e69ec5e36c6f282919905d855accdad24 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -22,7 +22,6 @@
use std::sync::Arc;
use sc_consensus_babe;
-use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
use node_primitives::Block;
use node_runtime::RuntimeApi;
use sc_service::{
@@ -57,10 +56,7 @@ pub fn new_partial(config: &Configuration) -> Result,
sc_consensus_babe::BabeLink,
),
- (
- grandpa::SharedVoterState,
- Arc>,
- ),
+ grandpa::SharedVoterState,
)
>, ServiceError> {
let (client, backend, keystore_container, task_manager) =
@@ -93,7 +89,6 @@ pub fn new_partial(config: &Configuration) -> Result Result,
&sc_consensus_babe::BabeLink,
@@ -181,7 +176,9 @@ pub fn new_full_base(
other: (rpc_extensions_builder, import_setup, rpc_setup),
} = new_partial(&config)?;
- let (shared_voter_state, finality_proof_provider) = rpc_setup;
+ let shared_voter_state = rpc_setup;
+
+ config.network.notifications_protocols.push(grandpa::GRANDPA_PROTOCOL_NAME.into());
let (network, network_status_sinks, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
@@ -192,8 +189,6 @@ pub fn new_full_base(
import_queue,
on_demand: None,
block_announce_validator_builder: None,
- finality_proof_request_builder: None,
- finality_proof_provider: Some(finality_proof_provider.clone()),
})?;
if config.offchain_worker.enabled {
@@ -322,8 +317,6 @@ pub fn new_full_base(
"grandpa-voter",
grandpa::run_grandpa_voter(grandpa_config)?
);
- } else {
- grandpa::setup_disabled_grandpa(network.clone())?;
}
network_starter.start_network();
@@ -345,7 +338,7 @@ pub fn new_full(config: Configuration)
})
}
-pub fn new_light_base(config: Configuration) -> Result<(
+pub fn new_light_base(mut config: Configuration) -> Result<(
TaskManager, RpcHandlers, Arc,
Arc::Hash>>,
Arc>>
@@ -353,6 +346,8 @@ pub fn new_light_base(config: Configuration) -> Result<(
let (client, backend, keystore_container, mut task_manager, on_demand) =
sc_service::new_light_parts::(&config)?;
+ config.network.notifications_protocols.push(grandpa::GRANDPA_PROTOCOL_NAME.into());
+
let select_chain = sc_consensus::LongestChain::new(backend.clone());
let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
@@ -363,14 +358,12 @@ pub fn new_light_base(config: Configuration) -> Result<(
on_demand.clone(),
));
- let grandpa_block_import = grandpa::light_block_import(
- client.clone(), backend.clone(), &(client.clone() as Arc<_>),
- Arc::new(on_demand.checker().clone()),
+ let (grandpa_block_import, _) = grandpa::block_import(
+ client.clone(),
+ &(client.clone() as Arc<_>),
+ select_chain.clone(),
)?;
-
- let finality_proof_import = grandpa_block_import.clone();
- let finality_proof_request_builder =
- finality_proof_import.create_finality_proof_request_builder();
+ let justification_import = grandpa_block_import.clone();
let (babe_block_import, babe_link) = sc_consensus_babe::block_import(
sc_consensus_babe::Config::get_or_compute(&*client)?,
@@ -383,8 +376,7 @@ pub fn new_light_base(config: Configuration) -> Result<(
let import_queue = sc_consensus_babe::import_queue(
babe_link,
babe_block_import,
- None,
- Some(Box::new(finality_proof_import)),
+ Some(Box::new(justification_import)),
client.clone(),
select_chain.clone(),
inherent_data_providers.clone(),
@@ -393,9 +385,6 @@ pub fn new_light_base(config: Configuration) -> Result<(
sp_consensus::NeverCanAuthor,
)?;
- let finality_proof_provider =
- GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
-
let (network, network_status_sinks, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
@@ -405,8 +394,6 @@ pub fn new_light_base(config: Configuration) -> Result<(
import_queue,
on_demand: Some(on_demand.clone()),
block_announce_validator_builder: None,
- finality_proof_request_builder: Some(finality_proof_request_builder),
- finality_proof_provider: Some(finality_proof_provider),
})?;
network_starter.start_network();
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 723e3a7e4ba62fac313614d0dd2ee400cc9ad526..09438bfacd455ca73e8718d9785c1bef6329e208 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -27,7 +27,6 @@ use sp_runtime::{
traits::Hash as HashT,
transaction_validity::InvalidTransaction,
};
-use pallet_contracts::ContractAddressFor;
use frame_system::{self, EventRecord, Phase};
use node_runtime::{
@@ -581,15 +580,15 @@ const CODE_TRANSFER: &str = r#"
#[test]
fn deploying_wasm_contract_should_work() {
let transfer_code = wat::parse_str(CODE_TRANSFER).unwrap();
- let transfer_ch = ::Hashing::hash(&transfer_code);
+ let transfer_ch = ::Hashing::hash(&transfer_code);
- let addr = ::DetermineContractAddress::contract_address_for(
+ let addr = pallet_contracts::Module::::contract_address(
+ &charlie(),
&transfer_ch,
&[],
- &charlie(),
);
- let subsistence = pallet_contracts::Config::::subsistence_threshold_uncached();
+ let subsistence = pallet_contracts::ConfigCache::::subsistence_threshold_uncached();
let b = construct_block(
&mut new_test_ext(compact_code_unwrap(), false),
@@ -613,7 +612,8 @@ fn deploying_wasm_contract_should_work() {
1 * DOLLARS + subsistence,
500_000_000,
transfer_ch,
- Vec::new()
+ Vec::new(),
+ Vec::new(),
)
),
},
@@ -621,7 +621,7 @@ fn deploying_wasm_contract_should_work() {
signed: Some((charlie(), signed_extra(2, 0))),
function: Call::Contracts(
pallet_contracts::Call::call::(
- pallet_indices::address::Address::Id(addr.clone()),
+ sp_runtime::MultiAddress::Id(addr.clone()),
10,
500_000_000,
vec![0x00, 0x01, 0x02, 0x03]
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 2bad2db510be4fae67b1c3bcaff5eb4803a9258b..7d4cf5588e3e606c5caf38a95439a09e8365d595 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -43,6 +43,7 @@ frame-support = { version = "2.0.0", default-features = false, path = "../../../
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-assets = { version = "2.0.0", default-features = false, path = "../../../frame/assets" }
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" }
@@ -79,7 +80,7 @@ pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-featur
pallet-vesting = { version = "2.0.0", default-features = false, path = "../../../frame/vesting" }
[build-dependencies]
-wasm-builder-runner = { version = "2.0.0", package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner" }
+substrate-wasm-builder = { version = "3.0.0", path = "../../../utils/wasm-builder" }
[dev-dependencies]
sp-io = { version = "2.0.0", path = "../../../primitives/io" }
@@ -89,6 +90,7 @@ default = ["std"]
with-tracing = [ "frame-executive/with-tracing" ]
std = [
"sp-authority-discovery/std",
+ "pallet-assets/std",
"pallet-authority-discovery/std",
"pallet-authorship/std",
"sp-consensus-babe/std",
@@ -147,6 +149,7 @@ runtime-benchmarks = [
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
+ "pallet-assets/runtime-benchmarks",
"pallet-babe/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collective/runtime-benchmarks",
diff --git a/bin/node/runtime/build.rs b/bin/node/runtime/build.rs
index 4f111bc9930078d09f02a1e189e2edcd26c993e4..8a0b4d7a0c15745cbc743130b522ddf693d3822b 100644
--- a/bin/node/runtime/build.rs
+++ b/bin/node/runtime/build.rs
@@ -15,12 +15,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use wasm_builder_runner::WasmBuilder;
+use substrate_wasm_builder::WasmBuilder;
fn main() {
WasmBuilder::new()
.with_current_project()
- .with_wasm_builder_from_crates_or_path("2.0.1", "../../../utils/wasm-builder")
.export_heap_base()
.import_memory()
.build()
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index 16666997b3a5597b807296f1b285177216342577..d7910c2c63b8a81c498f764e912ea1a48ee70886 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -34,13 +34,15 @@ mod multiplier_tests {
use crate::{
constants::{currency::*, time::*},
- TransactionPayment, MaximumBlockWeight, AvailableBlockRatio, Runtime, TargetBlockFullness,
+ TransactionPayment, Runtime, TargetBlockFullness,
AdjustmentVariable, System, MinimumMultiplier,
+ RuntimeBlockWeights as BlockWeights,
};
- use frame_support::weights::{Weight, WeightToFeePolynomial};
+ use frame_support::weights::{Weight, WeightToFeePolynomial, DispatchClass};
- fn max() -> Weight {
- AvailableBlockRatio::get() * MaximumBlockWeight::get()
+ fn max_normal() -> Weight {
+ BlockWeights::get().get(DispatchClass::Normal).max_total
+ .unwrap_or_else(|| BlockWeights::get().max_block)
}
fn min_multiplier() -> Multiplier {
@@ -48,7 +50,7 @@ mod multiplier_tests {
}
fn target() -> Weight {
- TargetBlockFullness::get() * max()
+ TargetBlockFullness::get() * max_normal()
}
// update based on runtime impl.
@@ -69,7 +71,7 @@ mod multiplier_tests {
let previous_float = previous_float.max(min_multiplier().into_inner() as f64 / accuracy);
// maximum tx weight
- let m = max() as f64;
+ let m = max_normal() as f64;
// block weight always truncated to max weight
let block_weight = (block_weight as f64).min(m);
let v: f64 = AdjustmentVariable::get().to_fraction();
@@ -89,7 +91,7 @@ mod multiplier_tests {
let mut t: sp_io::TestExternalities =
frame_system::GenesisConfig::default().build_storage::().unwrap().into();
t.execute_with(|| {
- System::set_block_limits(w, 0);
+ System::set_block_consumed_resources(w, 0);
assertions()
});
}
@@ -102,8 +104,8 @@ mod multiplier_tests {
(100, fm.clone()),
(1000, fm.clone()),
(target(), fm.clone()),
- (max() / 2, fm.clone()),
- (max(), fm.clone()),
+ (max_normal() / 2, fm.clone()),
+ (max_normal(), fm.clone()),
];
test_set.into_iter().for_each(|(w, fm)| {
run_with_system_weight(w, || {
@@ -164,7 +166,7 @@ mod multiplier_tests {
#[test]
fn min_change_per_day() {
- run_with_system_weight(max(), || {
+ run_with_system_weight(max_normal(), || {
let mut fm = Multiplier::one();
// See the example in the doc of `TargetedFeeAdjustment`. are at least 0.234, hence
// `fm > 1.234`.
@@ -182,7 +184,7 @@ mod multiplier_tests {
// `cargo test congested_chain_simulation -- --nocapture` to get some insight.
// almost full. The entire quota of normal transactions is taken.
- let block_weight = AvailableBlockRatio::get() * max() - 100;
+ let block_weight = BlockWeights::get().get(DispatchClass::Normal).max_total.unwrap() - 100;
// Default substrate weight.
let tx_weight = frame_support::weights::constants::ExtrinsicBaseWeight::get();
@@ -200,7 +202,7 @@ mod multiplier_tests {
fm = next;
iterations += 1;
let fee =
- ::WeightToFee::calc(&tx_weight);
+ ::WeightToFee::calc(&tx_weight);
let adjusted_fee = fm.saturating_mul_acc_int(fee);
println!(
"iteration {}, new fm = {:?}. Fee at this point is: {} units / {} millicents, \
@@ -320,15 +322,19 @@ mod multiplier_tests {
10 * mb,
2147483647,
4294967295,
- MaximumBlockWeight::get() / 2,
- MaximumBlockWeight::get(),
+ BlockWeights::get().max_block / 2,
+ BlockWeights::get().max_block,
Weight::max_value() / 2,
Weight::max_value(),
].into_iter().for_each(|i| {
run_with_system_weight(i, || {
let next = runtime_multiplier_update(Multiplier::one());
let truth = truth_value_update(i, Multiplier::one());
- assert_eq_error_rate!(truth, next, Multiplier::from_inner(50_000_000));
+ assert_eq_error_rate!(
+ truth,
+ next,
+ Multiplier::from_inner(50_000_000)
+ );
});
});
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index bfa412e882031d24fc6195903d4d8646a051351e..ea9921beeef9cc4d3fc61ed6175778e7c91642f5 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -28,14 +28,17 @@ use frame_support::{
construct_runtime, parameter_types, debug, RuntimeDebug,
weights::{
Weight, IdentityFee,
- constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
+ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, DispatchClass,
},
traits::{
Currency, Imbalance, KeyOwnerProofSystem, OnUnbalanced, Randomness, LockIdentifier,
U128CurrencyToVote,
},
};
-use frame_system::{EnsureRoot, EnsureOneOf};
+use frame_system::{
+ EnsureRoot, EnsureOneOf,
+ limits::{BlockWeights, BlockLength}
+};
use frame_support::traits::InstanceFilter;
use codec::{Encode, Decode};
use sp_core::{
@@ -54,7 +57,7 @@ use sp_runtime::curve::PiecewiseLinear;
use sp_runtime::transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority};
use sp_runtime::traits::{
self, BlakeTwo256, Block as BlockT, StaticLookup, SaturatedConversion,
- ConvertInto, OpaqueKeys, NumberFor, Saturating,
+ ConvertInto, OpaqueKeys, NumberFor,
};
use sp_version::RuntimeVersion;
#[cfg(any(feature = "std", test))]
@@ -91,11 +94,11 @@ use sp_runtime::generic::Era;
#[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
+/// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
#[cfg(feature = "std")]
-/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics.
pub fn wasm_binary_unwrap() -> &'static [u8] {
WASM_BINARY.expect("Development wasm binary is not available. This means the client is \
- built with `BUILD_DUMMY_WASM_BINARY` flag and it is only usable for \
+ built with `SKIP_WASM_BUILD` flag and it is only usable for \
production chains. Please rebuild with the flag disabled.")
}
@@ -111,7 +114,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_version: 260,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
- transaction_version: 1,
+ transaction_version: 2,
};
/// Native version.
@@ -141,23 +144,47 @@ impl OnUnbalanced for DealWithFees {
}
}
-const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(10);
+/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
+/// This is used to limit the maximal weight of a single extrinsic.
+const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
+/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used
+/// by Operational extrinsics.
+const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
+/// We allow for 2 seconds of compute with a 6 second average block time.
+const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND;
+
parameter_types! {
pub const BlockHashCount: BlockNumber = 2400;
- /// We allow for 2 seconds of compute with a 6 second average block time.
- pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
- pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
- /// Assume 10% of weight for average on_initialize calls.
- pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get().saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT)
- * MaximumBlockWeight::get();
- pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;
pub const Version: RuntimeVersion = VERSION;
-}
-
-const_assert!(AvailableBlockRatio::get().deconstruct() >= AVERAGE_ON_INITIALIZE_WEIGHT.deconstruct());
-
-impl frame_system::Trait for Runtime {
+ pub RuntimeBlockLength: BlockLength =
+ BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
+ pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()
+ .base_block(BlockExecutionWeight::get())
+ .for_class(DispatchClass::all(), |weights| {
+ weights.base_extrinsic = ExtrinsicBaseWeight::get();
+ })
+ .for_class(DispatchClass::Normal, |weights| {
+ weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
+ })
+ .for_class(DispatchClass::Operational, |weights| {
+ weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
+ // Operational transactions have some extra reserved space, so that they
+ // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
+ weights.reserved = Some(
+ MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
+ );
+ })
+ .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
+ .build_or_panic();
+}
+
+const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct());
+
+impl frame_system::Config for Runtime {
type BaseCallFilter = ();
+ type BlockWeights = RuntimeBlockWeights;
+ type BlockLength = RuntimeBlockLength;
+ type DbWeight = RocksDbWeight;
type Origin = Origin;
type Call = Call;
type Index = Index;
@@ -169,13 +196,6 @@ impl frame_system::Trait for Runtime {
type Header = generic::Header;
type Event = Event;
type BlockHashCount = BlockHashCount;
- type MaximumBlockWeight = MaximumBlockWeight;
- type DbWeight = RocksDbWeight;
- type BlockExecutionWeight = BlockExecutionWeight;
- type ExtrinsicBaseWeight = ExtrinsicBaseWeight;
- type MaximumExtrinsicWeight = MaximumExtrinsicWeight;
- type MaximumBlockLength = MaximumBlockLength;
- type AvailableBlockRatio = AvailableBlockRatio;
type Version = Version;
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData;
@@ -184,7 +204,7 @@ impl frame_system::Trait for Runtime {
type SystemWeightInfo = frame_system::weights::SubstrateWeight;
}
-impl pallet_utility::Trait for Runtime {
+impl pallet_utility::Config for Runtime {
type Event = Event;
type Call = Call;
type WeightInfo = pallet_utility::weights::SubstrateWeight;
@@ -198,7 +218,7 @@ parameter_types! {
pub const MaxSignatories: u16 = 100;
}
-impl pallet_multisig::Trait for Runtime {
+impl pallet_multisig::Config for Runtime {
type Event = Event;
type Call = Call;
type Currency = Balances;
@@ -261,7 +281,7 @@ impl InstanceFilter for ProxyType {
}
}
-impl pallet_proxy::Trait for Runtime {
+impl pallet_proxy::Config for Runtime {
type Event = Event;
type Call = Call;
type Currency = Balances;
@@ -277,11 +297,12 @@ impl pallet_proxy::Trait for Runtime {
}
parameter_types! {
- pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * MaximumBlockWeight::get();
+ pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) *
+ RuntimeBlockWeights::get().max_block;
pub const MaxScheduledPerBlock: u32 = 50;
}
-impl pallet_scheduler::Trait for Runtime {
+impl pallet_scheduler::Config for Runtime {
type Event = Event;
type Origin = Origin;
type PalletsOrigin = OriginCaller;
@@ -297,7 +318,7 @@ parameter_types! {
pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
}
-impl pallet_babe::Trait for Runtime {
+impl pallet_babe::Config for Runtime {
type EpochDuration = EpochDuration;
type ExpectedBlockTime = ExpectedBlockTime;
type EpochChangeTrigger = pallet_babe::ExternalTrigger;
@@ -324,7 +345,7 @@ parameter_types! {
pub const IndexDeposit: Balance = 1 * DOLLARS;
}
-impl pallet_indices::Trait for Runtime {
+impl pallet_indices::Config for Runtime {
type AccountIndex = AccountIndex;
type Currency = Balances;
type Deposit = IndexDeposit;
@@ -339,7 +360,7 @@ parameter_types! {
pub const MaxLocks: u32 = 50;
}
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
type MaxLocks = MaxLocks;
type Balance = Balance;
type DustRemoval = ();
@@ -356,7 +377,7 @@ parameter_types! {
pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000_000u128);
}
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
type OnChargeTransaction = CurrencyAdapter;
type TransactionByteFee = TransactionByteFee;
type WeightToFee = IdentityFee;
@@ -368,7 +389,7 @@ parameter_types! {
pub const MinimumPeriod: Moment = SLOT_DURATION / 2;
}
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
type Moment = Moment;
type OnTimestampSet = Babe;
type MinimumPeriod = MinimumPeriod;
@@ -379,7 +400,7 @@ parameter_types! {
pub const UncleGenerations: BlockNumber = 5;
}
-impl pallet_authorship::Trait for Runtime {
+impl pallet_authorship::Config for Runtime {
type FindAuthor = pallet_session::FindAccountFromAuthorIndex;
type UncleGenerations = UncleGenerations;
type FilterUncle = ();
@@ -399,9 +420,9 @@ parameter_types! {
pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17);
}
-impl pallet_session::Trait for Runtime {
+impl pallet_session::Config for Runtime {
type Event = Event;
- type ValidatorId = ::AccountId;
+ type ValidatorId = ::AccountId;
type ValidatorIdOf = pallet_staking::StashOf;
type ShouldEndSession = Babe;
type NextSessionRotation = Babe;
@@ -412,7 +433,7 @@ impl pallet_session::Trait for Runtime {
type WeightInfo = pallet_session::weights::SubstrateWeight;
}
-impl pallet_session::historical::Trait for Runtime {
+impl pallet_session::historical::Config for Runtime {
type FullIdentification = pallet_staking::Exposure;
type FullIdentificationOf = pallet_staking::ExposureOf;
}
@@ -438,12 +459,13 @@ parameter_types! {
pub const MaxIterations: u32 = 10;
// 0.05%. The higher the value, the more strict solution acceptance becomes.
pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000);
- pub OffchainSolutionWeightLimit: Weight = MaximumExtrinsicWeight::get()
- .saturating_sub(BlockExecutionWeight::get())
- .saturating_sub(ExtrinsicBaseWeight::get());
+ pub OffchainSolutionWeightLimit: Weight = RuntimeBlockWeights::get()
+ .get(DispatchClass::Normal)
+ .max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
+ .saturating_sub(BlockExecutionWeight::get());
}
-impl pallet_staking::Trait for Runtime {
+impl pallet_staking::Config for Runtime {
type Currency = Balances;
type UnixTime = Timestamp;
type CurrencyToVote = U128CurrencyToVote;
@@ -489,7 +511,7 @@ parameter_types! {
pub const MaxProposals: u32 = 100;
}
-impl pallet_democracy::Trait for Runtime {
+impl pallet_democracy::Config for Runtime {
type Proposal = Call;
type Event = Event;
type Currency = Balances;
@@ -541,7 +563,7 @@ parameter_types! {
}
type CouncilCollective = pallet_collective::Instance1;
-impl pallet_collective::Trait for Runtime {
+impl pallet_collective::Config for Runtime {
type Origin = Origin;
type Proposal = Call;
type Event = Event;
@@ -564,7 +586,7 @@ parameter_types! {
// 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 {
+impl pallet_elections_phragmen::Config for Runtime {
type Event = Event;
type ModuleId = ElectionsPhragmenModuleId;
type Currency = Balances;
@@ -591,7 +613,7 @@ parameter_types! {
}
type TechnicalCollective = pallet_collective::Instance2;
-impl pallet_collective::Trait for Runtime {
+impl pallet_collective::Config for Runtime {
type Origin = Origin;
type Proposal = Call;
type Event = Event;
@@ -607,7 +629,7 @@ type EnsureRootOrHalfCouncil = EnsureOneOf<
EnsureRoot,
pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>
>;
-impl pallet_membership::Trait for Runtime {
+impl pallet_membership::Config for Runtime {
type Event = Event;
type AddOrigin = EnsureRootOrHalfCouncil;
type RemoveOrigin = EnsureRootOrHalfCouncil;
@@ -636,7 +658,7 @@ parameter_types! {
pub const BountyValueMinimum: Balance = 5 * DOLLARS;
}
-impl pallet_treasury::Trait for Runtime {
+impl pallet_treasury::Config for Runtime {
type ModuleId = TreasuryModuleId;
type Currency = Balances;
type ApproveOrigin = EnsureOneOf<
@@ -675,29 +697,31 @@ parameter_types! {
pub const RentByteFee: Balance = 4 * MILLICENTS;
pub const RentDepositOffset: Balance = 1000 * MILLICENTS;
pub const SurchargeReward: Balance = 150 * MILLICENTS;
+ pub const SignedClaimHandicap: u32 = 2;
+ pub const MaxDepth: u32 = 32;
+ pub const StorageSizeOffset: u32 = 8;
+ pub const MaxValueSize: u32 = 16 * 1024;
}
-impl pallet_contracts::Trait for Runtime {
+impl pallet_contracts::Config for Runtime {
type Time = Timestamp;
type Randomness = RandomnessCollectiveFlip;
type Currency = Balances;
type Event = Event;
- type DetermineContractAddress = pallet_contracts::SimpleAddressDeterminer;
- type TrieIdGenerator = pallet_contracts::TrieIdFromParentCounter;
type RentPayment = ();
- type SignedClaimHandicap = pallet_contracts::DefaultSignedClaimHandicap;
+ type SignedClaimHandicap = SignedClaimHandicap;
type TombstoneDeposit = TombstoneDeposit;
- type StorageSizeOffset = pallet_contracts::DefaultStorageSizeOffset;
+ type StorageSizeOffset = StorageSizeOffset;
type RentByteFee = RentByteFee;
type RentDepositOffset = RentDepositOffset;
type SurchargeReward = SurchargeReward;
- type MaxDepth = pallet_contracts::DefaultMaxDepth;
- type MaxValueSize = pallet_contracts::DefaultMaxValueSize;
+ type MaxDepth = MaxDepth;
+ type MaxValueSize = MaxValueSize;
type WeightPrice = pallet_transaction_payment::Module;
type WeightInfo = pallet_contracts::weights::SubstrateWeight;
}
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
type Event = Event;
type Call = Call;
}
@@ -767,7 +791,7 @@ impl frame_system::offchain::SendTransactionTypes for Runtime where
type OverarchingCall = Call;
}
-impl pallet_im_online::Trait for Runtime {
+impl pallet_im_online::Config for Runtime {
type AuthorityId = ImOnlineId;
type Event = Event;
type SessionDuration = SessionDuration;
@@ -777,19 +801,20 @@ impl pallet_im_online::Trait for Runtime {
}
parameter_types! {
- pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
+ pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) *
+ RuntimeBlockWeights::get().max_block;
}
-impl pallet_offences::Trait for Runtime {
+impl pallet_offences::Config for Runtime {
type Event = Event;
type IdentificationTuple = pallet_session::historical::IdentificationTuple;
type OnOffenceHandler = Staking;
type WeightSoftLimit = OffencesWeightSoftLimit;
}
-impl pallet_authority_discovery::Trait for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {}
-impl pallet_grandpa::Trait for Runtime {
+impl pallet_grandpa::Config for Runtime {
type Event = Event;
type Call = Call;
@@ -818,7 +843,7 @@ parameter_types! {
pub const MaxRegistrars: u32 = 20;
}
-impl pallet_identity::Trait for Runtime {
+impl pallet_identity::Config for Runtime {
type Event = Event;
type Currency = Balances;
type BasicDeposit = BasicDeposit;
@@ -840,7 +865,7 @@ parameter_types! {
pub const RecoveryDeposit: Balance = 5 * DOLLARS;
}
-impl pallet_recovery::Trait for Runtime {
+impl pallet_recovery::Config for Runtime {
type Event = Event;
type Call = Call;
type Currency = Balances;
@@ -861,7 +886,7 @@ parameter_types! {
pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
}
-impl pallet_society::Trait for Runtime {
+impl pallet_society::Config for Runtime {
type Event = Event;
type ModuleId = SocietyModuleId;
type Currency = Balances;
@@ -882,7 +907,7 @@ parameter_types! {
pub const MinVestedTransfer: Balance = 100 * DOLLARS;
}
-impl pallet_vesting::Trait for Runtime {
+impl pallet_vesting::Config for Runtime {
type Event = Event;
type Currency = Balances;
type BlockNumberToBalance = ConvertInto;
@@ -890,6 +915,22 @@ impl pallet_vesting::Trait for Runtime {
type WeightInfo = pallet_vesting::weights::SubstrateWeight;
}
+parameter_types! {
+ pub const AssetDepositBase: Balance = 100 * DOLLARS;
+ pub const AssetDepositPerZombie: Balance = 1 * DOLLARS;
+}
+
+impl pallet_assets::Config for Runtime {
+ type Event = Event;
+ type Balance = u64;
+ type AssetId = u32;
+ type Currency = Balances;
+ type ForceOrigin = EnsureRoot;
+ type AssetDepositBase = AssetDepositBase;
+ type AssetDepositPerZombie = AssetDepositPerZombie;
+ type WeightInfo = pallet_assets::weights::SubstrateWeight;
+}
+
construct_runtime!(
pub enum Runtime where
Block = Block,
@@ -927,11 +968,12 @@ construct_runtime!(
Scheduler: pallet_scheduler::{Module, Call, Storage, Event},
Proxy: pallet_proxy::{Module, Call, Storage, Event},
Multisig: pallet_multisig::{Module, Call, Storage, Event},
+ Assets: pallet_assets::{Module, Call, Storage, Event},
}
);
/// The address format for describing accounts.
-pub type Address = ::Source;
+pub type Address = sp_runtime::MultiAddress;
/// Block header type as expected by this runtime.
pub type Header = generic::Header;
/// Block type as expected by this runtime.
@@ -1171,9 +1213,9 @@ impl_runtime_apis! {
use pallet_offences_benchmarking::Module as OffencesBench;
use frame_system_benchmarking::Module as SystemBench;
- impl pallet_session_benchmarking::Trait for Runtime {}
- impl pallet_offences_benchmarking::Trait for Runtime {}
- impl frame_system_benchmarking::Trait for Runtime {}
+ impl pallet_session_benchmarking::Config for Runtime {}
+ impl pallet_offences_benchmarking::Config for Runtime {}
+ impl frame_system_benchmarking::Config for Runtime {}
let whitelist: Vec = vec![
// Block Number
@@ -1193,6 +1235,7 @@ impl_runtime_apis! {
let mut batches = Vec::::new();
let params = (&config, &whitelist);
+ add_benchmark!(params, batches, pallet_assets, Assets);
add_benchmark!(params, batches, pallet_babe, Babe);
add_benchmark!(params, batches, pallet_balances, Balances);
add_benchmark!(params, batches, pallet_collective, Council);
diff --git a/bin/node/testing/src/bench.rs b/bin/node/testing/src/bench.rs
index 153a52375c2a9a23d6bb46d34191c25f445beb78..35af52a2f36c1ad3170ff418fb4900c2f3a758f0 100644
--- a/bin/node/testing/src/bench.rs
+++ b/bin/node/testing/src/bench.rs
@@ -172,7 +172,7 @@ impl Clone for BenchDb {
.map(|f_result|
f_result.expect("failed to read file in seed db")
.path()
- ).collect();
+ ).collect::>();
fs_extra::copy_items(
&seed_db_files,
dir.path(),
@@ -317,7 +317,7 @@ impl<'a> Iterator for BlockContentIterator<'a> {
BlockType::RandomTransfersKeepAlive => {
Call::Balances(
BalancesCall::transfer_keep_alive(
- pallet_indices::address::Address::Id(receiver),
+ sp_runtime::MultiAddress::Id(receiver),
node_runtime::ExistentialDeposit::get() + 1,
)
)
@@ -325,7 +325,7 @@ impl<'a> Iterator for BlockContentIterator<'a> {
BlockType::RandomTransfersReaping => {
Call::Balances(
BalancesCall::transfer(
- pallet_indices::address::Address::Id(receiver),
+ sp_runtime::MultiAddress::Id(receiver),
// Transfer so that ending balance would be 1 less than existential deposit
// so that we kill the sender account.
100*DOLLARS - (node_runtime::ExistentialDeposit::get() - 1),
@@ -591,7 +591,7 @@ impl BenchKeyring {
}
}).into();
UncheckedExtrinsic {
- signature: Some((pallet_indices::address::Address::Id(signed), signature, extra)),
+ signature: Some((sp_runtime::MultiAddress::Id(signed), signature, extra)),
function: payload.0,
}
}
@@ -695,7 +695,6 @@ impl BenchContext {
clear_justification_requests: false,
needs_justification: false,
bad_justification: false,
- needs_finality_proof: false,
is_new_best: true,
}
)
diff --git a/bin/node/testing/src/keyring.rs b/bin/node/testing/src/keyring.rs
index 3413748563633c2e24fda0e876ed3a34b3273b93..f0b8ff707294eb6bed32daf6d7fa18505b1c2333 100644
--- a/bin/node/testing/src/keyring.rs
+++ b/bin/node/testing/src/keyring.rs
@@ -94,7 +94,7 @@ pub fn sign(xt: CheckedExtrinsic, spec_version: u32, tx_version: u32, genesis_ha
}
}).into();
UncheckedExtrinsic {
- signature: Some((pallet_indices::address::Address::Id(signed), signature, extra)),
+ signature: Some((sp_runtime::MultiAddress::Id(signed), signature, extra)),
function: payload.0,
}
}
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
index 051628e84a193419221d0eccd04f797dc2b56a23..c38a48576524301f85f323b6986ece5ab052b3d0 100644
--- a/bin/utils/subkey/src/lib.rs
+++ b/bin/utils/subkey/src/lib.rs
@@ -63,7 +63,7 @@ pub enum Subkey {
/// Run the subkey command, given the apropriate runtime.
pub fn run() -> Result<(), Error>
where
- R: frame_system::Trait,
+ R: frame_system::Config,
R::AccountId: Ss58Codec
{
match Subkey::from_args() {
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index d0fb5fc3ee0e2e82034f09f227df63fd1a635060..07036bfb414a26e45f7cfdd7d09120b3666c1842 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -23,9 +23,7 @@ fnv = "1.0.6"
futures = "0.3.1"
hash-db = { version = "0.15.2", default-features = false }
sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
-hex-literal = "0.3.1"
sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
-sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
kvdb = "0.7.0"
log = "0.4.8"
parking_lot = "0.10.0"
@@ -39,7 +37,6 @@ sp-api = { version = "2.0.0", path = "../../primitives/api" }
sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
-sc-telemetry = { version = "2.0.0", path = "../telemetry" }
sp-trie = { version = "2.0.0", path = "../../primitives/trie" }
sp-storage = { version = "2.0.0", path = "../../primitives/storage" }
sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
@@ -49,3 +46,4 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.
kvdb-memorydb = "0.7.0"
sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" }
+thiserror = "1.0.21"
diff --git a/client/api/src/light.rs b/client/api/src/light.rs
index 144851dac0075f9c2a31f01225aaee5bb9504178..f9ba64544a8c0199072e82b010a33d72de6c2a79 100644
--- a/client/api/src/light.rs
+++ b/client/api/src/light.rs
@@ -312,13 +312,21 @@ pub mod tests {
use sp_test_primitives::{Block, Header, Extrinsic};
use super::*;
+ #[derive(Debug, thiserror::Error)]
+ #[error("Not implemented on test node")]
+ struct MockError;
+
+ impl Into for MockError {
+ fn into(self) -> ClientError {
+ ClientError::Application(Box::new(self))
+ }
+ }
+
pub type OkCallFetcher = Mutex>;
- fn not_implemented_in_tests() -> Ready>
- where
- E: std::convert::From<&'static str>,
+ fn not_implemented_in_tests() -> Ready>
{
- futures::future::ready(Err("Not implemented on test node".into()))
+ futures::future::ready(Err(MockError.into()))
}
impl Fetcher for OkCallFetcher {
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index ff6c26bbee53ecf504281d71317104348e2986b7..4cd2dae1388a1558ae8b5aaa8cf6403619fcb15e 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -18,19 +18,17 @@ prost-build = "0.6.1"
[dependencies]
async-trait = "0.1"
-bytes = "0.5.0"
codec = { package = "parity-scale-codec", default-features = false, version = "1.3.4" }
derive_more = "0.99.2"
either = "1.5.3"
futures = "0.3.4"
futures-timer = "3.0.1"
-libp2p = { version = "0.29.1", default-features = false, features = ["kad"] }
+libp2p = { version = "0.31.2", default-features = false, features = ["kad"] }
log = "0.4.8"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
prost = "0.6.1"
rand = "0.7.2"
sc-client-api = { version = "2.0.0", path = "../api" }
-sc-keystore = { version = "2.0.0", path = "../keystore" }
sc-network = { version = "0.8.0", path = "../network" }
serde_json = "1.0.41"
sp-authority-discovery = { version = "2.0.0", path = "../../primitives/authority-discovery" }
diff --git a/client/authority-discovery/src/error.rs b/client/authority-discovery/src/error.rs
index 48bcdf33114b11d33e9331a8b7c221350b8d105b..82e4a6dd6f3fde8d25b54ab7304de77f9908b35c 100644
--- a/client/authority-discovery/src/error.rs
+++ b/client/authority-discovery/src/error.rs
@@ -31,7 +31,7 @@ pub enum Error {
/// Failed to verify a dht payload with the given signature.
VerifyingDhtPayload,
/// Failed to hash the authority id to be used as a dht key.
- HashingAuthorityId(libp2p::core::multiaddr::multihash::EncodeError),
+ HashingAuthorityId(libp2p::core::multiaddr::multihash::Error),
/// Failed calling into the Substrate runtime.
CallingRuntime(sp_blockchain::Error),
/// Received a dht record with a key that does not match any in-flight awaited keys.
diff --git a/client/authority-discovery/src/interval.rs b/client/authority-discovery/src/interval.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b3aa5b1c0f6785f68a9689e6f45a94e7e08b9d19
--- /dev/null
+++ b/client/authority-discovery/src/interval.rs
@@ -0,0 +1,62 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate 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.
+
+// Substrate 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 Substrate. If not, see .
+
+use futures::stream::Stream;
+use futures::future::FutureExt;
+use futures::ready;
+use futures_timer::Delay;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::time::Duration;
+
+/// Exponentially increasing interval
+///
+/// Doubles interval duration on each tick until the configured maximum is reached.
+pub struct ExpIncInterval {
+ max: Duration,
+ next: Duration,
+ delay: Delay,
+}
+
+impl ExpIncInterval {
+ /// Create a new [`ExpIncInterval`].
+ pub fn new(start: Duration, max: Duration) -> Self {
+ let delay = Delay::new(start);
+ Self {
+ max,
+ next: start * 2,
+ delay,
+ }
+ }
+
+ /// Fast forward the exponentially increasing interval to the configured maximum.
+ pub fn set_to_max(&mut self) {
+ self.next = self.max;
+ self.delay = Delay::new(self.next);
+ }
+}
+
+impl Stream for ExpIncInterval {
+ type Item = ();
+
+ fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll> {
+ ready!(self.delay.poll_unpin(cx));
+ self.delay = Delay::new(self.next);
+ self.next = std::cmp::min(self.max, self.next * 2);
+
+ Poll::Ready(Some(()))
+ }
+}
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 4ee57f31e04a59d311dd0cf3ee493f4c1b3e8c6c..41aa01e56bde20f36fbcde6eeee3156ac4addb6e 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -38,50 +38,41 @@ use sp_runtime::traits::Block as BlockT;
use sp_api::ProvideRuntimeApi;
mod error;
+mod interval;
mod service;
+mod worker;
+
#[cfg(test)]
mod tests;
-mod worker;
/// Configuration of [`Worker`].
pub struct WorkerConfig {
- /// The interval in which the node will publish its own address on the DHT.
+ /// The maximum interval in which the node will publish its own address on the DHT.
///
- /// By default this is set to 12 hours.
- pub publish_interval: Duration,
- /// The interval in which the node will query the DHT for new entries.
+ /// By default this is set to 1 hour.
+ pub max_publish_interval: Duration,
+ /// The maximum interval in which the node will query the DHT for new entries.
///
/// By default this is set to 10 minutes.
- pub query_interval: Duration,
- /// The time the node will wait before triggering the first DHT query or publish.
- ///
- /// By default this is set to 30 seconds.
- ///
- /// This default is based on the rough boostrap time required by libp2p Kademlia.
- pub query_start_delay: Duration,
- /// The interval in which the worker will instruct the peerset to connect to a random subset
- /// of discovered validators.
- ///
- /// By default this is set to 10 minutes.
- pub priority_group_set_interval: Duration,
- /// The time the worker will wait after each query interval tick to pass a subset of
- /// the cached authority addresses down to the peerset.
- ///
- /// Be aware that the actual delay will be computed by [`Self::query_start_delay`] +
- /// [`Self::priority_group_set_start_delay`]
- ///
- /// By default this is set to 5 minutes.
- pub priority_group_set_offset: Duration,
+ pub max_query_interval: Duration,
}
impl Default for WorkerConfig {
fn default() -> Self {
Self {
- publish_interval: Duration::from_secs(12 * 60 * 60),
- query_interval: Duration::from_secs(10 * 60),
- query_start_delay: Duration::from_secs(30),
- priority_group_set_interval: Duration::from_secs(10 * 60),
- priority_group_set_offset: Duration::from_secs(5 * 60),
+ // Kademlia's default time-to-live for Dht records is 36h, republishing records every
+ // 24h through libp2p-kad. Given that a node could restart at any point in time, one can
+ // not depend on the republishing process, thus publishing own external addresses should
+ // happen on an interval < 36h.
+ max_publish_interval: Duration::from_secs(1 * 60 * 60),
+ // External addresses of remote authorities can change at any given point in time. The
+ // interval on which to trigger new queries for the current and next authorities is a trade
+ // off between efficiency and performance.
+ //
+ // Querying 700 [`AuthorityId`]s takes ~8m on the Kusama DHT (16th Nov 2020) when
+ // comparing `authority_discovery_authority_addresses_requested_total` and
+ // `authority_discovery_dht_event_received`.
+ max_query_interval: Duration::from_secs(10 * 60),
}
}
}
diff --git a/client/authority-discovery/src/worker.rs b/client/authority-discovery/src/worker.rs
index 42ae3a5213f0fc04ef78605e5b115cc71ca0abab..45b55f76673c281d9826fc02c5f9cfe0b7333eef 100644
--- a/client/authority-discovery/src/worker.rs
+++ b/client/authority-discovery/src/worker.rs
@@ -14,22 +14,21 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see .
-use crate::{error::{Error, Result}, ServicetoWorkerMsg};
+use crate::{error::{Error, Result}, interval::ExpIncInterval, ServicetoWorkerMsg};
use std::collections::{HashMap, HashSet};
use std::convert::TryInto;
use std::marker::PhantomData;
use std::sync::Arc;
-use std::time::{Duration, Instant};
+use std::time::Duration;
use futures::channel::mpsc;
use futures::{FutureExt, Stream, StreamExt, stream::Fuse};
-use futures_timer::Delay;
use addr_cache::AddrCache;
use async_trait::async_trait;
use codec::Decode;
-use libp2p::{core::multiaddr, multihash::Multihash};
+use libp2p::{core::multiaddr, multihash::{Multihash, Hasher}};
use log::{debug, error, log_enabled};
use prometheus_endpoint::{Counter, CounterVec, Gauge, Opts, U64, register};
use prost::Message;
@@ -54,8 +53,6 @@ mod schema { include!(concat!(env!("OUT_DIR"), "/authority_discovery.rs")); }
#[cfg(test)]
pub mod tests;
-type Interval = Box + Unpin + Send + Sync>;
-
const LOG_TARGET: &'static str = "sub-authority-discovery";
/// Name of the Substrate peerset priority group for authorities discovered through the authority
@@ -113,12 +110,12 @@ pub struct Worker {
dht_event_rx: DhtEventStream,
/// Interval to be proactive, publishing own addresses.
- publish_interval: Interval,
+ publish_interval: ExpIncInterval,
/// Interval at which to request addresses of authorities, refilling the pending lookups queue.
- query_interval: Interval,
+ query_interval: ExpIncInterval,
/// Interval on which to set the peerset priority group to a new random
/// set of addresses.
- priority_group_set_interval: Interval,
+ priority_group_set_interval: ExpIncInterval,
/// Queue of throttled lookups pending to be passed to the network.
pending_lookups: Vec,
@@ -153,31 +150,26 @@ where
prometheus_registry: Option,
config: crate::WorkerConfig,
) -> Self {
- // Kademlia's default time-to-live for Dht records is 36h, republishing
- // records every 24h through libp2p-kad.
- // Given that a node could restart at any point in time, one can not depend on the
- // republishing process, thus publishing own external addresses should happen on an interval
- // < 36h.
- let publish_interval = interval_at(
- Instant::now() + config.query_start_delay,
- config.publish_interval,
+ // When a node starts up publishing and querying might fail due to various reasons, for
+ // example due to being not yet fully bootstrapped on the DHT. Thus one should retry rather
+ // sooner than later. On the other hand, a long running node is likely well connected and
+ // thus timely retries are not needed. For this reasoning use an exponentially increasing
+ // interval for `publish_interval`, `query_interval` and `priority_group_set_interval`
+ // instead of a constant interval.
+ let publish_interval = ExpIncInterval::new(
+ Duration::from_secs(2),
+ config.max_publish_interval,
);
-
- // External addresses of remote authorities can change at any given point in time. The
- // interval on which to trigger new queries for the current authorities is a trade off
- // between efficiency and performance.
- let query_interval_start = Instant::now() + config.query_start_delay;
- let query_interval_duration = config.query_interval;
- let query_interval = interval_at(query_interval_start, query_interval_duration);
-
- // Querying 500 [`AuthorityId`]s takes ~1m on the Kusama DHT (10th of August 2020) when
- // comparing `authority_discovery_authority_addresses_requested_total` and
- // `authority_discovery_dht_event_received`. With that in mind set the peerset priority
- // group on the same interval as the [`query_interval`] above,
- // just delayed by 5 minutes by default.
- let priority_group_set_interval = interval_at(
- query_interval_start + config.priority_group_set_offset,
- config.priority_group_set_interval,
+ let query_interval = ExpIncInterval::new(
+ Duration::from_secs(2),
+ config.max_query_interval,
+ );
+ let priority_group_set_interval = ExpIncInterval::new(
+ Duration::from_secs(2),
+ // Trade-off between node connection churn and connectivity. Using half of
+ // [`crate::WorkerConfig::max_query_interval`] to update priority group once at the
+ // beginning and once in the middle of each query interval.
+ config.max_query_interval / 2,
);
let addr_cache = AddrCache::new();
@@ -413,7 +405,7 @@ where
}
if log_enabled!(log::Level::Debug) {
- let hashes = v.iter().map(|(hash, _value)| hash.clone());
+ let hashes: Vec<_> = v.iter().map(|(hash, _value)| hash.clone()).collect();
debug!(
target: LOG_TARGET,
"Value for hash '{:?}' found on Dht.", hashes,
@@ -449,6 +441,11 @@ where
}
},
DhtEvent::ValuePut(hash) => {
+ // Fast forward the exponentially increasing interval to the configured maximum. In
+ // case this was the first successful address publishing there is no need for a
+ // timely retry.
+ self.publish_interval.set_to_max();
+
if let Some(metrics) = &self.metrics {
metrics.dht_event_received.with_label_values(&["value_put"]).inc();
}
@@ -661,16 +658,6 @@ fn hash_authority_id(id: &[u8]) -> libp2p::kad::record::Key {
libp2p::kad::record::Key::new(&libp2p::multihash::Sha2_256::digest(id))
}
-fn interval_at(start: Instant, duration: Duration) -> Interval {
- let stream = futures::stream::unfold(start, move |next| {
- let time_until_next = next.saturating_duration_since(Instant::now());
-
- Delay::new(time_until_next).map(move |_| Some(((), next + duration)))
- });
-
- Box::new(stream)
-}
-
/// Prometheus metrics for a [`Worker`].
#[derive(Clone)]
pub(crate) struct Metrics {
diff --git a/client/authority-discovery/src/worker/addr_cache.rs b/client/authority-discovery/src/worker/addr_cache.rs
index a2cd3f33e92154668f1fc27dff7e13b286a74ce3..75fcaa840176656998ef413fe4315587d39b27a5 100644
--- a/client/authority-discovery/src/worker/addr_cache.rs
+++ b/client/authority-discovery/src/worker/addr_cache.rs
@@ -139,7 +139,7 @@ fn peer_id_from_multiaddr(addr: &Multiaddr) -> Option {
mod tests {
use super::*;
- use libp2p::multihash;
+ use libp2p::multihash::{self, Multihash};
use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
use rand::Rng;
@@ -163,7 +163,7 @@ mod tests {
fn arbitrary(g: &mut G) -> Self {
let seed: [u8; 32] = g.gen();
let peer_id = PeerId::from_multihash(
- multihash::wrap(multihash::Code::Sha2_256, &seed)
+ Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap()
).unwrap();
let multiaddr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333".parse::()
.unwrap()
diff --git a/client/authority-discovery/src/worker/tests.rs b/client/authority-discovery/src/worker/tests.rs
index 12adb8f23251406a1d16c5d07d39d34d72113419..fee861dfeb0c7da2c09646ab1eada17261401872 100644
--- a/client/authority-discovery/src/worker/tests.rs
+++ b/client/authority-discovery/src/worker/tests.rs
@@ -37,66 +37,6 @@ use substrate_test_runtime_client::runtime::Block;
use super::*;
-#[test]
-fn interval_at_with_start_now() {
- let start = Instant::now();
-
- let mut interval = interval_at(
- std::time::Instant::now(),
- std::time::Duration::from_secs(10),
- );
-
- futures::executor::block_on(async {
- interval.next().await;
- });
-
- assert!(
- Instant::now().saturating_duration_since(start) < Duration::from_secs(1),
- "Expected low resolution instant interval to fire within less than a second.",
- );
-}
-
-#[test]
-fn interval_at_is_queuing_ticks() {
- let start = Instant::now();
-
- let interval = interval_at(start, std::time::Duration::from_millis(100));
-
- // Let's wait for 200ms, thus 3 elements should be queued up (1st at 0ms, 2nd at 100ms, 3rd
- // at 200ms).
- std::thread::sleep(Duration::from_millis(200));
-
- futures::executor::block_on(async {
- interval.take(3).collect::>().await;
- });
-
- // Make sure we did not wait for more than 300 ms, which would imply that `at_interval` is
- // not queuing ticks.
- assert!(
- Instant::now().saturating_duration_since(start) < Duration::from_millis(300),
- "Expect interval to /queue/ events when not polled for a while.",
- );
-}
-
-#[test]
-fn interval_at_with_initial_delay() {
- let start = Instant::now();
-
- let mut interval = interval_at(
- std::time::Instant::now() + Duration::from_millis(100),
- std::time::Duration::from_secs(10),
- );
-
- futures::executor::block_on(async {
- interval.next().await;
- });
-
- assert!(
- Instant::now().saturating_duration_since(start) > Duration::from_millis(100),
- "Expected interval with initial delay not to fire right away.",
- );
-}
-
#[derive(Clone)]
pub(crate) struct TestApi {
pub(crate) authorities: Vec,
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 1b1d8921bcfb35736912d31dc6bd673eb0e08bd3..f097d8044f612c1d9d6e2413013a4ef43f36ff92 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -29,7 +29,6 @@ sc-telemetry = { version = "2.0.0", path = "../telemetry" }
sp-transaction-pool = { version = "2.0.0", path = "../../primitives/transaction-pool" }
sc-block-builder = { version = "0.8.0", path = "../block-builder" }
sc-proposer-metrics = { version = "0.8.0", path = "../proposer-metrics" }
-tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] }
[dev-dependencies]
sc-transaction-pool = { version = "2.0.0", path = "../../client/transaction-pool" }
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 2fe7ba72ec7b93c373f28a70a2075e92d4ca960d..8c022ef3a97416796592d0d5a2ff8bd7f626aa55 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -208,10 +208,7 @@ impl sp_consensus::Proposer for
}));
async move {
- match rx.await {
- Ok(x) => x,
- Err(err) => Err(sp_blockchain::Error::Msg(err.to_string()))
- }
+ rx.await?
}.boxed()
}
}
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index 8a38bb8478003d3e2fb4933d85ab4b30748df4b9..cc1431ea349bf807ca3ea46974cdd64df7e53084 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -212,7 +212,7 @@ where
&state,
changes_trie_state.as_ref(),
parent_hash,
- )?;
+ ).map_err(|e| sp_blockchain::Error::StorageChanges(e))?;
Ok(BuiltBlock {
block: ::new(header, self.extrinsics),
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index b7e798a3ba1c163246702e79105399fc4adf26ba..f323f1940b181a72787d4ada2422019cffda4a21 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -15,16 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
log = "0.4.11"
atty = "0.2.13"
-regex = "1.3.4"
-ansi_term = "0.12.1"
+regex = "1.4.2"
tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
futures = "0.3.4"
fdlimit = "0.2.1"
-libp2p = "0.29.1"
+libp2p = "0.31.2"
parity-scale-codec = "1.3.0"
hex = "0.4.2"
rand = "0.7.3"
-bip39 = "0.6.0-beta.1"
+tiny-bip39 = "0.8.0"
serde_json = "1.0.41"
sc-keystore = { version = "2.0.0", path = "../keystore" }
sp-panic-handler = { version = "2.0.0", path = "../../primitives/panic-handler" }
@@ -44,17 +43,18 @@ structopt = "0.3.8"
sc-tracing = { version = "2.0.0", path = "../tracing" }
chrono = "0.4.10"
serde = "1.0.111"
-tracing = "0.1.10"
+tracing = "0.1.22"
tracing-log = "0.1.1"
-tracing-subscriber = "0.2.10"
+tracing-subscriber = "0.2.15"
sc-cli-proc-macro = { version = "2.0.0", path = "./proc-macro" }
thiserror = "1.0.21"
[target.'cfg(not(target_os = "unknown"))'.dependencies]
-rpassword = "4.0.1"
+rpassword = "5.0.0"
[dev-dependencies]
tempfile = "3.1.0"
+ansi_term = "0.12.1"
[features]
wasmtime = [
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
index ab7a335c1ce646a0b14fafbe25f25c0c688d4b15..e4411e49408e551717c578437cac0b56410cb1ed 100644
--- a/client/cli/src/config.rs
+++ b/client/cli/src/config.rs
@@ -408,22 +408,18 @@ pub trait CliConfiguration: Sized {
/// Get the tracing targets from the current object (if any)
///
- /// By default this is retrieved from `ImportParams` if it is available. Otherwise its
+ /// By default this is retrieved from [`SharedParams`] if it is available. Otherwise its
/// `None`.
fn tracing_targets(&self) -> Result> {
- Ok(self.import_params()
- .map(|x| x.tracing_targets())
- .unwrap_or_else(|| Default::default()))
+ Ok(self.shared_params().tracing_targets())
}
/// Get the TracingReceiver value from the current object
///
- /// By default this is retrieved from `ImportParams` if it is available. Otherwise its
+ /// By default this is retrieved from [`SharedParams`] if it is available. Otherwise its
/// `TracingReceiver::default()`.
fn tracing_receiver(&self) -> Result {
- Ok(self.import_params()
- .map(|x| x.tracing_receiver())
- .unwrap_or_default())
+ Ok(self.shared_params().tracing_receiver())
}
/// Get the node key from the current object
@@ -519,6 +515,7 @@ pub trait CliConfiguration: Sized {
dev_key_seed: self.dev_key_seed(is_dev)?,
tracing_targets: self.tracing_targets()?,
tracing_receiver: self.tracing_receiver()?,
+ disable_log_reloading: self.is_log_filter_reloading_disabled()?,
chain_spec,
max_runtime_instances,
announce_block: self.announce_block()?,
@@ -538,6 +535,11 @@ pub trait CliConfiguration: Sized {
Ok(self.shared_params().log_filters().join(","))
}
+ /// Is log reloading disabled (enabled by default)
+ fn is_log_filter_reloading_disabled(&self) -> Result {
+ Ok(self.shared_params().is_log_filter_reloading_disabled())
+ }
+
/// Initialize substrate. This must be done only once per process.
///
/// This method:
@@ -549,12 +551,16 @@ pub trait CliConfiguration: Sized {
let logger_pattern = self.log_filters()?;
let tracing_receiver = self.tracing_receiver()?;
let tracing_targets = self.tracing_targets()?;
+ let disable_log_reloading = self.is_log_filter_reloading_disabled()?;
sp_panic_handler::set(&C::support_url(), &C::impl_version());
- if let Err(e) = init_logger(&logger_pattern, tracing_receiver, tracing_targets) {
- log::warn!("💬 Problem initializing global logging framework: {:}", e)
- }
+ init_logger(
+ &logger_pattern,
+ tracing_receiver,
+ tracing_targets,
+ disable_log_reloading,
+ )?;
if let Some(new_limit) = fdlimit::raise_fd_limit() {
if new_limit < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 36c963f3e8c97e72e9d27486f0664db354a6b5ce..5190cae2c2ff89edc1b9a3916afe428c3969f51a 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -25,35 +25,32 @@ pub type Result = std::result::Result;
/// Error type for the CLI.
#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
pub enum Error {
- /// Io error
#[error(transparent)]
Io(#[from] std::io::Error),
- /// Cli error
+
#[error(transparent)]
Cli(#[from] structopt::clap::Error),
- /// Service error
+
#[error(transparent)]
Service(#[from] sc_service::Error),
- /// Client error
+
#[error(transparent)]
Client(#[from] sp_blockchain::Error),
- /// scale codec error
+
#[error(transparent)]
Codec(#[from] parity_scale_codec::Error),
- /// Input error
+
#[error("Invalid input: {0}")]
Input(String),
- /// Invalid listen multiaddress
+
#[error("Invalid listen multiaddress")]
InvalidListenMultiaddress,
- /// Application specific error chain sequence forwarder.
- #[error(transparent)]
- Application(#[from] Box),
- /// URI error.
+
#[error("Invalid URI; expecting either a secret URI or a public URI.")]
InvalidUri(crypto::PublicError),
- /// Signature length mismatch.
+
#[error("Signature has an invalid length. Read {read} bytes, expected {expected} bytes")]
SignatureInvalidLength {
/// Amount of signature bytes read.
@@ -61,28 +58,28 @@ pub enum Error {
/// Expected number of signature bytes.
expected: usize,
},
- /// Missing base path argument.
+
#[error("The base path is missing, please provide one")]
MissingBasePath,
- /// Unknown key type specifier or missing key type specifier.
+
#[error("Unknown key type, must be a known 4-character sequence")]
KeyTypeInvalid,
- /// Signature verification failed.
+
#[error("Signature verification failed")]
SignatureInvalid,
- /// Storing a given key failed.
+
#[error("Key store operation failed")]
KeyStoreOperation,
- /// An issue with the underlying key storage was encountered.
+
#[error("Key storage issue encountered")]
KeyStorage(#[from] sc_keystore::Error),
- /// Bytes are not decodable when interpreted as hexadecimal string.
- #[error("Invalid hex base data")]
+
+ #[error("Invalid hexadecimal string data")]
HexDataConversion(#[from] hex::FromHexError),
- /// Shortcut type to specify types on the fly, discouraged.
- #[deprecated = "Use `Forwarded` with an error type instead."]
- #[error("Other: {0}")]
- Other(String),
+
+ /// Application specific error chain sequence forwarder.
+ #[error(transparent)]
+ Application(#[from] Box),
}
impl std::convert::From<&str> for Error {
@@ -93,7 +90,7 @@ impl std::convert::From<&str> for Error {
impl std::convert::From for Error {
fn from(s: String) -> Error {
- Error::Input(s.to_string())
+ Error::Input(s)
}
}
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index c25693dc418b12afeb1d34196822ff94467ecbb1..80882924bd3ad2c67a2e16aba571c5a58bc46640 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -27,7 +27,6 @@ pub mod arg_enums;
mod commands;
mod config;
mod error;
-mod logging;
mod params;
mod runner;
@@ -47,13 +46,18 @@ use structopt::{
clap::{self, AppSettings},
StructOpt,
};
-#[doc(hidden)]
-pub use tracing;
use tracing_subscriber::{
- filter::Directive, fmt::time::ChronoLocal, layer::SubscriberExt, FmtSubscriber, Layer,
+ fmt::time::ChronoLocal,
+ EnvFilter,
+ FmtSubscriber,
+ Layer,
+ layer::SubscriberExt,
};
+pub use sc_tracing::logging;
pub use logging::PREFIX_LOG_SPAN;
+#[doc(hidden)]
+pub use tracing;
/// Substrate client CLI
///
@@ -243,12 +247,16 @@ pub fn init_logger(
pattern: &str,
tracing_receiver: sc_tracing::TracingReceiver,
profiling_targets: Option,
+ disable_log_reloading: bool,
) -> std::result::Result<(), String> {
- fn parse_directives(dirs: impl AsRef) -> Vec {
- dirs.as_ref()
- .split(',')
- .filter_map(|s| s.parse().ok())
- .collect()
+ use sc_tracing::parse_default_directive;
+
+ // Accept all valid directives and print invalid ones
+ fn parse_user_directives(mut env_filter: EnvFilter, dirs: &str) -> std::result::Result {
+ for dir in dirs.split(',') {
+ env_filter = env_filter.add_directive(parse_default_directive(&dir)?);
+ }
+ Ok(env_filter)
}
if let Err(e) = tracing_log::LogTracer::init() {
@@ -257,33 +265,35 @@ pub fn init_logger(
))
}
- let mut env_filter = tracing_subscriber::EnvFilter::default()
+ // Initialize filter - ensure to use `parse_default_directive` for any defaults to persist
+ // after log filter reloading by RPC
+ let mut env_filter = EnvFilter::default()
+ // Enable info
+ .add_directive(parse_default_directive("info")
+ .expect("provided directive is valid"))
// Disable info logging by default for some modules.
- .add_directive("ws=off".parse().expect("provided directive is valid"))
- .add_directive("yamux=off".parse().expect("provided directive is valid"))
- .add_directive("cranelift_codegen=off".parse().expect("provided directive is valid"))
+ .add_directive(parse_default_directive("ws=off")
+ .expect("provided directive is valid"))
+ .add_directive(parse_default_directive("yamux=off")
+ .expect("provided directive is valid"))
+ .add_directive(parse_default_directive("cranelift_codegen=off")
+ .expect("provided directive is valid"))
// Set warn logging by default for some modules.
- .add_directive("cranelift_wasm=warn".parse().expect("provided directive is valid"))
- .add_directive("hyper=warn".parse().expect("provided directive is valid"))
- // Enable info for others.
- .add_directive(tracing_subscriber::filter::LevelFilter::INFO.into());
+ .add_directive(parse_default_directive("cranelift_wasm=warn")
+ .expect("provided directive is valid"))
+ .add_directive(parse_default_directive("hyper=warn")
+ .expect("provided directive is valid"));
if let Ok(lvl) = std::env::var("RUST_LOG") {
if lvl != "" {
- // We're not sure if log or tracing is available at this moment, so silently ignore the
- // parse error.
- for directive in parse_directives(lvl) {
- env_filter = env_filter.add_directive(directive);
- }
+ env_filter = parse_user_directives(env_filter, &lvl)?;
}
}
if pattern != "" {
// We're not sure if log or tracing is available at this moment, so silently ignore the
// parse error.
- for directive in parse_directives(pattern) {
- env_filter = env_filter.add_directive(directive);
- }
+ env_filter = parse_user_directives(env_filter, pattern)?;
}
// If we're only logging `INFO` entries then we'll use a simplified logging format.
@@ -293,44 +303,61 @@ pub fn init_logger(
};
// Always log the special target `sc_tracing`, overrides global level.
+ // Required because profiling traces are emitted via `sc_tracing`
// NOTE: this must be done after we check the `max_level_hint` otherwise
// it is always raised to `TRACE`.
env_filter = env_filter.add_directive(
- "sc_tracing=trace"
- .parse()
- .expect("provided directive is valid"),
+ parse_default_directive("sc_tracing=trace").expect("provided directive is valid")
);
// Make sure to include profiling targets in the filter
if let Some(profiling_targets) = profiling_targets.clone() {
- for directive in parse_directives(profiling_targets) {
- env_filter = env_filter.add_directive(directive);
- }
+ env_filter = parse_user_directives(env_filter, &profiling_targets)?;
}
- let isatty = atty::is(atty::Stream::Stderr);
- let enable_color = isatty;
+ let enable_color = atty::is(atty::Stream::Stderr);
let timer = ChronoLocal::with_format(if simple {
"%Y-%m-%d %H:%M:%S".to_string()
} else {
"%Y-%m-%d %H:%M:%S%.3f".to_string()
});
- let subscriber = FmtSubscriber::builder()
+ let subscriber_builder = FmtSubscriber::builder()
.with_env_filter(env_filter)
- .with_writer(std::io::stderr)
+ .with_writer(std::io::stderr as _)
.event_format(logging::EventFormat {
timer,
- ansi: enable_color,
+ enable_color,
display_target: !simple,
display_level: !simple,
display_thread_name: !simple,
- })
- .finish().with(logging::NodeNameLayer);
+ });
+ if disable_log_reloading {
+ let subscriber = subscriber_builder
+ .finish()
+ .with(logging::NodeNameLayer);
+ initialize_tracing(subscriber, tracing_receiver, profiling_targets)
+ } else {
+ let subscriber_builder = subscriber_builder.with_filter_reloading();
+ let handle = subscriber_builder.reload_handle();
+ sc_tracing::set_reload_handle(handle);
+ let subscriber = subscriber_builder
+ .finish()
+ .with(logging::NodeNameLayer);
+ initialize_tracing(subscriber, tracing_receiver, profiling_targets)
+ }
+}
+fn initialize_tracing(
+ subscriber: S,
+ tracing_receiver: sc_tracing::TracingReceiver,
+ profiling_targets: Option,
+) -> std::result::Result<(), String>
+where
+ S: tracing::Subscriber + Send + Sync + 'static,
+{
if let Some(profiling_targets) = profiling_targets {
let profiling = sc_tracing::ProfilingLayer::new(tracing_receiver, &profiling_targets);
-
if let Err(e) = tracing::subscriber::set_global_default(subscriber.with(profiling)) {
return Err(format!(
"Registering Substrate tracing subscriber failed: {:}!", e
@@ -339,7 +366,7 @@ pub fn init_logger(
} else {
if let Err(e) = tracing::subscriber::set_global_default(subscriber) {
return Err(format!(
- "Registering Substrate tracing subscriber failed: {:}!", e
+ "Registering Substrate tracing subscriber failed: {:}!", e
))
}
}
@@ -356,7 +383,7 @@ mod tests {
#[test]
fn test_logger_filters() {
let test_pattern = "afg=debug,sync=trace,client=warn,telemetry,something-with-dash=error";
- init_logger(&test_pattern, Default::default(), Default::default()).unwrap();
+ init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
tracing::dispatcher::get_default(|dispatcher| {
let test_filter = |target, level| {
@@ -415,7 +442,7 @@ mod tests {
fn log_something_with_dash_target_name() {
if env::var("ENABLE_LOGGING").is_ok() {
let test_pattern = "test-target=info";
- init_logger(&test_pattern, Default::default(), Default::default()).unwrap();
+ init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
log::info!(target: "test-target", "{}", EXPECTED_LOG_MESSAGE);
}
@@ -451,7 +478,7 @@ mod tests {
fn prefix_in_log_lines_entrypoint() {
if env::var("ENABLE_LOGGING").is_ok() {
let test_pattern = "test-target=info";
- init_logger(&test_pattern, Default::default(), Default::default()).unwrap();
+ init_logger(&test_pattern, Default::default(), Default::default(), false).unwrap();
prefix_in_log_lines_process();
}
}
@@ -460,4 +487,35 @@ mod tests {
fn prefix_in_log_lines_process() {
log::info!("{}", EXPECTED_LOG_MESSAGE);
}
+
+ /// This is no actual test, it will be used by the `do_not_write_with_colors_on_tty` test.
+ /// The given test will call the test executable to only execute this test that
+ /// will only print a log line with some colors in it.
+ #[test]
+ fn do_not_write_with_colors_on_tty_entrypoint() {
+ if env::var("ENABLE_LOGGING").is_ok() {
+ init_logger("", Default::default(), Default::default(), false).unwrap();
+ log::info!("{}", ansi_term::Colour::Yellow.paint(EXPECTED_LOG_MESSAGE));
+ }
+ }
+
+ #[test]
+ fn do_not_write_with_colors_on_tty() {
+ let re = regex::Regex::new(&format!(
+ r"^\d{{4}}-\d{{2}}-\d{{2}} \d{{2}}:\d{{2}}:\d{{2}} {}$",
+ EXPECTED_LOG_MESSAGE,
+ )).unwrap();
+ let executable = env::current_exe().unwrap();
+ let output = Command::new(executable)
+ .env("ENABLE_LOGGING", "1")
+ .args(&["--nocapture", "do_not_write_with_colors_on_tty_entrypoint"])
+ .output()
+ .unwrap();
+
+ let output = String::from_utf8(output.stderr).unwrap();
+ assert!(
+ re.is_match(output.trim()),
+ format!("Expected:\n{}\nGot:\n{}", re, output),
+ );
+ }
}
diff --git a/client/cli/src/params/import_params.rs b/client/cli/src/params/import_params.rs
index 1efd4383432fb51a82674cd06b5944fcf219013f..376a72b8421f5446e4ccdfae606145478d329c73 100644
--- a/client/cli/src/params/import_params.rs
+++ b/client/cli/src/params/import_params.rs
@@ -17,7 +17,7 @@
// along with this program. If not, see .
use crate::arg_enums::{
- ExecutionStrategy, TracingReceiver, WasmExecutionMethod, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
+ ExecutionStrategy, WasmExecutionMethod, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
DEFAULT_EXECUTION_IMPORT_BLOCK, DEFAULT_EXECUTION_IMPORT_BLOCK_VALIDATOR,
DEFAULT_EXECUTION_OFFCHAIN_WORKER, DEFAULT_EXECUTION_OTHER, DEFAULT_EXECUTION_SYNCING,
};
@@ -73,32 +73,9 @@ pub struct ImportParams {
default_value = "67108864"
)]
pub state_cache_size: usize,
-
- /// Comma separated list of targets for tracing.
- #[structopt(long = "tracing-targets", value_name = "TARGETS")]
- pub tracing_targets: Option,
-
- /// Receiver to process tracing messages.
- #[structopt(
- long = "tracing-receiver",
- value_name = "RECEIVER",
- possible_values = &TracingReceiver::variants(),
- case_insensitive = true,
- default_value = "Log"
- )]
- pub tracing_receiver: TracingReceiver,
}
impl ImportParams {
- /// Receiver to process tracing messages.
- pub fn tracing_receiver(&self) -> sc_service::TracingReceiver {
- self.tracing_receiver.clone().into()
- }
-
- /// Comma separated list of targets for tracing.
- pub fn tracing_targets(&self) -> Option {
- self.tracing_targets.clone()
- }
/// Specify the state cache size.
pub fn state_cache_size(&self) -> usize {
diff --git a/client/cli/src/params/keystore_params.rs b/client/cli/src/params/keystore_params.rs
index 3c04d63144595680394e00fecd4a699ed446a304..2ecd21cb3dd00693190810c26e56a422306e34ef 100644
--- a/client/cli/src/params/keystore_params.rs
+++ b/client/cli/src/params/keystore_params.rs
@@ -22,8 +22,7 @@ use std::fs;
use std::path::PathBuf;
use structopt::StructOpt;
use crate::error;
-use sp_core::crypto::{SecretString, Zeroize};
-use std::str::FromStr;
+use sp_core::crypto::SecretString;
/// default sub directory for the key store
const DEFAULT_KEYSTORE_CONFIG_PATH: &'static str = "keystore";
@@ -72,21 +71,15 @@ impl KeystoreParams {
let password = if self.password_interactive {
#[cfg(not(target_os = "unknown"))]
{
- let mut password = input_keystore_password()?;
- let secret = std::str::FromStr::from_str(password.as_str())
- .map_err(|()| "Error reading password")?;
- password.zeroize();
- Some(secret)
+ let password = input_keystore_password()?;
+ Some(SecretString::new(password))
}
#[cfg(target_os = "unknown")]
None
} else if let Some(ref file) = self.password_filename {
- let mut password = fs::read_to_string(file)
+ let password = fs::read_to_string(file)
.map_err(|e| format!("{}", e))?;
- let secret = std::str::FromStr::from_str(password.as_str())
- .map_err(|()| "Error reading password")?;
- password.zeroize();
- Some(secret)
+ Some(SecretString::new(password))
} else {
self.password.clone()
};
@@ -104,10 +97,8 @@ impl KeystoreParams {
let (password_interactive, password) = (self.password_interactive, self.password.clone());
let pass = if password_interactive {
- let mut password = rpassword::read_password_from_tty(Some("Key password: "))?;
- let pass = Some(FromStr::from_str(&password).map_err(|()| "Error reading password")?);
- password.zeroize();
- pass
+ let password = rpassword::read_password_from_tty(Some("Key password: "))?;
+ Some(SecretString::new(password))
} else {
password
};
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
index 209742f54e9b8c573f10e2f94e27f7b8ba696ecb..a973d61272ced7c47c65121f50e6c18054cc3416 100644
--- a/client/cli/src/params/network_params.rs
+++ b/client/cli/src/params/network_params.rs
@@ -21,7 +21,7 @@ use sc_network::{
config::{NetworkConfiguration, NodeKeyConfig, NonReservedPeerMode, TransportConfig},
multiaddr::Protocol,
};
-use sc_service::{ChainSpec, config::{Multiaddr, MultiaddrWithPeerId}};
+use sc_service::{ChainSpec, ChainType, config::{Multiaddr, MultiaddrWithPeerId}};
use std::path::PathBuf;
use structopt::StructOpt;
@@ -94,7 +94,8 @@ pub struct NetworkParams {
/// Enable peer discovery on local networks.
///
- /// By default this option is true for `--dev` and false otherwise.
+ /// By default this option is `true` for `--dev` or when the chain type is `Local`/`Development`
+ /// and false otherwise.
#[structopt(long)]
pub discover_local: bool,
@@ -139,6 +140,13 @@ impl NetworkParams {
let mut boot_nodes = chain_spec.boot_nodes().to_vec();
boot_nodes.extend(self.bootnodes.clone());
+ let chain_type = chain_spec.chain_type();
+ // Activate if the user explicitly requested local discovery, `--dev` is given or the
+ // chain type is `Local`/`Development`
+ let allow_non_globals_in_dht = self.discover_local
+ || is_dev
+ || matches!(chain_type, ChainType::Local | ChainType::Development);
+
NetworkConfiguration {
boot_nodes,
net_config_path,
@@ -163,7 +171,7 @@ impl NetworkParams {
wasm_external_transport: None,
},
max_parallel_downloads: self.max_parallel_downloads,
- allow_non_globals_in_dht: self.discover_local || is_dev,
+ allow_non_globals_in_dht,
kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
}
}
diff --git a/client/cli/src/params/shared_params.rs b/client/cli/src/params/shared_params.rs
index ad9ab04070563ac5c7ea5939688f410a3257f232..52b1488ea9ccdf9383f2dd6222a478e9b3528fb4 100644
--- a/client/cli/src/params/shared_params.rs
+++ b/client/cli/src/params/shared_params.rs
@@ -19,11 +19,15 @@
use sc_service::config::BasePath;
use std::path::PathBuf;
use structopt::StructOpt;
+use crate::arg_enums::TracingReceiver;
/// Shared parameters used by all `CoreParams`.
#[derive(Debug, StructOpt)]
pub struct SharedParams {
- /// Specify the chain specification (one of dev, local, or staging).
+ /// Specify the chain specification.
+ ///
+ /// It can be one of the predefined ones (dev, local, or staging) or it can be a path to a file with
+ /// the chainspec (such as one exported by the `build-spec` subcommand).
#[structopt(long, value_name = "CHAIN_SPEC")]
pub chain: Option,
@@ -41,6 +45,28 @@ pub struct SharedParams {
/// By default, all targets log `info`. The global log level can be set with -l.
#[structopt(short = "l", long, value_name = "LOG_PATTERN")]
pub log: Vec,
+
+ /// Disable feature to dynamically update and reload the log filter.
+ ///
+ /// By default this feature is enabled, however it leads to a small performance decrease.
+ /// The `system_addLogFilter` and `system_resetLogFilter` RPCs will have no effect with this
+ /// option set.
+ #[structopt(long = "disable-log-reloading")]
+ pub disable_log_reloading: bool,
+
+ /// Sets a custom profiling filter. Syntax is the same as for logging: =
+ #[structopt(long = "tracing-targets", value_name = "TARGETS")]
+ pub tracing_targets: Option,
+
+ /// Receiver to process tracing messages.
+ #[structopt(
+ long = "tracing-receiver",
+ value_name = "RECEIVER",
+ possible_values = &TracingReceiver::variants(),
+ case_insensitive = true,
+ default_value = "Log"
+ )]
+ pub tracing_receiver: TracingReceiver,
}
impl SharedParams {
@@ -72,4 +98,19 @@ impl SharedParams {
pub fn log_filters(&self) -> &[String] {
&self.log
}
+
+ /// Is log reloading disabled
+ pub fn is_log_filter_reloading_disabled(&self) -> bool {
+ self.disable_log_reloading
+ }
+
+ /// Receiver to process tracing messages.
+ pub fn tracing_receiver(&self) -> sc_service::TracingReceiver {
+ self.tracing_receiver.clone().into()
+ }
+
+ /// Comma separated list of targets for tracing.
+ pub fn tracing_targets(&self) -> Option {
+ self.tracing_targets.clone()
+ }
}
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 97bfb217b9396f5d977bfa911c80a1dc61d4cfdc..246b39771277d3e54bc95db097e852a99447e68e 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -47,7 +47,7 @@ use sp_consensus::{
BlockOrigin, Error as ConsensusError, SelectChain, SlotData, BlockCheckParams, ImportResult
};
use sp_consensus::import_queue::{
- Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport, BoxFinalityProofImport,
+ Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
};
use sc_client_api::{backend::AuxStore, BlockOf};
use sp_blockchain::{
@@ -836,7 +836,6 @@ pub fn import_queue(
slot_duration: SlotDuration,
block_import: I,
justification_import: Option>,
- finality_proof_import: Option>,
client: Arc,
inherent_data_providers: InherentDataProviders,
spawner: &S,
@@ -868,7 +867,6 @@ pub fn import_queue(
verifier,
Box::new(block_import),
justification_import,
- finality_proof_import,
spawner,
registry,
))
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index c672440d114b507b78f1cb929b2b784f37a50bcb..3f2a583482afb5d7486f44e0f6c45b7e0f5d6111 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -79,9 +79,7 @@ use std::{
any::Any, borrow::Cow, convert::TryInto,
};
use sp_consensus::{ImportResult, CanAuthorWith};
-use sp_consensus::import_queue::{
- BoxJustificationImport, BoxFinalityProofImport,
-};
+use sp_consensus::import_queue::BoxJustificationImport;
use sp_core::crypto::Public;
use sp_application_crypto::AppKey;
use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
@@ -1484,7 +1482,6 @@ pub fn import_queue(
babe_link: BabeLink,
block_import: Inner,
justification_import: Option>,
- finality_proof_import: Option>,
client: Arc,
select_chain: SelectChain,
inherent_data_providers: InherentDataProviders,
@@ -1516,7 +1513,6 @@ pub fn import_queue(
verifier,
Box::new(block_import),
justification_import,
- finality_proof_import,
spawner,
registry,
))
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index b31699d13e0c865d6a98805853f8e231ce1f372c..6e0536c85ced76ff1242361e2ab4b4205a990642 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -37,11 +37,11 @@ use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
use sp_consensus::{
NoNetwork as DummyOracle, Proposal, RecordProof, AlwaysCanAuthor,
- import_queue::{BoxBlockImport, BoxJustificationImport, BoxFinalityProofImport},
+ import_queue::{BoxBlockImport, BoxJustificationImport},
};
use sc_network_test::*;
use sc_network_test::{Block as TestBlock, PeersClient};
-use sc_network::config::{BoxFinalityProofRequestBuilder, ProtocolConfig};
+use sc_network::config::ProtocolConfig;
use sp_runtime::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
use sc_client_api::{BlockchainEvents, backend::TransactionFor};
use log::debug;
@@ -272,8 +272,6 @@ impl TestNetFactory for BabeTestNet {
-> (
BlockImportAdapter,
Option>,
- Option>,
- Option>,
Option,
)
{
@@ -295,8 +293,6 @@ impl TestNetFactory for BabeTestNet {
(
BlockImportAdapter::new_full(block_import),
None,
- None,
- None,
Some(PeerData { link, inherent_data_providers, block_import: data_block_import }),
)
}
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index d025d6aaf689f823456ca58d500cffcf16ed7760..9c4465f82fda1ef57e2e18be6ba88be05518531a 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -84,7 +84,6 @@ pub fn import_queue(
ManualSealVerifier,
block_import,
None,
- None,
spawner,
registry,
)
@@ -164,10 +163,10 @@ pub async fn run_manual_seal(
C: HeaderBackend + Finalizer + ProvideRuntimeApi + 'static,
CB: ClientBackend + 'static,
E: Environment + 'static,
- E::Error: std::fmt::Display,
- >::Error: std::fmt::Display,
+ E::Proposer: Proposer>,
CS: Stream::Hash>> + Unpin + 'static,
SC: SelectChain + 'static,
+ TransactionFor: 'static,
{
while let Some(command) = commands_stream.next().await {
match command {
@@ -231,9 +230,9 @@ pub async fn run_instant_seal(
C: HeaderBackend + Finalizer + ProvideRuntimeApi + 'static,
CB: ClientBackend + 'static,
E: Environment + 'static,
- E::Error: std::fmt::Display,
- >::Error: std::fmt::Display,
- SC: SelectChain + 'static
+ E::Proposer: Proposer>,
+ SC: SelectChain + 'static,
+ TransactionFor: 'static,
{
// instant-seal creates blocks as soon as transactions are imported
// into the transaction pool.
@@ -349,7 +348,6 @@ mod tests {
clear_justification_requests: false,
needs_justification: false,
bad_justification: false,
- needs_finality_proof: false,
is_new_best: true,
}
}
@@ -416,7 +414,6 @@ mod tests {
clear_justification_requests: false,
needs_justification: false,
bad_justification: false,
- needs_finality_proof: false,
is_new_best: true,
}
}
@@ -494,7 +491,6 @@ mod tests {
clear_justification_requests: false,
needs_justification: false,
bad_justification: false,
- needs_finality_proof: false,
is_new_best: true
}
}
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 58f017f2d41ad41396be3540828ae3c05fee5bba..a4afaa343e9052561204a60cadf731907c863c73 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -87,10 +87,10 @@ pub async fn seal_block(
+ Send + Sync + 'static,
C: HeaderBackend + ProvideRuntimeApi,
E: Environment,
- >::Error: std::fmt::Display,
- >::Error: std::fmt::Display,
+ E::Proposer: Proposer>,
P: txpool::ChainApi,
SC: SelectChain,
+ TransactionFor: 'static,
{
let future = async {
if pool.validated_pool().status().ready == 0 && !create_empty {
@@ -111,7 +111,7 @@ pub async fn seal_block(
};
let proposer = env.init(&parent)
- .map_err(|err| Error::StringError(format!("{}", err))).await?;
+ .map_err(|err| Error::StringError(format!("{:?}", err))).await?;
let id = inherent_data_provider.create_inherent_data()?;
let inherents_len = id.len();
@@ -122,7 +122,7 @@ pub async fn seal_block(
};
let proposal = proposer.propose(id.clone(), digest, Duration::from_secs(MAX_PROPOSAL_DURATION), false.into())
- .map_err(|err| Error::StringError(format!("{}", err))).await?;
+ .map_err(|err| Error::StringError(format!("{:?}", err))).await?;
if proposal.block.extrinsics().len() == inherents_len && !create_empty {
return Err(Error::EmptyTransactionPool)
@@ -133,6 +133,7 @@ pub async fn seal_block(
params.body = Some(body);
params.finalized = finalize;
params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
+ params.storage_changes = Some(proposal.storage_changes);
if let Some(digest_provider) = digest_provider {
digest_provider.append_block_import(&parent, &mut params, &id)?;
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index b73b9aa91f802a0cae87e9b590f224100b5b8325..e353ed6358a00fc94f5069bbeff356ba93347cd6 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -56,7 +56,7 @@ use sp_consensus::{
BlockCheckParams, ImportResult,
};
use sp_consensus::import_queue::{
- BoxBlockImport, BasicQueue, Verifier, BoxJustificationImport, BoxFinalityProofImport,
+ BoxBlockImport, BasicQueue, Verifier, BoxJustificationImport,
};
use codec::{Encode, Decode};
use prometheus_endpoint::Registry;
@@ -503,7 +503,6 @@ pub type PowImportQueue = BasicQueue;
pub fn import_queue(
block_import: BoxBlockImport,
justification_import: Option>,
- finality_proof_import: Option>,
algorithm: Algorithm,
inherent_data_providers: InherentDataProviders,
spawner: &impl sp_core::traits::SpawnNamed,
@@ -524,7 +523,6 @@ pub fn import_queue(
verifier,
block_import,
justification_import,
- finality_proof_import,
spawner,
registry,
))
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index d07ef49835b2bf6e6232df2048148ba53c554782..e8bd1f33631eaecfa4ddbfc65ea449dff8219690 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -31,7 +31,8 @@ sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
futures = "0.3.4"
futures-timer = "3.0.1"
parking_lot = "0.10.0"
-log = "0.4.8"
+log = "0.4.11"
+thiserror = "1.0.21"
[dev-dependencies]
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index d8601a7c12c68bea5805e6654da80f8fbb7c6095..571766bc44b1ae3c584f384fd7872ff4c4c535e4 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -20,7 +20,8 @@
//! time during which certain events can and/or must occur. This crate
//! provides generic functionality for slots.
-#![forbid(unsafe_code, missing_docs)]
+#![forbid(unsafe_code)]
+#![deny(missing_docs)]
mod slots;
mod aux_schema;
@@ -470,6 +471,15 @@ pub enum CheckedHeader {
Checked(H, S),
}
+
+
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+pub enum Error where T: Debug {
+ #[error("Slot duration is invalid: {0:?}")]
+ SlotDurationInvalid(SlotDuration),
+}
+
/// A slot duration. Create with `get_or_compute`.
// The internal member should stay private here to maintain invariants of
// `get_or_compute`.
@@ -483,7 +493,7 @@ impl Deref for SlotDuration {
}
}
-impl SlotData for SlotDuration {
+impl SlotData for SlotDuration {
/// Get the slot duration in milliseconds.
fn slot_duration(&self) -> u64
where T: SlotData,
@@ -494,7 +504,7 @@ impl SlotData for SlotDuration {
const SLOT_KEY: &'static [u8] = T::SLOT_KEY;
}
-impl SlotDuration {
+impl SlotDuration {
/// Either fetch the slot duration from disk or compute it from the
/// genesis state.
///
@@ -532,10 +542,8 @@ impl SlotDuration {
}
}?;
- if slot_duration.slot_duration() == 0 {
- return Err(sp_blockchain::Error::Msg(
- "Invalid value for slot_duration: the value must be greater than 0.".into(),
- ))
+ if slot_duration.slot_duration() == 0u64 {
+ return Err(sp_blockchain::Error::Application(Box::new(Error::SlotDurationInvalid(slot_duration))))
}
Ok(slot_duration)
@@ -939,7 +947,7 @@ mod test {
true, true, true, true,
];
- assert_eq!(backoff, expected);
+ assert_eq!(backoff.as_slice(), &expected[..]);
}
#[test]
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 8196a750557a8484ce72fc906b81a9301b1fe808..8254e652f68b0cd7e4e0f4661f49dbd96fd2b202 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -49,6 +49,9 @@ use std::sync::Arc;
use std::path::{Path, PathBuf};
use std::io;
use std::collections::{HashMap, HashSet};
+use parking_lot::{Mutex, RwLock};
+use linked_hash_map::LinkedHashMap;
+use log::{trace, debug, warn};
use sc_client_api::{
UsageInfo, MemoryInfo, IoInfo, MemorySize,
@@ -63,7 +66,6 @@ use codec::{Decode, Encode};
use hash_db::Prefix;
use sp_trie::{MemoryDB, PrefixedMemoryDB, prefixed_key};
use sp_database::Transaction;
-use parking_lot::RwLock;
use sp_core::ChangesTrieConfiguration;
use sp_core::offchain::storage::{OffchainOverlayedChange, OffchainOverlayedChanges};
use sp_core::storage::{well_known_keys, ChildInfo};
@@ -83,7 +85,6 @@ use sc_state_db::StateDb;
use sp_blockchain::{CachedHeaderMetadata, HeaderMetadata, HeaderMetadataCache};
use crate::storage_cache::{CachingState, SyncingCachingState, SharedCache, new_shared_cache};
use crate::stats::StateUsageStats;
-use log::{trace, debug, warn};
// Re-export the Database trait so that one can pass an implementation of it.
pub use sp_database::Database;
@@ -93,6 +94,7 @@ pub use sc_state_db::PruningMode;
pub use bench::BenchmarkingState;
const MIN_BLOCKS_TO_KEEP_CHANGES_TRIES_FOR: u32 = 32768;
+const CACHE_HEADERS: usize = 8;
/// Default value for storage cache child ratio.
const DEFAULT_CHILD_RATIO: (usize, usize) = (1, 10);
@@ -352,12 +354,24 @@ impl<'a> sc_state_db::MetaDb for StateMetaDb<'a> {
}
}
+fn cache_header(
+ cache: &mut LinkedHashMap>,
+ hash: Hash,
+ header: Option,
+) {
+ cache.insert(hash, header);
+ while cache.len() > CACHE_HEADERS {
+ cache.pop_front();
+ }
+}
+
/// Block database
pub struct BlockchainDb {
db: Arc>,
meta: Arc, Block::Hash>>>,
leaves: RwLock>>,
header_metadata_cache: Arc>,
+ header_cache: Mutex>>,
}
impl BlockchainDb {
@@ -369,6 +383,7 @@ impl BlockchainDb {
leaves: RwLock::new(leaves),
meta: Arc::new(RwLock::new(meta)),
header_metadata_cache: Arc::new(HeaderMetadataCache::default()),
+ header_cache: Default::default(),
})
}
@@ -407,7 +422,20 @@ impl BlockchainDb {
impl sc_client_api::blockchain::HeaderBackend for BlockchainDb {
fn header(&self, id: BlockId) -> ClientResult> {
- utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)
+ match &id {
+ BlockId::Hash(h) => {
+ let mut cache = self.header_cache.lock();
+ if let Some(result) = cache.get_refresh(h) {
+ return Ok(result.clone());
+ }
+ let header = utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)?;
+ cache_header(&mut cache, h.clone(), header.clone());
+ Ok(header)
+ }
+ BlockId::Number(_) => {
+ utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)
+ }
+ }
}
fn info(&self) -> sc_client_api::blockchain::Info {
@@ -424,12 +452,7 @@ impl sc_client_api::blockchain::HeaderBackend