From 62146d849da45a1bb808879418f9062f65fce8fb Mon Sep 17 00:00:00 2001 From: David Date: Thu, 11 Nov 2021 14:00:58 +0100 Subject: [PATCH] =?UTF-8?q?Companion=20=E2=80=93=20Update=20jsonrpsee=20to?= =?UTF-8?q?=200.4.1=20(#4256)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update staking-miner * fmt * lockfile * Point to substrate companion branch * Revert "Point to substrate companion branch" This reverts commit 3f8afc5d3137614776f54c7dac3c9077268c5fe5. * Revert 3f8afc5d3137614776f54c7dac3c9077268c5fe5 * Remove `params` macro in favour of `rpc_macro` from jsonrpsee * update Cargo.lock * remove unused import Co-authored-by: Andronik Ordian --- polkadot/Cargo.lock | 456 ++++++++---------- polkadot/utils/staking-miner/Cargo.toml | 2 +- polkadot/utils/staking-miner/src/dry_run.rs | 7 +- polkadot/utils/staking-miner/src/main.rs | 21 +- polkadot/utils/staking-miner/src/monitor.rs | 18 +- .../utils/staking-miner/src/rpc_helpers.rs | 28 +- polkadot/utils/staking-miner/src/signer.rs | 2 +- 7 files changed, 244 insertions(+), 290 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index e89fac19ef..e36892ff13 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -150,9 +150,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2f58b0bb10c380af2b26e57212856b8c9a59e0925b4c20f4a174a49734eaf7" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "asn1_der" @@ -418,19 +418,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "bae" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf" -dependencies = [ - "heck", - "proc-macro-error 0.4.12", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "base-x" version = "0.2.8" @@ -457,9 +444,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "beef" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409" +checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" dependencies = [ "serde", ] @@ -467,7 +454,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "beefy-primitives", "fnv", @@ -495,7 +482,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -515,12 +502,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -1916,7 +1903,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", ] @@ -1934,7 +1921,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -1954,7 +1941,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "Inflector", "chrono", @@ -1980,7 +1967,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -1994,7 +1981,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -2022,7 +2009,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "bitflags", "frame-metadata", @@ -2051,7 +2038,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2063,7 +2050,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -2075,7 +2062,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "proc-macro2", "quote", @@ -2085,7 +2072,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2108,7 +2095,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -2119,7 +2106,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "log", @@ -2136,7 +2123,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -2151,7 +2138,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -2160,7 +2147,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "sp-api", @@ -2373,7 +2360,7 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "chrono", "frame-election-provider-support", @@ -3074,13 +3061,24 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-proc-macros" -version = "0.3.1" +name = "jsonrpsee" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edb341d35279b59c79d7fe9e060a51aec29d45af99cc7c72ea7caa350fa71a4" +checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" dependencies = [ - "Inflector", - "bae", + "jsonrpsee-proc-macros", + "jsonrpsee-types", + "jsonrpsee-utils", + "jsonrpsee-ws-client", +] + +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d802063f7a3c867456955f9d2f15eb3ee0edb5ec9ec2b5526324756759221c0f" +dependencies = [ + "log", "proc-macro-crate 1.1.0", "proc-macro2", "quote", @@ -3089,10 +3087,11 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc738fd55b676ada3271ef7c383a14a0867a2a88b0fa941311bf5fc0a29d498" +checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2" dependencies = [ + "anyhow", "async-trait", "beef", "futures-channel", @@ -3101,32 +3100,43 @@ dependencies = [ "log", "serde", "serde_json", - "soketto 0.6.0", + "soketto 0.7.1", "thiserror", ] [[package]] -name = "jsonrpsee-ws-client" -version = "0.3.1" +name = "jsonrpsee-utils" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9841352dbecf4c2ed5dc71698df9f1660262ae4e0b610e968602529bdbcf7b30" +checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" dependencies = [ + "arrayvec 0.7.2", + "beef", + "jsonrpsee-types", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef" +dependencies = [ + "arrayvec 0.7.2", "async-trait", "fnv", "futures 0.3.17", + "http", "jsonrpsee-types", "log", "pin-project 1.0.8", - "rustls", "rustls-native-certs", "serde", "serde_json", - "soketto 0.6.0", + "soketto 0.7.1", "thiserror", "tokio", "tokio-rustls", "tokio-util", - "url 2.2.0", ] [[package]] @@ -4354,7 +4364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" dependencies = [ "proc-macro-crate 1.1.0", - "proc-macro-error 1.0.4", + "proc-macro-error", "proc-macro2", "quote", "syn", @@ -4648,7 +4658,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4662,7 +4672,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -4678,7 +4688,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -4693,7 +4703,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4717,7 +4727,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4737,7 +4747,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "clap", "frame-election-provider-support", @@ -4759,7 +4769,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4774,7 +4784,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "beefy-primitives", "frame-support", @@ -4790,7 +4800,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4815,7 +4825,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4900,7 +4910,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4917,7 +4927,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4933,7 +4943,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4957,7 +4967,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4975,7 +4985,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4990,7 +5000,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5013,7 +5023,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5029,7 +5039,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5049,7 +5059,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5066,7 +5076,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5083,7 +5093,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5101,7 +5111,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -5117,7 +5127,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5134,7 +5144,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5149,7 +5159,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -5163,7 +5173,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -5180,7 +5190,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5203,7 +5213,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5218,7 +5228,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -5232,7 +5242,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5248,7 +5258,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -5269,7 +5279,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5285,7 +5295,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -5299,7 +5309,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5322,7 +5332,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5333,7 +5343,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "log", "sp-arithmetic", @@ -5342,7 +5352,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -5356,7 +5366,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5374,7 +5384,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5393,7 +5403,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-support", "frame-system", @@ -5410,7 +5420,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5427,7 +5437,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5438,7 +5448,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5455,7 +5465,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5471,7 +5481,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5555,7 +5565,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ - "arrayvec 0.7.0", + "arrayvec 0.7.2", "bitvec 0.20.1", "byte-slice-cast", "impl-trait-for-tuples", @@ -7389,45 +7399,19 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-error" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" -dependencies = [ - "proc-macro-error-attr 0.4.12", - "proc-macro2", - "quote", - "syn", - "version_check", -] - [[package]] name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "proc-macro-error-attr 1.0.4", + "proc-macro-error-attr", "proc-macro2", "quote", "syn", "version_check", ] -[[package]] -name = "proc-macro-error-attr" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "syn-mid", - "version_check", -] - [[package]] name = "proc-macro-error-attr" version = "1.0.4" @@ -7902,11 +7886,10 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "env_logger 0.9.0", - "jsonrpsee-proc-macros", - "jsonrpsee-ws-client", + "jsonrpsee", "log", "parity-scale-codec", "serde", @@ -8191,7 +8174,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "log", "sp-core", @@ -8202,7 +8185,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "derive_more", @@ -8229,7 +8212,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8252,7 +8235,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8268,7 +8251,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8285,7 +8268,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8296,7 +8279,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "chrono", "fdlimit", @@ -8334,7 +8317,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "fnv", "futures 0.3.17", @@ -8362,7 +8345,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "hash-db", "kvdb", @@ -8387,7 +8370,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "futures 0.3.17", @@ -8411,7 +8394,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "derive_more", @@ -8454,7 +8437,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "derive_more", "futures 0.3.17", @@ -8478,7 +8461,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8491,7 +8474,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "assert_matches", "async-trait", @@ -8525,7 +8508,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "futures 0.3.17", @@ -8551,7 +8534,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "sc-client-api", "sp-authorship", @@ -8562,7 +8545,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -8589,7 +8572,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "derive_more", "environmental", @@ -8607,7 +8590,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "log", "parity-scale-codec", @@ -8623,7 +8606,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8641,7 +8624,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "derive_more", @@ -8678,7 +8661,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "derive_more", "finality-grandpa", @@ -8702,7 +8685,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -8719,7 +8702,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "derive_more", @@ -8734,7 +8717,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "hash-db", "parity-scale-codec", @@ -8752,7 +8735,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-std", "async-trait", @@ -8803,7 +8786,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8819,7 +8802,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "bytes 1.0.1", "fnv", @@ -8847,7 +8830,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "libp2p", @@ -8860,7 +8843,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8869,7 +8852,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "hash-db", @@ -8900,7 +8883,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8925,7 +8908,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8942,7 +8925,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "directories", @@ -9006,7 +8989,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "log", "parity-scale-codec", @@ -9020,7 +9003,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9042,7 +9025,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "chrono", "futures 0.3.17", @@ -9060,7 +9043,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9091,7 +9074,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9102,7 +9085,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "intervalier", @@ -9129,7 +9112,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "derive_more", "futures 0.3.17", @@ -9143,7 +9126,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9556,9 +9539,9 @@ dependencies = [ [[package]] name = "soketto" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f" +checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64 0.13.0", "bytes 1.0.1", @@ -9572,7 +9555,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "hash-db", "log", @@ -9589,7 +9572,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -9601,7 +9584,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -9614,7 +9597,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "integer-sqrt", "num-traits", @@ -9629,7 +9612,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -9642,7 +9625,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "parity-scale-codec", @@ -9654,7 +9637,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -9666,7 +9649,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "log", @@ -9684,7 +9667,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "futures 0.3.17", @@ -9703,7 +9686,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "merlin", @@ -9726,7 +9709,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -9738,7 +9721,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9750,7 +9733,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "base58", "bitflags", @@ -9798,7 +9781,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "blake2-rfc", "byteorder", @@ -9811,7 +9794,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "proc-macro2", "quote", @@ -9822,7 +9805,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "kvdb", "parking_lot", @@ -9831,7 +9814,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "proc-macro2", "quote", @@ -9841,7 +9824,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "environmental", "parity-scale-codec", @@ -9852,7 +9835,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "finality-grandpa", "log", @@ -9870,7 +9853,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9884,7 +9867,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "hash-db", @@ -9908,7 +9891,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "lazy_static", "sp-core", @@ -9919,7 +9902,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "derive_more", @@ -9936,7 +9919,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "zstd", ] @@ -9944,7 +9927,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -9959,7 +9942,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9970,7 +9953,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "sp-api", "sp-core", @@ -9980,7 +9963,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "backtrace", "lazy_static", @@ -9990,7 +9973,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "rustc-hash", "serde", @@ -10000,7 +9983,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "either", "hash256-std-hasher", @@ -10022,7 +10005,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10039,7 +10022,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -10051,7 +10034,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "serde", "serde_json", @@ -10060,7 +10043,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -10074,7 +10057,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -10085,7 +10068,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "hash-db", "log", @@ -10108,12 +10091,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10126,7 +10109,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "log", "sp-core", @@ -10139,7 +10122,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10155,7 +10138,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "sp-std", @@ -10167,7 +10150,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "sp-api", "sp-runtime", @@ -10176,7 +10159,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "log", @@ -10192,7 +10175,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "hash-db", "memory-db", @@ -10207,7 +10190,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10223,7 +10206,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10234,7 +10217,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10276,7 +10259,7 @@ dependencies = [ "frame-election-provider-support", "frame-support", "frame-system", - "jsonrpsee-ws-client", + "jsonrpsee", "kusama-runtime", "log", "pallet-balances", @@ -10372,7 +10355,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", - "proc-macro-error 1.0.4", + "proc-macro-error", "proc-macro2", "quote", "syn", @@ -10423,7 +10406,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "platforms", ] @@ -10431,7 +10414,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -10453,7 +10436,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-std", "derive_more", @@ -10467,7 +10450,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "async-trait", "futures 0.3.17", @@ -10494,7 +10477,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "futures 0.3.17", "substrate-test-utils-derive", @@ -10504,7 +10487,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10515,7 +10498,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -10550,17 +10533,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "syn-mid" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "synstructure" version = "0.12.4" @@ -10668,7 +10640,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ "frame-system", "futures 0.3.17", @@ -11110,9 +11082,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3374a73c9824638b8270062b104906a714ea14f9" +source = "git+https://github.com/paritytech/substrate?branch=master#7b1c81f5b4966548fc281d3d164e317e338ef2d6" dependencies = [ - "jsonrpsee-ws-client", + "jsonrpsee", "log", "parity-scale-codec", "remote-externalities", diff --git a/polkadot/utils/staking-miner/Cargo.toml b/polkadot/utils/staking-miner/Cargo.toml index 463fe135d4..c77ec25026 100644 --- a/polkadot/utils/staking-miner/Cargo.toml +++ b/polkadot/utils/staking-miner/Cargo.toml @@ -10,7 +10,7 @@ tokio = { version = "1.13", features = ["macros"] } log = "0.4.11" env_logger = "0.9.0" structopt = "0.3.25" -jsonrpsee-ws-client = { version = "0.3.1", default-features = false, features = ["tokio1"] } +jsonrpsee = { version = "0.4.1", default-features = false, features = ["ws-client"] } serde_json = "1.0" serde = "1.0.130" paste = "1.0.6" diff --git a/polkadot/utils/staking-miner/src/dry_run.rs b/polkadot/utils/staking-miner/src/dry_run.rs index 9501adb96f..81d17a21ae 100644 --- a/polkadot/utils/staking-miner/src/dry_run.rs +++ b/polkadot/utils/staking-miner/src/dry_run.rs @@ -17,10 +17,11 @@ //! The dry-run command. use crate::{ - params, prelude::*, rpc_helpers::*, signer::Signer, DryRunConfig, Error, SharedConfig, WsClient, + prelude::*, rpc_helpers::*, signer::Signer, DryRunConfig, Error, SharedConfig, WsClient, }; use codec::Encode; use frame_support::traits::Currency; +use jsonrpsee::rpc_params; /// Forcefully create the snapshot. This can be used to compute the election at anytime. fn force_create_snapshot(ext: &mut Ext) -> Result<(), Error> { @@ -74,7 +75,7 @@ async fn print_info( let info = rpc::>( client, "payment_queryInfo", - params! { extrinsic }, + rpc_params! { extrinsic }, ) .await; log::info!( @@ -149,7 +150,7 @@ macro_rules! dry_run_cmd_for { ($runtime:ident) => { paste::paste! { }); log::info!(target: LOG_TARGET, "dispatch result is {:?}", dispatch_result); - let outcome = rpc_decode::(client, "system_dryRun", params!{ bytes }) + let outcome = rpc_decode::(client, "system_dryRun", rpc_params!{ bytes }) .await .map_err::, _>(Into::into)?; log::info!(target: LOG_TARGET, "dry-run outcome is {:?}", outcome); diff --git a/polkadot/utils/staking-miner/src/main.rs b/polkadot/utils/staking-miner/src/main.rs index 5692d991e2..95319f9e24 100644 --- a/polkadot/utils/staking-miner/src/main.rs +++ b/polkadot/utils/staking-miner/src/main.rs @@ -40,10 +40,10 @@ pub(crate) use signer::get_account_info; use frame_election_provider_support::NposSolver; use frame_support::traits::Get; -use jsonrpsee_ws_client::{WsClient, WsClientBuilder}; +use jsonrpsee::ws_client::{WsClient, WsClientBuilder}; use remote_externalities::{Builder, Mode, OnlineConfig}; use sp_npos_elections::ExtendedBalance; -use sp_runtime::traits::Block as BlockT; +use sp_runtime::{traits::Block as BlockT, DeserializeOwned}; use structopt::StructOpt; pub(crate) enum AnyRuntime { @@ -225,7 +225,7 @@ macro_rules! any_runtime_unit { #[derive(frame_support::DebugNoBound, thiserror::Error)] enum Error { Io(#[from] std::io::Error), - JsonRpsee(#[from] jsonrpsee_ws_client::types::Error), + JsonRpsee(#[from] jsonrpsee::types::Error), RpcHelperError(#[from] rpc_helpers::RpcHelperError), Codec(#[from] codec::Error), Crypto(sp_core::crypto::SecretStringError), @@ -364,7 +364,7 @@ struct Opt { /// Build the Ext at hash with all the data of `ElectionProviderMultiPhase` and any additional /// pallets. -async fn create_election_ext( +async fn create_election_ext( uri: String, at: Option, additional: Vec, @@ -493,13 +493,10 @@ pub(crate) async fn check_versions( client: &WsClient, ) -> Result<(), Error> { let linked_version = T::Version::get(); - let on_chain_version = rpc_helpers::rpc::( - client, - "state_getRuntimeVersion", - params! {}, - ) - .await - .expect("runtime version RPC should always work; qed"); + let on_chain_version = + rpc_helpers::rpc::(client, "state_getRuntimeVersion", None) + .await + .expect("runtime version RPC should always work; qed"); log::debug!(target: LOG_TARGET, "linked version {:?}", linked_version); log::debug!(target: LOG_TARGET, "on-chain version {:?}", on_chain_version); @@ -543,7 +540,7 @@ async fn main() { } }; - let chain = rpc_helpers::rpc::(&client, "system_chain", params! {}) + let chain = rpc_helpers::rpc::(&client, "system_chain", None) .await .expect("system_chain infallible; qed."); match chain.to_lowercase().as_str() { diff --git a/polkadot/utils/staking-miner/src/monitor.rs b/polkadot/utils/staking-miner/src/monitor.rs index e603706e2f..19259098df 100644 --- a/polkadot/utils/staking-miner/src/monitor.rs +++ b/polkadot/utils/staking-miner/src/monitor.rs @@ -16,14 +16,14 @@ //! The monitor command. -use crate::{ - params, prelude::*, rpc_helpers::*, signer::Signer, Error, MonitorConfig, SharedConfig, -}; +use crate::{prelude::*, rpc_helpers::*, signer::Signer, Error, MonitorConfig, SharedConfig}; use codec::Encode; -use jsonrpsee_ws_client::{ +use jsonrpsee::{ + rpc_params, types::{traits::SubscriptionClient, Subscription}, - WsClient, + ws_client::WsClient, }; + use sc_transaction_pool_api::TransactionStatus; use sp_core::storage::StorageKey; @@ -33,7 +33,7 @@ async fn ensure_signed_phase( at: B::Hash, ) -> Result<(), Error> { let key = StorageKey(EPM::CurrentPhase::::hashed_key().to_vec()); - let phase = get_storage::>(client, params! {key, at}) + let phase = get_storage::>(client, rpc_params! {key, at}) .await .map_err::, _>(Into::into)? .unwrap_or_default(); @@ -82,7 +82,7 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! { loop { log::info!(target: LOG_TARGET, "subscribing to {:?} / {:?}", sub, unsub); let mut subscription: Subscription
= client - .subscribe(&sub, params! {}, &unsub) + .subscribe(&sub, None, &unsub) .await .unwrap(); @@ -134,7 +134,7 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! { let mut tx_subscription: Subscription< TransactionStatus<::Hash, ::Hash> > = match client - .subscribe(&"author_submitAndWatchExtrinsic", params! { bytes }, "author_unwatchExtrinsic") + .subscribe(&"author_submitAndWatchExtrinsic", rpc_params! { bytes }, "author_unwatchExtrinsic") .await { Ok(sub) => sub, @@ -159,7 +159,7 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! { log::info!(target: LOG_TARGET, "included at {:?}", hash); let key = StorageKey(frame_support::storage::storage_prefix(b"System",b"Events").to_vec()); let events = get_storage::::Hash>>, - >(client, params!{ key, hash }).await?.unwrap_or_default(); + >(client, rpc_params!{ key, hash }).await?.unwrap_or_default(); log::info!(target: LOG_TARGET, "events at inclusion {:?}", events); } TransactionStatus::Retracted(hash) => { diff --git a/polkadot/utils/staking-miner/src/rpc_helpers.rs b/polkadot/utils/staking-miner/src/rpc_helpers.rs index 8cb7330bf0..1277564ebd 100644 --- a/polkadot/utils/staking-miner/src/rpc_helpers.rs +++ b/polkadot/utils/staking-miner/src/rpc_helpers.rs @@ -17,12 +17,12 @@ //! Helper method for RPC. use super::*; -use jsonrpsee_ws_client::types::traits::Client; -pub(crate) use jsonrpsee_ws_client::types::v2::params::JsonRpcParams; +use jsonrpsee::types::traits::Client; +pub(crate) use jsonrpsee::types::v2::ParamsSer; #[derive(frame_support::DebugNoBound, thiserror::Error)] pub(crate) enum RpcHelperError { - JsonRpsee(#[from] jsonrpsee_ws_client::types::Error), + JsonRpsee(#[from] jsonrpsee::types::Error), Codec(#[from] codec::Error), } @@ -32,27 +32,11 @@ impl std::fmt::Display for RpcHelperError { } } -#[macro_export] -macro_rules! params { - ($($param:expr),*) => { - { - let mut __params = vec![]; - $( - __params.push(serde_json::to_value($param).expect("json serialization infallible; qed.")); - )* - $crate::rpc_helpers::JsonRpcParams::Array(__params) - } - }; - () => { - $crate::rpc::JsonRpcParams::NoParams, - } -} - /// Make the rpc request, returning `Ret`. pub(crate) async fn rpc<'a, Ret: serde::de::DeserializeOwned>( client: &WsClient, method: &'a str, - params: JsonRpcParams<'a>, + params: Option>, ) -> Result { client .request::(method, params) @@ -65,7 +49,7 @@ pub(crate) async fn rpc<'a, Ret: serde::de::DeserializeOwned>( pub(crate) async fn rpc_decode<'a, Dec: codec::Decode>( client: &WsClient, method: &'a str, - params: JsonRpcParams<'a>, + params: Option>, ) -> Result { let bytes = rpc::(client, method, params) .await @@ -76,7 +60,7 @@ pub(crate) async fn rpc_decode<'a, Dec: codec::Decode>( /// Get the storage item. pub(crate) async fn get_storage<'a, T: codec::Decode>( client: &WsClient, - params: JsonRpcParams<'a>, + params: Option>, ) -> Result, RpcHelperError> { let maybe_bytes = rpc::>(client, "state_getStorage", params) .await diff --git a/polkadot/utils/staking-miner/src/signer.rs b/polkadot/utils/staking-miner/src/signer.rs index bc996ef351..e976cb8f24 100644 --- a/polkadot/utils/staking-miner/src/signer.rs +++ b/polkadot/utils/staking-miner/src/signer.rs @@ -41,7 +41,7 @@ pub(crate) async fn get_account_info( ) -> Result>, Error> { rpc_helpers::get_storage::>( client, - crate::params! { + jsonrpsee::rpc_params! { sp_core::storage::StorageKey(>::hashed_key_for(&who)), maybe_at },