From 931aa5ad6e5e460166e8ad7cf367fad18e67e584 Mon Sep 17 00:00:00 2001 From: fewensa <37804932+fewensa@users.noreply.github.com> Date: Fri, 3 Sep 2021 09:47:32 +0800 Subject: [PATCH] Upgrade subxt (#6) * Reorg the order of deps (#284) * Reorg the order of deps This patch is simply for easier editor operation when replacing the substrate deps. * . * deps: update jsonrpsee 0.2.0 (#285) * deps: update jsonrpsee 0.2.0 The motivation is to avoid pinning certain alpha versions and to avoid breaking users builds without having to some `Cargo.lock` updating. * cargo fmt * fix tests * fix a few clippy lints * cargo fmt * Update substrate * update version * update version * update version * deps: update jsonrpsee 0.3.0 (#289) Signed-off-by: Gregory Hill * Add NextKeys and QueuedKeys for session module (#291) * Add NextKeys and QueuedKeys for session module * Fix fmt * for darwinia * fix test, use `RuntimeMetadata::V13` Co-authored-by: Liu-Cheng Xu Co-authored-by: Niklas Adolfsson Co-authored-by: Aki Wu Co-authored-by: Greg Hill --- Cargo.lock | 1096 ++++++++++++++++++++++++++--------------- Cargo.toml | 60 +-- client/Cargo.toml | 15 +- client/src/lib.rs | 69 ++- proc-macro/Cargo.toml | 5 +- src/error.rs | 6 +- src/events.rs | 4 +- src/frame/session.rs | 16 + src/lib.rs | 8 +- src/metadata.rs | 2 +- src/rpc.rs | 18 +- src/runtimes.rs | 2 +- src/subscription.rs | 31 +- src/tests/mod.rs | 4 +- 14 files changed, 835 insertions(+), 501 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca0c5467fe..91f603e9c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,22 +187,9 @@ checksum = "5a2f58b0bb10c380af2b26e57212856b8c9a59e0925b4c20f4a174a49734eaf7" [[package]] name = "asn1_der" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fce6b6a0ffdafebd82c87e79e3f40e8d2c523e5fea5566ff6b90509bf98d638" -dependencies = [ - "asn1_der_derive", -] - -[[package]] -name = "asn1_der_derive" -version = "0.1.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" -dependencies = [ - "quote", - "syn", -] +checksum = "9d6e24d2cce90c53b948c46271bfb053e4bdc2db9b5d3f65e20f8cf28a1b7fc3" [[package]] name = "assert_matches" @@ -259,6 +246,7 @@ dependencies = [ "futures-lite", "num_cpus", "once_cell", + "tokio 1.6.0", ] [[package]] @@ -346,24 +334,25 @@ dependencies = [ ] [[package]] -name = "async-task" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" - -[[package]] -name = "async-tls" -version = "0.11.0" +name = "async-std-resolver" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400" +checksum = "ed4e2c3da14d8ad45acb1e3191db7a918e9505b6f155b218e70a7c9a1a48c638" dependencies = [ - "futures-core", + "async-std", + "async-trait", "futures-io", - "rustls 0.19.1", - "webpki 0.21.4", - "webpki-roots", + "futures-util", + "pin-utils", + "trust-dns-resolver", ] +[[package]] +name = "async-task" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" + [[package]] name = "async-trait" version = "0.1.50" @@ -448,6 +437,19 @@ 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" @@ -477,6 +479,9 @@ name = "beef" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409" +dependencies = [ + "serde", +] [[package]] name = "bincode" @@ -866,18 +871,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "cranelift-bforest" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4066fd63b502d73eb8c5fa6bcab9c7962b05cd580f6b149ee83a8e730d8ce7fb" +checksum = "bcee7a5107071484772b89fdf37f0f460b7db75f476e43ea7a684fd942470bcf" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a54e4beb833a3c873a18a8fe735d73d732044004c7539a072c8faa35ccb0c60" +checksum = "654ab96f0f1cab71c0d323618a58360a492da2c341eb2c1f977fc195c664001b" dependencies = [ "byteorder", "cranelift-bforest", @@ -895,9 +900,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54cac7cacb443658d8f0ff36a3545822613fa202c946c0891897843bc933810" +checksum = "65994cfc5be9d5fd10c5fc30bcdddfa50c04bb79c91329287bff846434ff8f14" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -905,24 +910,27 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a109760aff76788b2cdaeefad6875a73c2b450be13906524f6c2a81e05b8d83c" +checksum = "889d720b688b8b7df5e4903f9b788c3c59396050f5548e516e58ccb7312463ab" +dependencies = [ + "serde", +] [[package]] name = "cranelift-entity" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b044234aa32531f89a08b487630ddc6744696ec04c8123a1ad388de837f5de3" +checksum = "1a2e6884a363e42a9ba980193ea8603a4272f8a92bd8bbaf9f57a94dbea0ff96" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5452b3e4e97538ee5ef2cc071301c69a86c7adf2770916b9d04e9727096abd93" +checksum = "e6f41e2f9b57d2c030e249d0958f1cdc2c3cd46accf8c0438b3d1944e9153444" dependencies = [ "cranelift-codegen", "log", @@ -932,25 +940,24 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68035c10b2e80f26cc29c32fa824380877f38483504c2a47b54e7da311caaf3" +checksum = "aab70ba7575665375d31cbdea2462916ce58be887834e1b83c860b43b51af637" dependencies = [ "cranelift-codegen", - "raw-cpuid", "target-lexicon", ] [[package]] name = "cranelift-wasm" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a530eb9d1c95b3309deb24c3d179d8b0ba5837ed98914a429787c395f614949d" +checksum = "f2fc3d2e70da6439adf97648dcdf81834363154f2907405345b6fbe7ca38918c" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.1", "log", "serde", "smallvec 1.6.1", @@ -1320,6 +1327,18 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "enum-as-inner" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "env_logger" version = "0.7.1" @@ -1452,9 +1471,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.13.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd795898c348a8ec9edc66ec9e014031c764d4c88cc26d09b492cd93eb41339" +checksum = "c832d0ed507622c7cb98e9b7f10426850fc9d38527ab8071778dcc3a81d45875" dependencies = [ "either", "futures 0.3.15", @@ -1463,6 +1482,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.11.1", + "scale-info", ] [[package]] @@ -1505,8 +1525,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632b95f97f332b2ff5bc3a42bc8e28772b067e333830e03fd046504f11cd0fb8" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", ] @@ -1524,12 +1543,12 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70fe99487f84579a3f2c4ba52650fec875492eea41be0e4eea8019187f105052" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "frame-support", "frame-system", "linregress", + "log", "parity-scale-codec", "paste", "sp-api", @@ -1540,11 +1559,23 @@ dependencies = [ "sp-storage", ] +[[package]] +name = "frame-election-provider-support" +version = "3.0.0" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "sp-arithmetic", + "sp-npos-elections", + "sp-std", +] + [[package]] name = "frame-metadata" version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073f7bef18421362441a1708f8528e442234954611f95bdc554b313fb321948e" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "serde", @@ -1555,8 +1586,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e521e6214615bd82ba6b5fc7fd40a9cc14fdeb40f83da5eba12aa2f8179fb8" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "bitflags", "frame-metadata", @@ -1582,8 +1612,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2668e24cbaba7f0e91d0c92a94bd1ae425a942608ad0b775db32477f5df4da9e" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1595,11 +1624,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4f88cfd111e004590f4542b75e6d3302137b9067d7e7219e4ac47a535c3b5c1" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 0.1.5", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -1608,8 +1636,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79285388b120ac96c15a791c56b26b9264f7231324fbe0fd05026acd92bf2e6a" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "proc-macro2", "quote", @@ -1619,11 +1646,11 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fedbff05d665c00bf4e089b4377fcb15b8bd37ebc3e5fc06665474cf6e25d7" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "frame-support", "impl-trait-for-tuples", + "log", "parity-scale-codec", "serde", "sp-core", @@ -1778,7 +1805,7 @@ checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" dependencies = [ "futures-io", "rustls 0.19.1", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -2090,6 +2117,17 @@ dependencies = [ "hmac 0.7.1", ] +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi 0.3.9", +] + [[package]] name = "http" version = "0.1.21" @@ -2271,7 +2309,7 @@ dependencies = [ "rustls-native-certs 0.4.0", "tokio 0.2.25", "tokio-rustls 0.14.1", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -2288,7 +2326,7 @@ dependencies = [ "rustls-native-certs 0.5.0", "tokio 1.6.0", "tokio-rustls 0.22.0", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -2336,9 +2374,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "0.1.8" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85" +checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" dependencies = [ "async-io", "futures 0.3.15", @@ -2433,6 +2471,18 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ee15951c035f79eddbef745611ec962f63f4558f1dadf98ab723cc603487c6f" +[[package]] +name = "ipconfig" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" +dependencies = [ + "socket2 0.3.19", + "widestring", + "winapi 0.3.9", + "winreg", +] + [[package]] name = "ipnet" version = "2.3.0" @@ -2448,6 +2498,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.7" @@ -2596,12 +2655,13 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.2.0-alpha.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2737440f37efa10e5ef7beeec43d059d29dc92640978be21fcdcef481a2edb0d" +checksum = "52819604ca75933e88f51a31ef2e963fc5e3b0e67c5e4e7cd1bcf866e28b6af2" dependencies = [ "async-trait", "fnv", + "futures 0.3.15", "hyper 0.13.10", "hyper 0.14.8", "hyper-rustls 0.21.0", @@ -2612,16 +2672,19 @@ dependencies = [ "serde", "serde_json", "thiserror", + "tokio 0.2.25", + "tokio 1.6.0", "url 2.2.2", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.2.0-alpha.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5784ee8bb31988fa2c7a755fe31b0e21aa51894a67e5c99b6d4470f0253bf31a" +checksum = "f37924e16300e249a52a22cabb5632f846dc9760b39355f5e8bc70cd23dc6300" dependencies = [ "Inflector", + "bae", "proc-macro-crate 1.0.0", "proc-macro2", "quote", @@ -2630,25 +2693,27 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.2.0-alpha.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab3dabceeeeb865897661d532d47202eaae71cd2c606f53cb69f1fbc0555a51" +checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788" dependencies = [ "async-trait", "beef", "futures-channel", "futures-util", + "hyper 0.14.8", "log", "serde", "serde_json", + "soketto 0.6.0", "thiserror", ] [[package]] name = "jsonrpsee-utils" -version = "0.2.0-alpha.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63cf4d423614e71fd144a8691208539d2b23d8373e069e2fbe023c5eba5e922" +checksum = "0df2c313adda0418a281cea99d1b9e3c22714d2b9139e9adb1543b4a40ee0458" dependencies = [ "futures-util", "hyper 0.13.10", @@ -2658,24 +2723,29 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.2.0-alpha.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6fdb4390bd25358c62e8b778652a564a1723ba07dca0feb3da439c2253fe59f" +checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198" dependencies = [ - "async-std", - "async-tls", "async-trait", "fnv", "futures 0.3.15", "jsonrpsee-types", "log", "pin-project 1.0.7", + "rustls 0.19.1", + "rustls-native-certs 0.5.0", "serde", "serde_json", - "soketto", + "soketto 0.6.0", "thiserror", + "tokio 0.2.25", + "tokio 1.6.0", + "tokio-rustls 0.15.0", + "tokio-rustls 0.22.0", + "tokio-util 0.3.1", + "tokio-util 0.6.7", "url 2.2.2", - "webpki 0.22.0", ] [[package]] @@ -2756,16 +2826,15 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.34.0" +version = "0.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5133112ce42be9482f6a87be92a605dd6bbc9e93c297aee77d172ff06908f3a" +checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b" dependencies = [ "atomic", "bytes 1.0.1", "futures 0.3.15", "lazy_static", "libp2p-core", - "libp2p-core-derive", "libp2p-deflate", "libp2p-dns", "libp2p-floodsub", @@ -2778,8 +2847,10 @@ dependencies = [ "libp2p-ping", "libp2p-plaintext", "libp2p-pnet", + "libp2p-relay", "libp2p-request-response", "libp2p-swarm", + "libp2p-swarm-derive", "libp2p-tcp", "libp2p-uds", "libp2p-wasm-ext", @@ -2794,9 +2865,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.27.1" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26" +checksum = "554d3e7e9e65f939d66b75fd6a4c67f258fe250da61b91f46c545fc4a89b51d9" dependencies = [ "asn1_der", "bs58", @@ -2826,21 +2897,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "libp2p-core-derive" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "libp2p-deflate" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345" +checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08" dependencies = [ "flate2", "futures 0.3.15", @@ -2849,20 +2910,23 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.27.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3" +checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b" dependencies = [ + "async-std-resolver", "futures 0.3.15", "libp2p-core", "log", + "smallvec 1.6.1", + "trust-dns-resolver", ] [[package]] name = "libp2p-floodsub" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f" +checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf" dependencies = [ "cuckoofilter", "fnv", @@ -2878,11 +2942,11 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.27.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12451ba9493e87c91baf2a6dffce9ddf1fbc807a0861532d7cf477954f8ebbee" +checksum = "e7b0c8506a6ec3344b9e706d7c7a6dba826f8ede735cfe13dde12a8c263c4af9" dependencies = [ - "asynchronous-codec 0.5.0", + "asynchronous-codec 0.6.0", "base64 0.13.0", "byteorder", "bytes 1.0.1", @@ -2898,15 +2962,15 @@ dependencies = [ "regex", "sha2 0.9.5", "smallvec 1.6.1", - "unsigned-varint 0.6.0", + "unsigned-varint 0.7.0", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e" +checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46" dependencies = [ "futures 0.3.15", "libp2p-core", @@ -2920,9 +2984,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.28.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066" +checksum = "b07312ebe5ee4fd2404447a0609814574df55c65d4e20838b957bbd34907d820" dependencies = [ "arrayvec 0.5.2", "asynchronous-codec 0.6.0", @@ -2946,9 +3010,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.28.1" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1" +checksum = "4efa70c1c3d2d91237f8546e27aeb85e287d62c066a7b4f3ea6a696d43ced714" dependencies = [ "async-io", "data-encoding", @@ -2959,17 +3023,17 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand 0.7.3", + "rand 0.8.3", "smallvec 1.6.1", - "socket2 0.3.19", + "socket2 0.4.0", "void", ] [[package]] name = "libp2p-mplex" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464" +checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", @@ -2985,9 +3049,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778" +checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd" dependencies = [ "bytes 1.0.1", "curve25519-dalek 3.1.0", @@ -3007,9 +3071,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c" +checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1" dependencies = [ "futures 0.3.15", "libp2p-core", @@ -3022,9 +3086,9 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61" +checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", @@ -3051,11 +3115,34 @@ dependencies = [ "sha3", ] +[[package]] +name = "libp2p-relay" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d" +dependencies = [ + "asynchronous-codec 0.6.0", + "bytes 1.0.1", + "futures 0.3.15", + "futures-timer 3.0.2", + "libp2p-core", + "libp2p-swarm", + "log", + "pin-project 1.0.7", + "prost", + "prost-build", + "rand 0.7.3", + "smallvec 1.6.1", + "unsigned-varint 0.7.0", + "void", + "wasm-timer", +] + [[package]] name = "libp2p-request-response" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89" +checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3" dependencies = [ "async-trait", "bytes 1.0.1", @@ -3073,9 +3160,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.27.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98" +checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92" dependencies = [ "either", "futures 0.3.15", @@ -3087,11 +3174,21 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "libp2p-swarm-derive" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "libp2p-tcp" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b" +checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9" dependencies = [ "async-io", "futures 0.3.15", @@ -3101,14 +3198,14 @@ dependencies = [ "libc", "libp2p-core", "log", - "socket2 0.3.19", + "socket2 0.4.0", ] [[package]] name = "libp2p-uds" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487" +checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5" dependencies = [ "async-std", "futures 0.3.15", @@ -3118,9 +3215,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.27.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd" +checksum = "e2d413e4cf9b8e5dfbcd2a60d3dc5a3391308bdb463684093d4f67137b7113de" dependencies = [ "futures 0.3.15", "js-sys", @@ -3132,9 +3229,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22" +checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74" dependencies = [ "either", "futures 0.3.15", @@ -3143,16 +3240,16 @@ dependencies = [ "log", "quicksink", "rw-stream-sink", - "soketto", + "soketto 0.4.2", "url 2.2.2", "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.30.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a" +checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4" dependencies = [ "futures 0.3.15", "libp2p-core", @@ -3250,6 +3347,15 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "mach" version = "0.3.2" @@ -3259,6 +3365,12 @@ dependencies = [ "libc", ] +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + [[package]] name = "matchers" version = "0.0.1" @@ -3353,9 +3465,9 @@ dependencies = [ [[package]] name = "minicbor" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2b2c73f9640fccab53947e2b3474d5071fcbc8f82cac51ddf6c8041a30a9ea" +checksum = "51aa5bb0ca22415daca596a227b507f880ad1b2318a87fa9325312a5d285ca0d" dependencies = [ "minicbor-derive", ] @@ -3510,7 +3622,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" dependencies = [ "proc-macro-crate 1.0.0", - "proc-macro-error", + "proc-macro-error 1.0.4", "proc-macro2", "quote", "syn", @@ -3689,9 +3801,9 @@ dependencies = [ [[package]] name = "object" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" +checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" dependencies = [ "crc32fast", "indexmap", @@ -3742,15 +3854,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47433a94141451e7079aabf3ca28f2bde8c642d84b568be9626e9b7cae8b11b1" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "sp-authorship", - "sp-inherents", "sp-runtime", "sp-std", ] @@ -3758,14 +3868,13 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41aaeaf084e594273f82bcbf96416ef1fcab602e15dd1df04b9930eceb2eb518" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", - "serde", "sp-runtime", "sp-std", ] @@ -3773,13 +3882,11 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c080576a1fbb1187b7da9f4cba739076bbb197f44964892b2d392755920bbf63" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-keyring", @@ -3790,15 +3897,13 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d243c3ccac56a4c55fade6be5c5af1de07fac374fa7856377980a76b0c193cf" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-timestamp", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-runtime", @@ -3811,18 +3916,19 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95853affe89b7b755b2e7d1fcf7f8804b074dea53d98703f9b8b6ebf28dfb32" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "frame-election-provider-support", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", + "paste", "serde", "sp-application-crypto", "sp-io", - "sp-npos-elections", "sp-runtime", "sp-staking", "sp-std", @@ -3832,15 +3938,14 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17dd274716a55a2c3e34d9c0ed66aaac3d7e0393ec9fd985e2b8532d697a7f3" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", + "log", "parity-scale-codec", - "serde", "sp-inherents", "sp-runtime", "sp-std", @@ -4246,16 +4351,42 @@ 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", + "proc-macro-error-attr 1.0.4", + "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", ] @@ -4323,7 +4454,7 @@ checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ "bytes 1.0.1", "heck", - "itertools", + "itertools 0.9.0", "log", "multimap", "petgraph", @@ -4340,7 +4471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" dependencies = [ "anyhow", - "itertools", + "itertools 0.9.0", "proc-macro2", "quote", "syn", @@ -4537,19 +4668,8 @@ dependencies = [ ] [[package]] -name = "raw-cpuid" -version = "8.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73" -dependencies = [ - "bitflags", - "cc", - "rustc_version", -] - -[[package]] -name = "rawpointer" -version = "0.2.1" +name = "rawpointer" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" @@ -4640,6 +4760,7 @@ checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5" dependencies = [ "log", "rustc-hash", + "serde", "smallvec 1.6.1", ] @@ -4691,6 +4812,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] + [[package]] name = "retain_mut" version = "0.1.3" @@ -4749,7 +4880,7 @@ dependencies = [ "log", "ring", "sct", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -4762,7 +4893,7 @@ dependencies = [ "log", "ring", "sct", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -4789,6 +4920,16 @@ dependencies = [ "security-framework 2.2.0", ] +[[package]] +name = "ruzstd" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100" +dependencies = [ + "byteorder", + "twox-hash", +] + [[package]] name = "rw-stream-sink" version = "0.2.1" @@ -4818,15 +4959,13 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9862161f9d09d870401c7256c89ad1eb3afa56a61f7d7135c2bac76ff7152955" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", - "sp-consensus", "sp-core", "sp-inherents", "sp-runtime", @@ -4836,8 +4975,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d97030776b49bc9c109e2d349212d8f2500637761048e1af5b7ce2dfd994c7" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -4858,10 +4996,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f14985513db9798fcedea58bdc8a08f1c6b3a515d6546ced7467b059b7982c4" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -4870,8 +5007,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d8b2c8dc0cee9ac56e87ad50c980edbdeb35bdd5b5d9da4ae90567423363be" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "derive_more", "fnv", @@ -4905,8 +5041,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5741e447d71ff36c147f961b2271b6b3fad0cc347e96936bc8b63ddffa594b27" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "blake2-rfc", "hash-db", @@ -4934,9 +5069,9 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99f20cc8b8a74e218365ac4187bce26ea631d58d221caa1797bc6ec8056dba33" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "parking_lot 0.11.1", "sc-client-api", "sp-blockchain", "sp-consensus", @@ -4946,9 +5081,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98d52048476e0fcb53feae8ca919a602104f1ba0b89a729b496440f36b332961" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "async-trait", "derive_more", "fork-tree", "futures 0.3.15", @@ -4984,7 +5119,6 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-timestamp", "sp-utils", "sp-version", "substrate-prometheus-endpoint", @@ -4993,13 +5127,12 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "326313ffb249a526e8ee8e08af9fdf0c4459cebeaa760b934e9df3985b68e4df" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "fork-tree", "parity-scale-codec", - "parking_lot 0.11.1", "sc-client-api", + "sc-consensus", "sp-blockchain", "sp-runtime", ] @@ -5007,14 +5140,14 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e09ff8b680d449102da9717a70c3bbbbb981fd4cf1bfbafc1739d954eb0898" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "async-trait", "futures 0.3.15", "futures-timer 3.0.2", + "impl-trait-for-tuples", "log", "parity-scale-codec", - "parking_lot 0.11.1", "sc-client-api", "sc-telemetry", "sp-api", @@ -5027,6 +5160,7 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "sp-timestamp", "sp-trie", "thiserror", ] @@ -5034,23 +5168,18 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37294bae6d787eecf2b15255dc75cd559b4ad813e0efcf28cd4423e218931b80" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ - "log", "sc-client-api", "sp-authorship", - "sp-consensus", - "sp-core", - "sp-inherents", "sp-runtime", + "thiserror", ] [[package]] name = "sc-executor" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bace6a35999d2da7311d8fb98a29c1e89dbf0d14e50ac14140f2c38089819f46" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "derive_more", "lazy_static", @@ -5079,14 +5208,15 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87004102a8e95f432f1c624c7fa7fb0edc5995db2e0fcbabbb697f1955e7c1d2" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "derive_more", "parity-scale-codec", "parity-wasm", + "pwasm-utils", "sp-allocator", "sp-core", + "sp-maybe-compressed-blob", "sp-serializer", "sp-wasm-interface", "thiserror", @@ -5096,8 +5226,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3d7b6db2df5f2c24848883a855a8276363f00cef5b49744974f7e1203bf274" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "log", "parity-scale-codec", @@ -5112,8 +5241,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24673c981fad2dff4398a09a1086579e2774f18d81639fa2bd9cb215e6dd9e36" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "log", "parity-scale-codec", @@ -5131,10 +5259,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e87e63c57933e173a8643ff197b579e3fc5c91b16ca006096f482de8159318" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "async-trait", "derive_more", + "dyn-clone", "finality-grandpa", "fork-tree", "futures 0.3.15", @@ -5170,8 +5299,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4c8994853e1158dc4f448b014aa83eef56ced214ec0af316eecf4a6ca3268f" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "ansi_term 0.12.1", "futures 0.3.15", @@ -5189,8 +5317,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d966ed36c404eced656bd63aad8a30d2c1a14633f07cd1d7d9c11b62f75a7905" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "async-trait", "derive_more", @@ -5210,8 +5337,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8dbcb2951f7cf76ddf97ed26dcef0dab79d76745de4a8f169d58236ea8704" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "hash-db", "lazy_static", @@ -5230,8 +5356,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20fb4ed5d6b86faafb0743c8c2fd1c89b52cde7697373b254c7553800efaebbf" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "async-std", "async-trait", @@ -5284,8 +5409,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2cd5487d6f8051863a186e2aea4c233a07bb691780d3b117c9d6ffe1ff9a8fe" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "futures 0.3.15", "futures-timer 3.0.2", @@ -5295,19 +5419,20 @@ dependencies = [ "sc-network", "sp-runtime", "substrate-prometheus-endpoint", + "tracing", "wasm-timer", ] [[package]] name = "sc-offchain" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc91fc71c128748a3393cb3421e12a7759ccffcc1cc4a9e6ff4ead6cc68ba48" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "bytes 0.5.6", "fnv", "futures 0.3.15", "futures-timer 3.0.2", + "hex", "hyper 0.13.10", "hyper-rustls 0.21.0", "log", @@ -5329,8 +5454,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce454e528e7797a239e734d0d66bf904d48be47aa92691ac7546a45ec32a64cf" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "futures 0.3.15", "libp2p", @@ -5343,8 +5467,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "750397c6aa5a4f922cac99599ad74a4082e3e87553d51ceb4c48abfa056ff32c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "futures 0.3.15", "hash-db", @@ -5370,6 +5493,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", + "sp-tracing", "sp-transaction-pool", "sp-utils", "sp-version", @@ -5378,8 +5502,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8393410297df2885efec20d0629a9833b4fd9e4ad83a92471e1ea0c11a0a54" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "derive_more", "futures 0.3.15", @@ -5396,6 +5519,7 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", + "sp-tracing", "sp-transaction-pool", "sp-version", ] @@ -5403,8 +5527,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c76164897bd3b0d04c2d6aeeb4d3492c86e324b0b08f408b847ea35421b589" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "futures 0.1.31", "jsonrpc-core", @@ -5422,9 +5545,9 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9315b44eb991ca4f477d889bbd649a2b4b557f963fe48ec5a36c3422518e4a0" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "async-trait", "directories", "exit-future", "futures 0.1.31", @@ -5486,8 +5609,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f144043d5860ce133f701fa78679d6278f2dfc698686beb5f6d892c267e9d92" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "log", "parity-scale-codec", @@ -5502,8 +5624,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05040c594b331d90d7341e82c6dc6a3eb7bb2afb4e5dc9c36a79a6754166057" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "chrono", "futures 0.3.15", @@ -5514,10 +5635,8 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "sp-utils", "take_mut", - "tracing", - "tracing-subscriber", + "thiserror", "void", "wasm-timer", ] @@ -5525,8 +5644,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0a4aa327b8bc89d9c5ae57a2f493d8f54ccd706f6763614ab522559fe481d8" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5537,27 +5655,35 @@ dependencies = [ "parking_lot 0.11.1", "regex", "rustc-hash", + "sc-client-api", + "sc-rpc-server", "sc-telemetry", "sc-tracing-proc-macro", "serde", "serde_json", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-core", + "sp-rpc", + "sp-runtime", + "sp-storage", "sp-tracing", "thiserror", "tracing", - "tracing-core", "tracing-log", "tracing-subscriber", "wasm-bindgen", + "wasm-timer", "web-sys", ] [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec18b0506911e6d624d9ea8f8cc5f503e7944a0fe7d37de95ee84033cf160ebc" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -5566,8 +5692,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b385b8f66cce185478c500ad3de8f4775ab0e948c31561aeac78a27bedc654" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "derive_more", "futures 0.3.15", @@ -5589,8 +5714,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f4331ea8da2ff45a9466637f90f5cc89f9d31fcd1cd20f74f2520b33bff069" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "futures 0.3.15", "futures-diagnose", @@ -5613,6 +5737,31 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "scale-info" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e62ff266e136db561a007c84569985805f84a1d5a08278e52c36aacb6e061b" +dependencies = [ + "bitvec", + "cfg-if 1.0.0", + "derive_more", + "parity-scale-codec", + "scale-info-derive", +] + +[[package]] +name = "scale-info-derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b648fa291891a4c80187a25532f6a7d96b82c70353e30b868b14632b8fe043d6" +dependencies = [ + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "schannel" version = "0.1.19" @@ -5899,6 +6048,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +[[package]] +name = "slog" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" +dependencies = [ + "erased-serde", +] + [[package]] name = "smallvec" version = "0.6.14" @@ -5969,11 +6127,25 @@ dependencies = [ "sha-1 0.9.6", ] +[[package]] +name = "soketto" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f" +dependencies = [ + "base64 0.13.0", + "bytes 1.0.1", + "futures 0.3.15", + "httparse", + "log", + "rand 0.8.3", + "sha-1 0.9.6", +] + [[package]] name = "sp-allocator" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec5f988ad0cabdb646318cb515a91e9d89062debc9728f9b634d73acab3f3f39" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "log", "sp-core", @@ -5985,10 +6157,10 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63c3460d5daecf67df542c34c2bbd636214a5a200d4bddcfa2ffb9e72c346af" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "hash-db", + "log", "parity-scale-codec", "sp-api-proc-macro", "sp-core", @@ -6002,11 +6174,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289624f4fe0f61e63a5019ed26c3bc732b5145eb52796ac6053cd72656d947a1" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "blake2-rfc", - "proc-macro-crate 0.1.5", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -6015,8 +6186,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52e2e6d43036b97c4fce1ed87c5262c1ffdc78c655ada4d3024a3f8094bdd2c" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "serde", @@ -6028,8 +6198,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f1c69966c192d1dee8521f0b29ece2b14db07b9b44d801a94e295234761645" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "integer-sqrt", "num-traits", @@ -6037,14 +6206,15 @@ dependencies = [ "serde", "sp-debug-derive", "sp-std", + "static_assertions", ] [[package]] name = "sp-authorship" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec68fb8e5a37548b06c14ee91a9c574cc330324c86d37810ec29dd4f8bc68d7" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "async-trait", "parity-scale-codec", "sp-inherents", "sp-runtime", @@ -6054,8 +6224,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0adc979dbe619f56d664ebd1293dce13fcad6b8a47bcdd620ed53a454d330d12" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "sp-api", @@ -6067,8 +6236,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8007c1ad8e9fb6cd8eed4e0fc91504a9ca4b228e1315302a2fbb0ac7f509f1b" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "futures 0.3.15", "log", @@ -6086,8 +6254,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a24beb11980d0c755ead0c05f3f966c490e4a3730785c04c03855fada65d697" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "serde", "serde_json", @@ -6096,9 +6263,9 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884db6c4b03f0f2fb2993127a2db95fc740fcd3496746dcaa6829c9868e7dc75" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "async-trait", "futures 0.3.15", "futures-timer 3.0.2", "libp2p", @@ -6123,11 +6290,12 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a153085b1542b5cbe23686433cd36d1a634964f1b707671d0ffb01d8d9313047" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "async-trait", "merlin", "parity-scale-codec", + "serde", "sp-api", "sp-application-crypto", "sp-consensus", @@ -6144,8 +6312,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32bd501ab76c827d74f145063cd8cb993a9f634dac93c9b0d909111cd5900a6a" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -6155,8 +6322,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030895d70bf3095c857f4727a7cce7c43af29efe3413bb547ee28700f7d78766" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6168,8 +6334,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abbc8d4e9b8a7d5819ed26f1374017bb32833ef4890e4ff065e1da30669876bc" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "base58", "blake2-rfc", @@ -6213,8 +6378,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8c3f018913eef191d95c824657c5759c459d28670e654fa34f5d9bd5e6f0492" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -6223,8 +6387,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e80275f23b4e7ba8f54dec5f90f016530e7307d2ee9445f617ab986cbe97f31e" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "proc-macro2", "quote", @@ -6234,8 +6397,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fdc625f8c7b13b9a136d334888b21b5743d2081cb666cb03efca1dc9b8f74d1" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "environmental", "parity-scale-codec", @@ -6246,8 +6408,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702e0be150e1b557df42326ec9b82c2010366631d03be27c69912d446abbf87a" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "finality-grandpa", "log", @@ -6264,12 +6425,13 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2542380b535c6941502a0a3069a657eb5abb70fd67b11afa164d4a4b038ba73a" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "async-trait", + "impl-trait-for-tuples", "parity-scale-codec", - "parking_lot 0.11.1", "sp-core", + "sp-runtime", "sp-std", "thiserror", ] @@ -6277,8 +6439,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33fd69f0a6e91bedc2fb1c5cc3689c212474b6c918274cb4cb14dbbe3c428c14" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "futures 0.3.15", "hash-db", @@ -6289,6 +6450,7 @@ dependencies = [ "sp-core", "sp-externalities", "sp-keystore", + "sp-maybe-compressed-blob", "sp-runtime-interface", "sp-state-machine", "sp-std", @@ -6302,8 +6464,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b59f2b0e94b2048d4984aa6eb40eef2e4c05d3adf27a083dd3c9b0fce74ef7a" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "lazy_static", "sp-core", @@ -6314,8 +6475,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6ccd2baf189112355338e8b224dc513cd239b974dbd717f12b3dc7a7248c3b" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "async-trait", "derive_more", @@ -6329,11 +6489,19 @@ dependencies = [ "sp-externalities", ] +[[package]] +name = "sp-maybe-compressed-blob" +version = "3.0.0" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" +dependencies = [ + "ruzstd", + "zstd", +] + [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e6e8b84ee0dc7bb65b55beba55ffbc17803222ab7c746a74f72fc5869c7320" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "serde", @@ -6346,10 +6514,9 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "085fbb1aa72d85a17524047fc1e708bc3bd038b02b46dc7ac601fa39c8af93d3" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -6358,8 +6525,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd80eedcedcc8342e77c26d59ad90b6904715a862731fa16616650773570e63" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "sp-api", "sp-core", @@ -6369,8 +6535,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54702e109f1c8a870dd4065a497d2612d42cec5817126e96cc0658c5ea975784" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "backtrace", ] @@ -6378,18 +6543,18 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e5b1ed655d11449073b914b048895f45241e02b3919d1d0187f315435fee18" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "rustc-hash", "serde", "sp-core", + "tracing-core", ] [[package]] name = "sp-runtime" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa4b353b76f04616dbdb8d269d58dcac47acb31c006d3b70e7b64233e68695e" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "either", "hash256-std-hasher", @@ -6410,8 +6575,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e5c88b4bc8d607e4e2ff767a85db58cf7101f3dd6064f06929342ea67fe8fb" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6428,11 +6592,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a6c7c2251512c9e533d15db8a863b06ece1cbee778130dd9adbe44b6b39aa9" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "Inflector", - "proc-macro-crate 0.1.5", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -6441,8 +6604,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d793f01eb9eea9f30ffc63b821170068b9f0d9edf715d8ba77dc4de9c300f" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "serde", "serde_json", @@ -6451,8 +6613,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7cf161533725a78083b04f3269effe4c3b4b6ce5f655019b3eec3e729ba4d4" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "sp-api", @@ -6465,8 +6626,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc729eb10f8809c61a1fe439ac118a4413de004aaf863003ee8752ac0b596e73" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -6476,8 +6636,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fa4143e58e9130f726d4e8a9b86f3530a8bd19a2eedcdcf4af205f4b5a6d4f" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "hash-db", "log", @@ -6492,6 +6651,7 @@ dependencies = [ "sp-std", "sp-trie", "thiserror", + "tracing", "trie-db", "trie-root", ] @@ -6499,14 +6659,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35391ea974fa5ee869cb094d5b437688fbf3d8127d64d1b9fed5822a1ed39b12" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" [[package]] name = "sp-storage" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86af458d4a0251c490cdde9dcaaccb88d398f3b97ac6694cdd49ed9337e6b961" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "impl-serde", "parity-scale-codec", @@ -6519,8 +6677,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c585340cbee96c53a9b43fd07d81edf6cebeb80e4ca7c0ee79b856c0b1883a0e" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "log", "sp-core", @@ -6533,26 +6690,32 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27387c541197b9f47f3d9ddcab5649a3ecdca582d2f2ea2b511af24a3d3cbf83" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ - "impl-trait-for-tuples", + "async-trait", + "futures-timer 3.0.2", + "log", "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", "sp-std", + "thiserror", "wasm-timer", ] [[package]] name = "sp-tracing" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567382d8d4e14fb572752863b5cd57a78f9e9a6583332b590b726f061f3ea957" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ + "erased-serde", "log", "parity-scale-codec", + "parking_lot 0.10.2", + "serde", + "serde_json", + "slog", "sp-std", "tracing", "tracing-core", @@ -6562,8 +6725,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264d3b7ea31483eddffa2cc7f28c4d9c022598e456a985fd1cb5879a4609853" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "derive_more", "futures 0.3.15", @@ -6579,8 +6741,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85b7f745da41ef825c6f7b93f1fdc897b03df94a4884adfbb70fbcd0aed1298" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "hash-db", "memory-db", @@ -6594,8 +6755,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ec2a5f924f7affd1e959f8f3c02bd87cdfa0e11c71a4cbc075f955ead8c1a1" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "futures 0.3.15", "futures-core", @@ -6607,21 +6767,32 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbeffa538a13d715d30e01d57a2636ba32845b737a29a3ea32403576588222e7" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "impl-serde", "parity-scale-codec", "serde", "sp-runtime", "sp-std", + "sp-version-proc-macro", +] + +[[package]] +name = "sp-version-proc-macro" +version = "3.0.0" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" +dependencies = [ + "parity-scale-codec", + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b214e125666a6416cf30a70cc6a5dacd34a4e5197f8a3d479f714af7e1dc7a47" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6713,8 +6884,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb561c19a121e1c89daa79dbfa67a55080f813caa47fd231833a0669696d508" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.3#1d7f6e12c651d776fc0dc1adefd007bb60f60b63" dependencies = [ "async-std", "derive_more", @@ -6727,7 +6897,7 @@ dependencies = [ [[package]] name = "substrate-subxt" -version = "0.15.2" +version = "0.15.0" dependencies = [ "assert_matches", "async-std", @@ -6741,6 +6911,7 @@ dependencies = [ "hex", "jsonrpsee-http-client", "jsonrpsee-proc-macros", + "jsonrpsee-types", "jsonrpsee-ws-client", "log", "num-traits", @@ -6787,7 +6958,7 @@ dependencies = [ [[package]] name = "substrate-subxt-proc-macro" -version = "0.15.2" +version = "0.15.3" dependencies = [ "async-std", "async-trait", @@ -6796,7 +6967,7 @@ dependencies = [ "parity-scale-codec", "pretty_assertions", "proc-macro-crate 0.1.5", - "proc-macro-error", + "proc-macro-error 1.0.4", "proc-macro2", "quote", "sp-keyring", @@ -6829,6 +7000,17 @@ 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" @@ -7018,10 +7200,14 @@ dependencies = [ "futures-core", "iovec", "lazy_static", + "libc", "memchr", "mio 0.6.23", + "mio-uds", + "num_cpus", "pin-project-lite 0.1.12", "slab", + "tokio-macros 0.2.6", ] [[package]] @@ -7035,7 +7221,9 @@ dependencies = [ "libc", "memchr", "mio 0.7.11", + "num_cpus", "pin-project-lite 0.2.6", + "tokio-macros 1.3.0", ] [[package]] @@ -7102,6 +7290,28 @@ dependencies = [ "log", ] +[[package]] +name = "tokio-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-macros" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tokio-named-pipes" version = "0.1.0" @@ -7143,7 +7353,19 @@ dependencies = [ "futures-core", "rustls 0.18.1", "tokio 0.2.25", - "webpki 0.21.4", + "webpki", +] + +[[package]] +name = "tokio-rustls" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736" +dependencies = [ + "futures-core", + "rustls 0.19.1", + "tokio 0.2.25", + "webpki", ] [[package]] @@ -7154,7 +7376,7 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", "tokio 1.6.0", - "webpki 0.21.4", + "webpki", ] [[package]] @@ -7260,6 +7482,7 @@ checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ "bytes 0.5.6", "futures-core", + "futures-io", "futures-sink", "log", "pin-project-lite 0.1.12", @@ -7274,6 +7497,7 @@ checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" dependencies = [ "bytes 1.0.1", "futures-core", + "futures-io", "futures-sink", "log", "pin-project-lite 0.2.6", @@ -7403,6 +7627,49 @@ dependencies = [ "hash-db", ] +[[package]] +name = "trust-dns-proto" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "log", + "rand 0.8.3", + "smallvec 1.6.1", + "thiserror", + "tinyvec", + "url 2.2.2", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770" +dependencies = [ + "cfg-if 1.0.0", + "futures-util", + "ipconfig", + "lazy_static", + "log", + "lru-cache", + "parking_lot 0.11.1", + "resolv-conf", + "smallvec 1.6.1", + "thiserror", + "trust-dns-proto", +] + [[package]] name = "try-lock" version = "0.2.3" @@ -7756,15 +8023,15 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.71.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1" +checksum = "755a9a4afe3f6cccbbe6d7e965eef44cf260b001f93e547eba84255c1d0187d8" [[package]] name = "wasmtime" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7426055cb92bd9a1e9469b48154d8d6119cd8c498c8b70284e420342c05dc45d" +checksum = "718cb52a9fdb7ab12471e9b9d051c9adfa6b5c504e0a1fea045e5eabc81eedd9" dependencies = [ "anyhow", "backtrace", @@ -7774,6 +8041,7 @@ dependencies = [ "indexmap", "libc", "log", + "paste", "region", "rustc-demangle", "serde", @@ -7782,6 +8050,7 @@ dependencies = [ "wasmparser", "wasmtime-cache", "wasmtime-environ", + "wasmtime-fiber", "wasmtime-jit", "wasmtime-profiling", "wasmtime-runtime", @@ -7791,9 +8060,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c01d9287e36921e46f5887a47007824ae5dbb9b7517a2d565660ab4471478709" +checksum = "1f984df56c4adeba91540f9052db9f7a8b3b00cfaac1a023bee50a972f588b0c" dependencies = [ "anyhow", "base64 0.13.0", @@ -7812,27 +8081,28 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4134ed3a4316cd0de0e546c6004850afe472b0fa3fcdc2f2c15f8d449562d962" +checksum = "2a05abbf94e03c2c8ee02254b1949320c4d45093de5d9d6ed4d9351d536075c9" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", "cranelift-wasm", + "wasmparser", "wasmtime-environ", ] [[package]] name = "wasmtime-debug" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91fa931df6dd8af2b02606307674d3bad23f55473d5f4c809dddf7e4c4dc411" +checksum = "382eecd6281c6c1d1f3c904c3c143e671fc1a9573820cbfa777fba45ce2eda9c" dependencies = [ "anyhow", "gimli 0.23.0", "more-asserts", - "object 0.22.0", + "object 0.23.0", "target-lexicon", "thiserror", "wasmparser", @@ -7841,9 +8111,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1098871dc3120aaf8190d79153e470658bb79f63ee9ca31716711e123c28220" +checksum = "81011b2b833663d7e0ce34639459a0e301e000fc7331e0298b3a27c78d0cec60" dependencies = [ "anyhow", "cfg-if 1.0.0", @@ -7859,11 +8129,22 @@ dependencies = [ "wasmparser", ] +[[package]] +name = "wasmtime-fiber" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92da32e31af2e3d828f485f5f24651ed4d3b7f03a46ea6555eae6940d1402cd" +dependencies = [ + "cc", + "libc", + "winapi 0.3.9", +] + [[package]] name = "wasmtime-jit" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738bfcd1561ede8bb174215776fd7d9a95d5f0a47ca3deabe0282c55f9a89f68" +checksum = "9b5f649623859a12d361fe4cc4793de44f7c3ff34c322c5714289787e89650bb" dependencies = [ "addr2line 0.14.1", "anyhow", @@ -7876,7 +8157,7 @@ dependencies = [ "gimli 0.23.0", "log", "more-asserts", - "object 0.22.0", + "object 0.23.0", "rayon", "region", "serde", @@ -7894,13 +8175,13 @@ dependencies = [ [[package]] name = "wasmtime-obj" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e96d77f1801131c5e86d93e42a3cf8a35402107332c202c245c83f34888a906" +checksum = "ef2e99cd9858f57fd062e9351e07881cedfc8597928385e02a48d9333b9e15a1" dependencies = [ "anyhow", "more-asserts", - "object 0.22.0", + "object 0.23.0", "target-lexicon", "wasmtime-debug", "wasmtime-environ", @@ -7908,16 +8189,16 @@ dependencies = [ [[package]] name = "wasmtime-profiling" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60bb672c9d894776d7b9250dd9b4fe890f8760201ee4f53e5f2da772b6c4debb" +checksum = "e46c0a590e49278ba7f79ef217af9db4ecc671b50042c185093e22d73524abb2" dependencies = [ "anyhow", "cfg-if 1.0.0", "gimli 0.23.0", "lazy_static", "libc", - "object 0.22.0", + "object 0.23.0", "scroll", "serde", "target-lexicon", @@ -7927,9 +8208,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a978086740949eeedfefcee667b57a9e98d9a7fc0de382fcfa0da30369e3530d" +checksum = "1438a09185fc7ca067caf1a80d7e5b398eefd4fb7630d94841448ade60feb3d0" dependencies = [ "backtrace", "cc", @@ -7985,23 +8266,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" dependencies = [ - "webpki 0.21.4", + "webpki", ] [[package]] @@ -8023,6 +8294,12 @@ dependencies = [ "libc", ] +[[package]] +name = "widestring" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" + [[package]] name = "winapi" version = "0.2.8" @@ -8066,6 +8343,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "winreg" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "ws2_32-sys" version = "0.2.1" @@ -8095,15 +8381,15 @@ dependencies = [ [[package]] name = "yamux" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271" +checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" dependencies = [ "futures 0.3.15", "log", "nohash-hasher", "parking_lot 0.11.1", - "rand 0.7.3", + "rand 0.8.3", "static_assertions", ] @@ -8130,18 +8416,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.5.4+zstd.1.4.7" +version = "0.6.1+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910" +checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "2.0.6+zstd.1.4.7" +version = "3.0.1+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e" +checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" dependencies = [ "libc", "zstd-sys", @@ -8149,12 +8435,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.18+zstd.1.4.7" +version = "1.4.20+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81" +checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" dependencies = [ "cc", - "glob 0.3.0", - "itertools", "libc", ] diff --git a/Cargo.toml b/Cargo.toml index c78606ba35..64beb260ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [".", "client", "proc-macro"] [package] name = "substrate-subxt" -version = "0.15.2" +version = "0.15.0" authors = ["Parity Technologies "] edition = "2018" @@ -19,47 +19,51 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [features] default = ["tokio1"] client = ["substrate-subxt-client"] -# jsonrpsee http client can be configured to use tokio02 or tokio1. -tokio02 = ["jsonrpsee-http-client/tokio02"] -tokio1 = ["jsonrpsee-http-client/tokio1"] +# jsonrpsee can be configured to use tokio02 or tokio1. +tokio02 = ["jsonrpsee-http-client/tokio02", "jsonrpsee-ws-client/tokio02"] +tokio1 = ["jsonrpsee-http-client/tokio1", "jsonrpsee-ws-client/tokio1"] [dependencies] async-trait = "0.1.49" -log = "0.4.14" -thiserror = "1.0.24" +codec = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] } +dyn-clone = "1.0.4" futures = "0.3.13" -jsonrpsee-proc-macros = "=0.2.0-alpha.6" -jsonrpsee-ws-client = "=0.2.0-alpha.6" -jsonrpsee-http-client = { version = "=0.2.0-alpha.6", default-features = false } +hex = "0.4.3" +jsonrpsee-proc-macros = "0.3.0" +jsonrpsee-ws-client = { version = "0.3.0", default-features = false } +jsonrpsee-http-client = { version = "0.3.0", default-features = false } +jsonrpsee-types = "0.3.0" +log = "0.4.14" num-traits = { version = "0.2.14", default-features = false } serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64" +thiserror = "1.0.24" url = "2.2.1" -codec = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] } -dyn-clone = "1.0.4" -frame-metadata = "13.0.0" -frame-support = "3.0.0" -sp-runtime = "3.0.0" -sp-version = "3.0.0" -pallet-indices = "3.0.0" -hex = "0.4.3" -sp-std = "3.0.0" -application-crypto = { version = "3.0.0", package = "sp-application-crypto" } -pallet-staking = "3.0.0" - -sp-rpc = { version = "3.0.0", package = "sp-rpc" } -sp-core = { version = "3.0.0", package = "sp-core" } substrate-subxt-client = { version = "0.7.0", path = "client", optional = true } substrate-subxt-proc-macro = { version = "0.15.0", path = "proc-macro" } +sp-application-crypto = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +sp-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +sp-std = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +sp-version = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } + +frame-metadata = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +pallet-indices = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +pallet-staking = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } + + [dev-dependencies] -async-std = { version = "1.9.0", features = ["attributes"] } +assert_matches = "1.5.0" +async-std = { version = "1.9.0", features = ["attributes", "tokio1"] } env_logger = "0.8.3" -frame-system = "3.0.0" -pallet-balances = "3.0.0" -sp-keyring = "3.0.0" tempdir = "0.3.7" wabt = "0.10.0" which = "4.0.2" -assert_matches = "1.5.0" + +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +pallet-balances = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } diff --git a/client/Cargo.toml b/client/Cargo.toml index 776fc9bb42..417c62ab40 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -15,17 +15,20 @@ keywords = ["parity", "substrate", "blockchain"] async-std = "1.8.0" futures = { version = "0.3.9", features = ["compat"], package = "futures" } futures01 = { package = "futures", version = "0.1.29" } -jsonrpsee-types = "=0.2.0-alpha.6" +jsonrpsee-types = "0.3.0" log = "0.4.13" -sc-network = { version = "0.9.0", default-features = false } -sc-client-db = "0.9.0" -sc-service = { version = "0.9.0", default-features = false } serde_json = "1.0.61" -sp-keyring = "3.0.0" thiserror = "1.0.23" +sc-client-db = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } +sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3", default-features = false } +sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3", default-features = false } + + + [target.'cfg(target_arch="x86_64")'.dependencies] -sc-service = { version = "0.9.0", default-features = false, features = ["wasmtime"] } +sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3", default-features = false, features = ["wasmtime"] } [dev-dependencies] async-std = { version = "1.8.0", features = ["attributes"] } diff --git a/client/src/lib.rs b/client/src/lib.rs index c6ad4fa32c..f27936a4cc 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -42,25 +42,23 @@ use futures01::sync::mpsc as mpsc01; use jsonrpsee_types::{ v2::{ error::{ - JsonRpcErrorAlloc, + JsonRpcError, JsonRpcErrorCode, }, params::{ Id, JsonRpcParams, + JsonRpcSubscriptionParams, SubscriptionId, TwoPointZero, }, - parse_request_id, request::{ JsonRpcCallSer, JsonRpcInvalidRequest, + JsonRpcNotification, JsonRpcNotificationSer, }, - response::{ - JsonRpcNotifResponse, - JsonRpcResponse, - }, + response::JsonRpcResponse, }, DeserializeOwned, Error as JsonRpseeError, @@ -68,6 +66,7 @@ use jsonrpsee_types::{ JsonValue, RequestMessage, Subscription, + SubscriptionKind, SubscriptionMessage, }; use sc_network::config::TransportConfig; @@ -94,7 +93,6 @@ use sc_service::{ }; use std::{ collections::HashMap, - marker::PhantomData, sync::atomic::{ AtomicU64, Ordering, @@ -211,7 +209,9 @@ impl SubxtClient { while let Some(Ok(response)) = from_back.next().await { let notif = serde_json::from_str::< - JsonRpcNotifResponse, + JsonRpcNotification< + JsonRpcSubscriptionParams<_>, + >, >( &response ) @@ -241,7 +241,7 @@ impl SubxtClient { let _ = rpc.rpc_query(&session, &message).await; } } - FrontToBack::Batch(_) => (), + _ => (), } } })), @@ -280,7 +280,7 @@ impl SubxtClient { .clone() .send(FrontToBack::Notification(msg)) .await - .map_err(|e| JsonRpseeError::TransportError(Box::new(e))) + .map_err(|e| JsonRpseeError::Transport(Box::new(e))) } /// Send a JSONRPC request. @@ -306,12 +306,12 @@ impl SubxtClient { send_back: Some(send_back_tx), })) .await - .map_err(|e| JsonRpseeError::TransportError(Box::new(e)))?; + .map_err(|e| JsonRpseeError::Transport(Box::new(e)))?; let json_value = match send_back_rx.await { Ok(Ok(v)) => v, Ok(Err(err)) => return Err(err), - Err(err) => return Err(JsonRpseeError::TransportError(Box::new(err))), + Err(err) => return Err(JsonRpseeError::Transport(Box::new(err))), }; serde_json::from_value(json_value).map_err(JsonRpseeError::ParseError) } @@ -351,14 +351,13 @@ impl SubxtClient { let (notifs_rx, id) = match send_back_rx.await { Ok(Ok(val)) => val, Ok(Err(err)) => return Err(err), - Err(err) => return Err(JsonRpseeError::TransportError(Box::new(err))), + Err(err) => return Err(JsonRpseeError::Transport(Box::new(err))), }; - Ok(Subscription { - to_back: self.to_back.clone(), + Ok(Subscription::new( + self.to_back.clone(), notifs_rx, - marker: PhantomData, - id, - }) + SubscriptionKind::Subscription(id), + )) } } @@ -376,9 +375,10 @@ impl From for sc_service::Role { match role { Role::Light => Self::Light, Role::Authority(_) => { - Self::Authority { - sentry_nodes: Default::default(), - } + // Self::Authority { + // sentry_nodes: Default::default(), + // } + Self::Authority } } } @@ -464,8 +464,8 @@ impl SubxtClientConfig { telemetry_endpoints, telemetry_external_transport: Default::default(), - telemetry_handle: Default::default(), - telemetry_span: Default::default(), + // telemetry_handle: Default::default(), + // telemetry_span: Default::default(), default_heap_pages: Default::default(), disable_grandpa: Default::default(), disable_log_reloading: Default::default(), @@ -512,26 +512,25 @@ fn read_jsonrpc_response( maybe_msg: Option, id: Id, ) -> Option> { - let msg = maybe_msg?; - match serde_json::from_str::>(&msg) { - Ok(rp) => { - match parse_request_id::(rp.id) { - Ok(rp_id) if rp_id == id => Some(Ok(rp.result)), - _ => Some(Err(JsonRpseeError::InvalidRequestId)), - } - } + let msg: String = maybe_msg?; + // NOTE: `let res` is a workaround because rustc otherwise doesn't compile + // `msg` doesn't live long enough. + let res = match serde_json::from_str::>(&msg) { + Ok(rp) if rp.id == id => Some(Ok(rp.result)), + Ok(_) => Some(Err(JsonRpseeError::InvalidRequestId)), Err(_) => { match serde_json::from_str::>(&msg) { Ok(err) => { - let err = JsonRpcErrorAlloc { + let err = JsonRpcError { jsonrpc: TwoPointZero, error: JsonRpcErrorCode::InvalidRequest.into(), - id: parse_request_id(err.id).ok()?, + id: err.id, }; - Some(Err(JsonRpseeError::Request(err))) + Some(Err(JsonRpseeError::Request(err.to_string()))) } Err(_) => None, } } - } + }; + res } diff --git a/proc-macro/Cargo.toml b/proc-macro/Cargo.toml index 825bb95ec6..6fd763fae9 100644 --- a/proc-macro/Cargo.toml +++ b/proc-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-subxt-proc-macro" -version = "0.15.2" +version = "0.15.3" authors = ["David Craven ", "Parity Technologies "] edition = "2018" autotests = false @@ -29,10 +29,11 @@ async-std = { version = "1.8.0", features = ["attributes"] } codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] } env_logger = "0.8.2" pretty_assertions = "0.6.1" -sp-keyring = "3.0.0" substrate-subxt = { path = ".." } trybuild = "1.0.38" +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.3" } + [[test]] name = "balances" path = "tests/balances.rs" diff --git a/src/error.rs b/src/error.rs index a86bfe984c..865d236244 100644 --- a/src/error.rs +++ b/src/error.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with substrate-subxt. If not, see . -use jsonrpsee_ws_client::Error as RequestError; +use jsonrpsee_types::Error as RequestError; use sp_core::crypto::SecretStringError; use sp_runtime::{ transaction_validity::TransactionValidityError, @@ -140,6 +140,10 @@ impl RuntimeError { DispatchError::ConsumerRemaining => Ok(Self::ConsumerRemaining), DispatchError::NoProviders => Ok(Self::NoProviders), DispatchError::Other(msg) => Ok(Self::Other(msg.into())), + DispatchError::Arithmetic(_err) => { + Ok(Self::Other("Arithmetic Err".to_string())) + } + DispatchError::Token(_err) => Ok(Self::Other("Token Err".to_string())), } } } diff --git a/src/events.rs b/src/events.rs index 615285bc3b..04a203a748 100644 --- a/src/events.rs +++ b/src/events.rs @@ -363,7 +363,7 @@ mod tests { ModuleMetadata, RuntimeMetadata, RuntimeMetadataPrefixed, - RuntimeMetadataV12, + RuntimeMetadataV13, META_RESERVED, }; use std::convert::TryFrom; @@ -401,7 +401,7 @@ mod tests { let decoder = EventsDecoder::::new( Metadata::try_from(RuntimeMetadataPrefixed( META_RESERVED, - RuntimeMetadata::V12(RuntimeMetadataV12 { + RuntimeMetadata::V13(RuntimeMetadataV13 { modules: DecodeDifferent::Decoded(vec![ModuleMetadata { name: DecodeDifferent::Decoded("System".to_string()), storage: None, diff --git a/src/frame/session.rs b/src/frame/session.rs index 7971455893..2faa6ae979 100644 --- a/src/frame/session.rs +++ b/src/frame/session.rs @@ -72,6 +72,22 @@ pub struct ValidatorsStore { pub _runtime: PhantomData, } +/// The queued keys for the next session. +#[derive(Encode, Store, Debug)] +pub struct QueuedKeysStore { + #[store(returns = Vec<(::ValidatorId, T::Keys)>)] + /// Marker for the runtime + pub _runtime: PhantomData, +} + +/// The next session keys for a validator. +#[derive(Encode, Store, Debug)] +pub struct NextKeysStore<'a, T: Session> { + #[store(returns = Option<::Keys>)] + /// The validator account. + pub validator_id: &'a ::ValidatorId, +} + default_impl!(ValidatorsStore); /// Set the session keys for a validator. diff --git a/src/lib.rs b/src/lib.rs index 8b1b310284..ffd74996a9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -52,10 +52,8 @@ use codec::{ }; use futures::future; use jsonrpsee_http_client::HttpClientBuilder; -use jsonrpsee_ws_client::{ - Subscription, - WsClientBuilder, -}; +use jsonrpsee_types::Subscription; +use jsonrpsee_ws_client::WsClientBuilder; use sp_core::{ storage::{ StorageChangeSet, @@ -210,7 +208,7 @@ impl ClientBuilder { if url.starts_with("ws://") || url.starts_with("wss://") { let client = WsClientBuilder::default() .max_notifs_per_subscription(4096) - .build(&url) + .build(url) .await?; RpcClient::WebSocket(Arc::new(client)) } else { diff --git a/src/metadata.rs b/src/metadata.rs index 8f021bf667..b1a1c7830d 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -546,7 +546,7 @@ impl TryFrom for Metadata { return Err(ConversionError::InvalidPrefix.into()) } let meta = match metadata.1 { - RuntimeMetadata::V12(meta) => meta, + RuntimeMetadata::V13(meta) => meta, _ => return Err(ConversionError::InvalidVersion.into()), }; let mut modules = HashMap::new(); diff --git a/src/rpc.rs b/src/rpc.rs index 5a5ba02e50..3ad5a5ccc5 100644 --- a/src/rpc.rs +++ b/src/rpc.rs @@ -31,19 +31,19 @@ use core::{ marker::PhantomData, }; use frame_metadata::RuntimeMetadataPrefixed; -use jsonrpsee_http_client::{ +use jsonrpsee_http_client::HttpClient; +use jsonrpsee_types::{ to_json_value, - traits::Client, + traits::{ + Client, + SubscriptionClient, + }, DeserializeOwned, Error as RpcError, - HttpClient, JsonValue, -}; -use jsonrpsee_ws_client::{ - traits::SubscriptionClient, Subscription, - WsClient, }; +use jsonrpsee_ws_client::WsClient; use serde::{ Deserialize, Serialize, @@ -550,7 +550,7 @@ impl Rpc { }?; let mut xt_sub = self.watch_extrinsic(extrinsic).await?; - while let Some(status) = xt_sub.next().await { + while let Ok(Some(status)) = xt_sub.next().await { log::info!("received status {:?}", status); match status { // ignore in progress extrinsic for now @@ -613,7 +613,7 @@ impl Rpc { ext_hash, )) })?; - let mut sub = EventSubscription::new(events_sub, &decoder); + let mut sub = EventSubscription::new(events_sub, decoder); sub.filter_extrinsic(block_hash, ext_index); let mut events = vec![]; while let Some(event) = sub.next().await { diff --git a/src/runtimes.rs b/src/runtimes.rs index 985b14d364..515c6d4248 100644 --- a/src/runtimes.rs +++ b/src/runtimes.rs @@ -39,7 +39,7 @@ pub struct Babe; /// These are redefined here to avoid dependencies on the substrate creates where they are defined. /// They must be identical to the definitions in the target substrate version. pub mod app { - use application_crypto::{ + use sp_application_crypto::{ app_crypto, ed25519, key_types, diff --git a/src/subscription.rs b/src/subscription.rs index a6d870739a..2fe7192e56 100644 --- a/src/subscription.rs +++ b/src/subscription.rs @@ -14,7 +14,10 @@ // You should have received a copy of the GNU General Public License // along with substrate-subxt. If not, see . -use jsonrpsee_ws_client::Subscription; +use jsonrpsee_types::{ + DeserializeOwned, + Subscription, +}; use sp_core::{ storage::{ StorageChangeSet, @@ -176,7 +179,9 @@ impl FinalizedEventStorageSubscription { if let Some(storage_change) = self.storage_changes.pop_front() { return Some(storage_change) } - let header: T::Header = self.subscription.next().await?; + let header: T::Header = + read_subscription_response("HeaderSubscription", &mut self.subscription) + .await?; self.storage_changes.extend( self.rpc .query_storage_at(&[self.storage_key.clone()], Some(header.hash())) @@ -199,8 +204,28 @@ impl EventStorageSubscription { /// Gets the next change_set from the subscription. pub async fn next(&mut self) -> Option> { match self { - Self::Imported(event_sub) => event_sub.next().await, + Self::Imported(event_sub) => { + read_subscription_response("StorageChangeSetSubscription", event_sub) + .await + } Self::Finalized(event_sub) => event_sub.next().await, } } } + +async fn read_subscription_response( + sub_name: &str, + sub: &mut Subscription, +) -> Option +where + T: DeserializeOwned, +{ + match sub.next().await { + Ok(Some(next)) => Some(next), + Ok(None) => None, + Err(e) => { + log::error!("Subscription {} failed: {:?} dropping", sub_name, e); + None + } + } +} diff --git a/src/tests/mod.rs b/src/tests/mod.rs index b63d9a58bb..43f59ca7b6 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -141,7 +141,7 @@ async fn test_chain_subscribe_blocks() { let node_process = test_node_process().await; let client = node_process.client(); let mut blocks = client.subscribe_blocks().await.unwrap(); - blocks.next().await; + blocks.next().await.unwrap(); } #[async_std::test] @@ -149,7 +149,7 @@ async fn test_chain_subscribe_finalized_blocks() { let node_process = test_node_process().await; let client = node_process.client(); let mut blocks = client.subscribe_finalized_blocks().await.unwrap(); - blocks.next().await; + blocks.next().await.unwrap(); } #[async_std::test]