From 935d74e90659c8afbfca0e7280a1d17842c24fbc Mon Sep 17 00:00:00 2001 From: Squirrel <gilescope@gmail.com> Date: Tue, 12 Oct 2021 11:06:12 +0100 Subject: [PATCH] Companion PR for ss58 crate (#3953) * Companion PR for ss58 crate * cargo fmt * Rename * into() * into() * updating substrate (ideally use bot merge) --- polkadot/Cargo.lock | 507 ++++++++++------------- polkadot/cli/src/command.rs | 12 +- polkadot/utils/staking-miner/src/main.rs | 6 +- 3 files changed, 237 insertions(+), 288 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 9d4d182649a..3c1da898a1e 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -461,14 +461,14 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.17", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sc-client-api", "sc-keystore", "sc-network", @@ -489,7 +489,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -509,12 +509,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "scale-info", @@ -1100,15 +1100,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - [[package]] name = "cloudabi" version = "0.1.0" @@ -1733,15 +1724,6 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" -[[package]] -name = "erased-serde" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ca8b296792113e1500fd935ae487be6e00ce318952a6880555554824d6ebf38" -dependencies = [ - "serde", -] - [[package]] name = "errno" version = "0.2.5" @@ -1883,7 +1865,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "scale-info", ] @@ -1927,7 +1909,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", ] @@ -1945,7 +1927,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -1965,7 +1947,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "Inflector", "chrono", @@ -1991,7 +1973,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -2005,7 +1987,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -2033,7 +2015,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "bitflags", "frame-metadata", @@ -2060,7 +2042,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2072,7 +2054,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -2084,7 +2066,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "proc-macro2", "quote", @@ -2094,7 +2076,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2117,7 +2099,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -2128,7 +2110,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "log", @@ -2145,7 +2127,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -2160,7 +2142,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "sp-api", @@ -2169,7 +2151,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "sp-api", @@ -2382,7 +2364,7 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generate-bags" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "chrono", "frame-election-provider-support", @@ -2994,7 +2976,7 @@ dependencies = [ "jsonrpc-server-utils", "log", "net2", - "parking_lot 0.11.1", + "parking_lot", "unicase", ] @@ -3009,7 +2991,7 @@ dependencies = [ "jsonrpc-server-utils", "log", "parity-tokio-ipc", - "parking_lot 0.11.1", + "parking_lot", "tower-service", ] @@ -3023,7 +3005,7 @@ dependencies = [ "jsonrpc-core", "lazy_static", "log", - "parking_lot 0.11.1", + "parking_lot", "rand 0.7.3", "serde", ] @@ -3057,7 +3039,7 @@ dependencies = [ "jsonrpc-server-utils", "log", "parity-ws", - "parking_lot 0.11.1", + "parking_lot", "slab", ] @@ -3250,7 +3232,7 @@ checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot", ] [[package]] @@ -3265,7 +3247,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot", "regex", "rocksdb", "smallvec", @@ -3360,7 +3342,7 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot 0.11.1", + "parking_lot", "pin-project 1.0.8", "smallvec", "wasm-timer", @@ -3385,7 +3367,7 @@ dependencies = [ "multiaddr", "multihash 0.14.0", "multistream-select", - "parking_lot 0.11.1", + "parking_lot", "pin-project 1.0.8", "prost", "prost-build", @@ -3544,7 +3526,7 @@ dependencies = [ "libp2p-core", "log", "nohash-hasher", - "parking_lot 0.11.1", + "parking_lot", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.0", @@ -3756,7 +3738,7 @@ checksum = "214cc0dd9c37cbed27f0bb1eba0c41bbafdb93a8be5e9d6ae1e6b4b42cd044bf" dependencies = [ "futures 0.3.17", "libp2p-core", - "parking_lot 0.11.1", + "parking_lot", "thiserror", "yamux", ] @@ -3925,15 +3907,6 @@ dependencies = [ "statrs", ] -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.1" @@ -4611,7 +4584,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4625,7 +4598,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -4641,7 +4614,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -4656,7 +4629,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4680,7 +4653,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4700,7 +4673,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4715,7 +4688,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "beefy-primitives", "frame-support", @@ -4731,7 +4704,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4756,7 +4729,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4841,7 +4814,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4858,7 +4831,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4874,7 +4847,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4898,7 +4871,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4916,7 +4889,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4931,7 +4904,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4954,7 +4927,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4970,7 +4943,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4990,7 +4963,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5007,7 +4980,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5024,7 +4997,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5042,7 +5015,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -5058,7 +5031,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5075,7 +5048,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5090,7 +5063,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -5104,7 +5077,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -5121,7 +5094,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5144,7 +5117,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5159,7 +5132,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -5173,7 +5146,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5189,7 +5162,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -5210,7 +5183,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5226,7 +5199,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -5240,7 +5213,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5263,7 +5236,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5274,7 +5247,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "log", "sp-arithmetic", @@ -5283,7 +5256,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -5297,7 +5270,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5315,7 +5288,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5334,7 +5307,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-support", "frame-system", @@ -5351,7 +5324,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5368,7 +5341,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5379,7 +5352,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5396,7 +5369,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5412,7 +5385,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5485,7 +5458,7 @@ dependencies = [ "log", "lz4", "memmap2", - "parking_lot 0.11.1", + "parking_lot", "rand 0.8.4", "snap", ] @@ -5548,7 +5521,7 @@ dependencies = [ "impl-trait-for-tuples", "lru 0.6.6", "parity-util-mem-derive", - "parking_lot 0.11.1", + "parking_lot", "primitive-types", "smallvec", "tikv-jemalloc-ctl", @@ -5606,16 +5579,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] - [[package]] name = "parking_lot" version = "0.11.1" @@ -5623,22 +5586,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.1", - "parking_lot_core 0.8.0", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi 0.0.3", - "libc", - "redox_syscall 0.1.56", - "smallvec", - "winapi 0.3.9", + "lock_api", + "parking_lot_core", ] [[package]] @@ -5648,7 +5597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" dependencies = [ "cfg-if 0.1.10", - "cloudabi 0.1.0", + "cloudabi", "instant", "libc", "redox_syscall 0.1.56", @@ -6096,7 +6045,7 @@ dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -6142,7 +6091,7 @@ dependencies = [ "lru 0.7.0", "merlin", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6177,7 +6126,7 @@ dependencies = [ "kvdb-memorydb", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6280,7 +6229,7 @@ dependencies = [ "kvdb", "kvdb-memorydb", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -6426,7 +6375,7 @@ dependencies = [ "log", "mick-jaeger", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -6498,7 +6447,7 @@ version = "0.9.11" dependencies = [ "async-trait", "futures 0.3.17", - "parking_lot 0.11.1", + "parking_lot", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", @@ -6569,7 +6518,7 @@ dependencies = [ "lru 0.7.0", "metered-channel", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7423,7 +7372,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.11.1", + "parking_lot", "thiserror", ] @@ -7808,7 +7757,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "env_logger 0.9.0", "jsonrpsee-proc-macros", @@ -8071,7 +8020,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "log", "sp-core", @@ -8082,7 +8031,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "derive_more", @@ -8109,7 +8058,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8132,7 +8081,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8148,7 +8097,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8164,7 +8113,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8175,7 +8124,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "chrono", "fdlimit", @@ -8213,14 +8162,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "fnv", "futures 0.3.17", "hash-db", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -8241,7 +8190,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "hash-db", "kvdb", @@ -8251,7 +8200,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -8266,14 +8215,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "futures 0.3.17", "futures-timer 3.0.2", "libp2p", "log", - "parking_lot 0.11.1", + "parking_lot", "sc-client-api", "sc-utils", "serde", @@ -8290,7 +8239,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "derive_more", @@ -8302,7 +8251,7 @@ dependencies = [ "num-rational 0.2.4", "num-traits", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -8333,7 +8282,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "derive_more", "futures 0.3.17", @@ -8357,7 +8306,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8370,7 +8319,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "assert_matches", "async-trait", @@ -8404,7 +8353,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "futures 0.3.17", @@ -8430,7 +8379,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "sc-client-api", "sp-authorship", @@ -8441,13 +8390,13 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -8467,7 +8416,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "derive_more", "environmental", @@ -8485,7 +8434,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "log", "parity-scale-codec", @@ -8501,7 +8450,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8519,7 +8468,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "derive_more", @@ -8530,7 +8479,7 @@ dependencies = [ "futures-timer 3.0.2", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "rand 0.8.4", "sc-block-builder", "sc-client-api", @@ -8556,7 +8505,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "derive_more", "finality-grandpa", @@ -8580,7 +8529,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -8597,12 +8546,12 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "derive_more", "hex", - "parking_lot 0.11.1", + "parking_lot", "serde_json", "sp-application-crypto", "sp-core", @@ -8612,11 +8561,11 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "hash-db", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sc-client-api", "sc-executor", "sp-api", @@ -8630,7 +8579,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-std", "async-trait", @@ -8652,7 +8601,7 @@ dependencies = [ "log", "lru 0.6.6", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "pin-project 1.0.8", "prost", "prost-build", @@ -8681,7 +8630,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8697,7 +8646,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "bytes 1.0.1", "fnv", @@ -8709,7 +8658,7 @@ dependencies = [ "log", "num_cpus", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "rand 0.7.3", "sc-client-api", "sc-network", @@ -8724,7 +8673,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "libp2p", @@ -8737,7 +8686,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8746,7 +8695,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "hash-db", @@ -8754,7 +8703,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -8777,7 +8726,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8786,7 +8735,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sc-chain-spec", "sc-transaction-pool-api", "serde", @@ -8802,7 +8751,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8819,7 +8768,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "directories", @@ -8832,7 +8781,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot", "pin-project 1.0.8", "rand 0.7.3", "sc-block-builder", @@ -8884,13 +8833,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "log", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.1", + "parking_lot", "sc-client-api", "sp-core", ] @@ -8898,7 +8847,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8920,13 +8869,13 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "chrono", "futures 0.3.17", "libp2p", "log", - "parking_lot 0.11.1", + "parking_lot", "pin-project 1.0.8", "rand 0.7.3", "serde", @@ -8938,7 +8887,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8946,7 +8895,7 @@ dependencies = [ "lazy_static", "log", "once_cell", - "parking_lot 0.11.1", + "parking_lot", "regex", "rustc-hash", "sc-client-api", @@ -8968,7 +8917,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8979,7 +8928,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "intervalier", @@ -8987,7 +8936,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -9006,7 +8955,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "derive_more", "futures 0.3.17", @@ -9020,7 +8969,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9357,15 +9306,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -[[package]] -name = "slog" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" -dependencies = [ - "erased-serde", -] - [[package]] name = "slot-range-helper" version = "0.9.11" @@ -9472,7 +9412,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "hash-db", "log", @@ -9489,7 +9429,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -9501,7 +9441,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "scale-info", @@ -9514,7 +9454,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "integer-sqrt", "num-traits", @@ -9529,7 +9469,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "scale-info", @@ -9542,7 +9482,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "parity-scale-codec", @@ -9554,7 +9494,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "sp-api", @@ -9566,13 +9506,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "log", "lru 0.6.6", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sp-api", "sp-consensus", "sp-database", @@ -9584,7 +9524,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "futures 0.3.17", @@ -9603,7 +9543,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "merlin", @@ -9626,7 +9566,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "scale-info", @@ -9637,7 +9577,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9649,7 +9589,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "base58", "blake2-rfc", @@ -9668,7 +9608,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot", "primitive-types", "rand 0.7.3", "regex", @@ -9682,6 +9622,7 @@ dependencies = [ "sp-runtime-interface", "sp-std", "sp-storage", + "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", @@ -9694,16 +9635,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "kvdb", - "parking_lot 0.11.1", + "parking_lot", ] [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "proc-macro2", "quote", @@ -9713,7 +9654,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "environmental", "parity-scale-codec", @@ -9724,7 +9665,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "finality-grandpa", "log", @@ -9742,7 +9683,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9756,14 +9697,14 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "hash-db", "libsecp256k1 0.6.0", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "sp-core", "sp-externalities", "sp-keystore", @@ -9780,7 +9721,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "lazy_static", "sp-core", @@ -9791,14 +9732,14 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "derive_more", "futures 0.3.17", "merlin", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "schnorrkel", "serde", "sp-core", @@ -9808,7 +9749,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "zstd", ] @@ -9816,7 +9757,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "scale-info", @@ -9831,7 +9772,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9842,7 +9783,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "sp-api", "sp-core", @@ -9852,7 +9793,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "backtrace", ] @@ -9860,7 +9801,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "rustc-hash", "serde", @@ -9870,7 +9811,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "either", "hash256-std-hasher", @@ -9892,7 +9833,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9909,7 +9850,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -9921,7 +9862,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "serde", "serde_json", @@ -9930,7 +9871,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "scale-info", @@ -9944,7 +9885,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "scale-info", @@ -9955,13 +9896,13 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "hash-db", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot", "rand 0.7.3", "smallvec", "sp-core", @@ -9978,12 +9919,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9996,7 +9937,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "log", "sp-core", @@ -10009,7 +9950,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10025,15 +9966,9 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ - "erased-serde", - "log", "parity-scale-codec", - "parking_lot 0.10.2", - "serde", - "serde_json", - "slog", "sp-std", "tracing", "tracing-core", @@ -10043,7 +9978,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "sp-api", "sp-runtime", @@ -10052,7 +9987,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "log", @@ -10068,7 +10003,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "hash-db", "memory-db", @@ -10083,7 +10018,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10099,7 +10034,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10110,7 +10045,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10124,6 +10059,20 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "ss58-registry" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2413ecc7946ca99368862851dc1359f1477bc654ecfb135cf3efcb85ceca5f" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "serde", + "serde_json", + "unicode-xid", +] + [[package]] name = "stable_deref_trait" version = "1.1.1" @@ -10180,7 +10129,7 @@ checksum = "11b73400442027c4adedda20a9f9b7945234a5bd8d5f7e86da22bd5d0622369c" dependencies = [ "cfg_aliases", "libc", - "parking_lot 0.11.1", + "parking_lot", "static_init_macro", ] @@ -10324,7 +10273,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "platforms", ] @@ -10332,7 +10281,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -10354,7 +10303,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-std", "derive_more", @@ -10368,7 +10317,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "async-trait", "futures 0.3.17", @@ -10395,7 +10344,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "futures 0.3.17", "substrate-test-utils-derive", @@ -10405,7 +10354,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10416,7 +10365,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -10569,7 +10518,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "frame-system", "futures 0.3.17", @@ -10994,7 +10943,7 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "parking_lot 0.11.1", + "parking_lot", "resolv-conf", "smallvec", "thiserror", @@ -11010,7 +10959,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#66fd76181742a1fa27b4ab5c41eb15d9765e6774" +source = "git+https://github.com/paritytech/substrate?branch=master#cafe12e7785bf92e5dc04780c10e7f8330a15a4c" dependencies = [ "jsonrpsee-ws-client", "log", @@ -11368,7 +11317,7 @@ checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ "futures 0.3.17", "js-sys", - "parking_lot 0.11.1", + "parking_lot", "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", @@ -11946,7 +11895,7 @@ dependencies = [ "futures 0.3.17", "log", "nohash-hasher", - "parking_lot 0.11.1", + "parking_lot", "rand 0.8.4", "static_assertions", ] diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs index c9ba571e828..d9460dd5ac6 100644 --- a/polkadot/cli/src/command.rs +++ b/polkadot/cli/src/command.rs @@ -19,6 +19,7 @@ use futures::future::TryFutureExt; use log::info; use sc_cli::{Role, RuntimeVersion, SubstrateCli}; use service::{self, IdentifyVariant}; +use sp_core::crypto::Ss58AddressFormatRegistry; #[derive(thiserror::Error, Debug)] pub enum Error { @@ -191,15 +192,14 @@ impl SubstrateCli for Cli { } fn set_default_ss58_version(spec: &Box<dyn service::ChainSpec>) { - use sp_core::crypto::Ss58AddressFormat; - let ss58_version = if spec.is_kusama() { - Ss58AddressFormat::KusamaAccount + Ss58AddressFormatRegistry::KusamaAccount } else if spec.is_westend() { - Ss58AddressFormat::SubstrateAccount + Ss58AddressFormatRegistry::SubstrateAccount } else { - Ss58AddressFormat::PolkadotAccount - }; + Ss58AddressFormatRegistry::PolkadotAccount + } + .into(); sp_core::crypto::set_default_ss58_version(ss58_version); } diff --git a/polkadot/utils/staking-miner/src/main.rs b/polkadot/utils/staking-miner/src/main.rs index b3f504ff2d0..96f34648d27 100644 --- a/polkadot/utils/staking-miner/src/main.rs +++ b/polkadot/utils/staking-miner/src/main.rs @@ -534,7 +534,7 @@ async fn main() { match chain.to_lowercase().as_str() { "polkadot" | "development" => { sp_core::crypto::set_default_ss58_version( - sp_core::crypto::Ss58AddressFormat::PolkadotAccount, + sp_core::crypto::Ss58AddressFormatRegistry::PolkadotAccount.into(), ); sub_tokens::dynamic::set_name("DOT"); sub_tokens::dynamic::set_decimal_points(10_000_000_000); @@ -546,7 +546,7 @@ async fn main() { }, "kusama" | "kusama-dev" => { sp_core::crypto::set_default_ss58_version( - sp_core::crypto::Ss58AddressFormat::KusamaAccount, + sp_core::crypto::Ss58AddressFormatRegistry::KusamaAccount.into(), ); sub_tokens::dynamic::set_name("KSM"); sub_tokens::dynamic::set_decimal_points(1_000_000_000_000); @@ -558,7 +558,7 @@ async fn main() { }, "westend" => { sp_core::crypto::set_default_ss58_version( - sp_core::crypto::Ss58AddressFormat::PolkadotAccount, + sp_core::crypto::Ss58AddressFormatRegistry::PolkadotAccount.into(), ); sub_tokens::dynamic::set_name("WND"); sub_tokens::dynamic::set_decimal_points(1_000_000_000_000); -- GitLab