From 2a3fa819eb36de7e04ee26d416a6f142c5db2562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com> Date: Sun, 22 Aug 2021 21:22:36 +0200 Subject: [PATCH] Upgrade Substrate & Polkadot (#583) --- cumulus/Cargo.lock | 2145 +++++++---------- cumulus/polkadot-parachains/Cargo.toml | 2 +- cumulus/polkadot-parachains/rococo/src/lib.rs | 2 +- cumulus/polkadot-parachains/src/command.rs | 4 - cumulus/polkadot-parachains/src/service.rs | 243 +- cumulus/test/client/src/lib.rs | 24 +- cumulus/test/service/Cargo.toml | 2 +- cumulus/test/service/src/lib.rs | 43 +- 8 files changed, 1050 insertions(+), 1415 deletions(-) diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock index 8c98c2e9e1b..c56c749037c 100644 --- a/cumulus/Cargo.lock +++ b/cumulus/Cargo.lock @@ -38,58 +38,39 @@ checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] name = "aead" -version = "0.3.2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +checksum = "6e3e798aa0c8239776f54415bc06f3d74b1850f3f830b45c35cfc80556973f70" dependencies = [ "generic-array 0.14.4", ] [[package]] name = "aes" -version = "0.5.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2bc6d3f370b5666245ff421e231cba4353df936e26986d2918e61a8fd6aef6" +checksum = "495ee669413bfbe9e8cace80f4d3d78e6d8c8d99579f97fb93bde351b185f2d4" dependencies = [ - "aes-soft", - "aesni", - "block-cipher", + "cfg-if 1.0.0", + "cipher", + "cpufeatures", + "opaque-debug 0.3.0", ] [[package]] name = "aes-gcm" -version = "0.7.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0301c9e9c443494d970a07885e8cf3e587bae8356a1d5abd0999068413f7205f" +checksum = "b2a930fd487faaa92a30afa92cc9dd1526a5cff67124abbbb1c617ce070f4dcf" dependencies = [ "aead", "aes", - "block-cipher", + "cipher", + "ctr", "ghash", "subtle 2.4.0", ] -[[package]] -name = "aes-soft" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6" -dependencies = [ - "block-cipher", - "byteorder", - "opaque-debug 0.3.0", -] - -[[package]] -name = "aesni" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a" -dependencies = [ - "block-cipher", - "opaque-debug 0.3.0", -] - [[package]] name = "ahash" version = "0.7.4" @@ -209,7 +190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -320,7 +301,7 @@ dependencies = [ "async-io", "async-lock", "async-process", - "crossbeam-utils 0.8.1", + "crossbeam-utils", "futures-channel", "futures-core", "futures-io", @@ -365,7 +346,7 @@ checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -456,7 +437,7 @@ dependencies = [ "proc-macro-error 0.4.12", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -495,7 +476,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" dependencies = [ "beefy-primitives", "fnv", @@ -525,7 +506,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -546,12 +527,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" dependencies = [ "parity-scale-codec", "sp-api", @@ -592,9 +573,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -700,15 +681,6 @@ dependencies = [ "generic-array 0.14.4", ] -[[package]] -name = "block-cipher" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80" -dependencies = [ - "generic-array 0.14.4", -] - [[package]] name = "block-padding" version = "0.1.5" @@ -741,7 +713,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "finality-grandpa", "frame-support", @@ -756,7 +728,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-runtime", "frame-support", @@ -767,7 +739,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "bp-runtime", @@ -782,7 +754,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-messages", "bp-runtime", @@ -799,7 +771,7 @@ dependencies = [ [[package]] name = "bp-rialto" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-messages", "bp-runtime", @@ -814,7 +786,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -831,7 +803,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "frame-support", "hash-db", @@ -848,7 +820,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -863,7 +835,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -878,7 +850,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -952,7 +924,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" dependencies = [ "byteorder", - "either", "iovec", ] @@ -1044,24 +1015,26 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" -version = "0.5.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244fbce0d47e97e8ef2f63b81d5e05882cb518c68531eb33194990d7b7e85845" +checksum = "ea8756167ea0aca10e066cdbe7813bd71d2f24e69b0bc7b50509590cef2ce0b9" dependencies = [ - "stream-cipher", + "cfg-if 1.0.0", + "cipher", + "cpufeatures", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.6.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf18d374d66df0c05cdddd528a7db98f78c28e2519b120855c4f84c5027b1f5" +checksum = "175a11316f33592cf2b71416ee65283730b5b7849813c4891d02a12906ed9acc" dependencies = [ "aead", "chacha20", + "cipher", "poly1305", - "stream-cipher", "zeroize", ] @@ -1085,15 +1058,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d88f30b1e74e7063df5711496f3ee6e74a9735d62062242d70cddf77717f18e" dependencies = [ "multibase", - "multihash", + "multihash 0.13.2", "unsigned-varint 0.5.1", ] [[package]] name = "cipher" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ "generic-array 0.14.4", ] @@ -1169,32 +1142,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - [[package]] name = "core-foundation" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" dependencies = [ - "core-foundation-sys 0.8.2", + "core-foundation-sys", "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - [[package]] name = "core-foundation-sys" version = "0.8.2" @@ -1212,16 +1169,19 @@ dependencies = [ ] [[package]] -name = "cpuid-bool" -version = "0.1.2" +name = "cpufeatures" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +dependencies = [ + "libc", +] [[package]] name = "cpuid-bool" -version = "0.2.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" [[package]] name = "cranelift-bforest" @@ -1333,18 +1293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.1", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils", ] [[package]] @@ -1354,23 +1303,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.1", - "crossbeam-utils 0.8.1", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard 1.1.0", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] @@ -1381,34 +1315,12 @@ checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" dependencies = [ "cfg-if 1.0.0", "const_fn", - "crossbeam-utils 0.8.1", + "crossbeam-utils", "lazy_static", - "memoffset 0.6.1", + "memoffset", "scopeguard 1.1.0", ] -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 0.1.10", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.8.1" @@ -1448,9 +1360,9 @@ dependencies = [ [[package]] name = "ct-logs" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8e13110a84b6315df212c045be706af261fd364791cad863285439ebba672e" +checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" dependencies = [ "sct", ] @@ -1462,7 +1374,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" dependencies = [ "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", +] + +[[package]] +name = "ctr" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +dependencies = [ + "cipher", ] [[package]] @@ -1775,7 +1696,7 @@ dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2142,7 +2063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f83e699727abca3c56e187945f303389590305ab2f0185ea445aa66e8d5f2a" dependencies = [ "data-encoding", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2153,7 +2074,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2166,7 +2087,7 @@ dependencies = [ "proc-macro2 0.4.30", "quote 0.6.13", "regex", - "rustc_version", + "rustc_version 0.2.3", "syn 0.15.44", ] @@ -2179,7 +2100,7 @@ dependencies = [ "convert_case", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2208,9 +2129,9 @@ dependencies = [ [[package]] name = "directories" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" +checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7" dependencies = [ "dirs-sys", ] @@ -2227,12 +2148,12 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" dependencies = [ "libc", - "redox_users 0.3.5", + "redox_users", "winapi 0.3.9", ] @@ -2243,7 +2164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users", "winapi 0.3.9", ] @@ -2287,7 +2208,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2334,7 +2255,7 @@ dependencies = [ "heck", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2354,7 +2275,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2365,7 +2286,7 @@ checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2383,9 +2304,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime 2.1.0", @@ -2494,28 +2415,6 @@ dependencies = [ "futures 0.3.16", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.73", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -2611,7 +2510,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", ] @@ -2629,14 +2528,14 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", "linregress", "log", "parity-scale-codec", - "paste", + "paste 1.0.4", "sp-api", "sp-io", "sp-runtime", @@ -2648,7 +2547,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "Inflector", "chrono", @@ -2674,7 +2573,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -2687,7 +2586,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -2702,7 +2601,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "serde", @@ -2713,7 +2612,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "bitflags", "frame-metadata", @@ -2722,7 +2621,7 @@ dependencies = [ "log", "once_cell", "parity-scale-codec", - "paste", + "paste 1.0.4", "serde", "smallvec 1.6.1", "sp-arithmetic", @@ -2739,44 +2638,43 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "Inflector", "frame-support-procedural-tools", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", - "impl-trait-for-tuples", "log", "parity-scale-codec", "serde", @@ -2790,7 +2688,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -2804,7 +2702,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "sp-api", @@ -2813,10 +2711,9 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", - "parity-scale-codec", "sp-api", "sp-runtime", "sp-std", @@ -2850,6 +2747,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "fuchsia-cprng" version = "0.1.1" @@ -2915,16 +2818,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" -[[package]] -name = "futures-cpupool" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -dependencies = [ - "futures 0.1.30", - "num_cpus", -] - [[package]] name = "futures-executor" version = "0.3.16" @@ -2968,7 +2861,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -2978,7 +2871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" dependencies = [ "futures-io", - "rustls 0.19.1", + "rustls", "webpki", ] @@ -3043,7 +2936,7 @@ dependencies = [ "cc", "libc", "log", - "rustc_version", + "rustc_version 0.2.3", "winapi 0.3.9", ] @@ -3090,9 +2983,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.3.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +checksum = "b442c439366184de619215247d24e908912b175e824a530253845ac4c251a5c1" dependencies = [ "opaque-debug 0.3.0", "polyval", @@ -3147,44 +3040,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "h2" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "fnv", - "futures 0.1.30", - "http 0.1.21", - "indexmap", - "log", - "slab", - "string", - "tokio-io", -] - -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.2", - "indexmap", - "slab", - "tokio 0.2.24", - "tokio-util", - "tracing", - "tracing-futures", -] - [[package]] name = "handlebars" version = "3.5.2" @@ -3298,17 +3153,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "hmac-drbg" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" -dependencies = [ - "digest 0.8.1", - "generic-array 0.12.3", - "hmac 0.7.1", -] - [[package]] name = "hmac-drbg" version = "0.3.0" @@ -3331,17 +3175,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "http" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" -dependencies = [ - "bytes 0.4.12", - "fnv", - "itoa", -] - [[package]] name = "http" version = "0.2.2" @@ -3353,28 +3186,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "http 0.1.21", - "tokio-buf", -] - -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http 0.2.2", -] - [[package]] name = "http-body" version = "0.4.2" @@ -3382,21 +3193,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" dependencies = [ "bytes 1.0.1", - "http 0.2.2", + "http", "pin-project-lite 0.2.4", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" -version = "0.3.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "humantime" @@ -3415,95 +3226,41 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.12.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "futures-cpupool", - "h2 0.1.26", - "http 0.1.21", - "http-body 0.1.0", - "httparse", - "iovec", - "itoa", - "log", - "net2", - "rustc_version", - "time", - "tokio 0.1.22", - "tokio-buf", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", - "want 0.2.0", -] - -[[package]] -name = "hyper" -version = "0.13.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.7", - "http 0.2.2", - "http-body 0.3.1", - "httparse", - "httpdate", - "itoa", - "pin-project 1.0.7", - "socket2 0.3.19", - "tokio 0.2.24", - "tower-service", - "tracing", - "want 0.3.0", -] - -[[package]] -name = "hyper" -version = "0.14.5" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" +checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" dependencies = [ "bytes 1.0.1", "futures-channel", "futures-core", "futures-util", - "http 0.2.2", - "http-body 0.4.2", + "http", + "http-body", "httparse", "httpdate", "itoa", - "pin-project 1.0.7", - "tokio 1.6.1", + "pin-project-lite 0.2.4", + "socket2 0.4.0", + "tokio 1.10.0", "tower-service", "tracing", - "want 0.3.0", + "want", ] [[package]] name = "hyper-rustls" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ - "bytes 0.5.6", "ct-logs", "futures-util", - "hyper 0.13.9", + "hyper", "log", - "rustls 0.18.1", - "rustls-native-certs 0.4.0", - "tokio 0.2.24", - "tokio-rustls 0.14.1", + "rustls", + "rustls-native-certs", + "tokio 1.10.0", + "tokio-rustls 0.22.0", "webpki", ] @@ -3601,7 +3358,7 @@ checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -3660,9 +3417,9 @@ dependencies = [ [[package]] name = "ip_network" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee15951c035f79eddbef745611ec962f63f4558f1dadf98ab723cc603487c6f" +checksum = "09b746553d2f4a1ca26fab939943ddfb217a091f34f53571620a8e3d30691303" [[package]] name = "ipconfig" @@ -3706,6 +3463,28 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +[[package]] +name = "jemalloc-ctl" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7" +dependencies = [ + "jemalloc-sys", + "libc", + "paste 0.1.18", +] + +[[package]] +name = "jemalloc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + [[package]] name = "jobserver" version = "0.1.21" @@ -3726,12 +3505,12 @@ dependencies = [ [[package]] name = "jsonrpc-client-transports" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7" +checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ - "failure", - "futures 0.1.30", + "derive_more 0.99.14", + "futures 0.3.16", "jsonrpc-core", "jsonrpc-pubsub", "log", @@ -3742,11 +3521,13 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa" +checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.1.30", + "futures 0.3.16", + "futures-executor", + "futures-util", "log", "serde", "serde_derive", @@ -3755,94 +3536,102 @@ dependencies = [ [[package]] name = "jsonrpc-core-client" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f764902d7b891344a0acb65625f32f6f7c6db006952143bd650209fbe7d94db" +checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" dependencies = [ + "futures 0.3.16", "jsonrpc-client-transports", ] [[package]] name = "jsonrpc-derive" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3" +checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "jsonrpc-http-server" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7" +checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ - "hyper 0.12.35", + "futures 0.3.16", + "hyper", "jsonrpc-core", "jsonrpc-server-utils", "log", "net2", - "parking_lot 0.10.2", + "parking_lot 0.11.1", "unicase", ] [[package]] name = "jsonrpc-ipc-server" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf50e53e4eea8f421a7316c5f63e395f7bc7c4e786a6dc54d76fab6ff7aa7ce7" +checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" dependencies = [ + "futures 0.3.16", "jsonrpc-core", "jsonrpc-server-utils", "log", "parity-tokio-ipc", - "parking_lot 0.10.2", - "tokio-service", + "parking_lot 0.11.1", + "tower-service", ] [[package]] name = "jsonrpc-pubsub" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639558e0604013be9787ae52f798506ae42bf4220fe587bdc5625871cc8b9c77" +checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" dependencies = [ + "futures 0.3.16", "jsonrpc-core", + "lazy_static", "log", - "parking_lot 0.10.2", + "parking_lot 0.11.1", "rand 0.7.3", "serde", ] [[package]] name = "jsonrpc-server-utils" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f1f3990650c033bd8f6bd46deac76d990f9bbfb5f8dc8c4767bf0a00392176" +checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ - "bytes 0.4.12", + "bytes 1.0.1", + "futures 0.3.16", "globset", "jsonrpc-core", "lazy_static", "log", - "tokio 0.1.22", - "tokio-codec", + "tokio 1.10.0", + "tokio-stream", + "tokio-util 0.6.7", "unicase", ] [[package]] name = "jsonrpc-ws-server" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6596fe75209b73a2a75ebe1dce4e60e03b88a2b25e8807b667597f6315150d22" +checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" dependencies = [ + "futures 0.3.16", "jsonrpc-core", "jsonrpc-server-utils", "log", "parity-ws", - "parking_lot 0.10.2", + "parking_lot 0.11.1", "slab", ] @@ -3857,7 +3646,7 @@ dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -3870,7 +3659,7 @@ dependencies = [ "beef", "futures-channel", "futures-util", - "hyper 0.14.5", + "hyper", "log", "serde", "serde_json", @@ -3889,16 +3678,16 @@ dependencies = [ "futures 0.3.16", "jsonrpsee-types", "log", - "pin-project 1.0.7", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", + "pin-project 1.0.8", + "rustls", + "rustls-native-certs", "serde", "serde_json", "soketto 0.6.0", "thiserror", "tokio 0.2.24", "tokio-rustls 0.15.0", - "tokio-util", + "tokio-util 0.3.1", "url 2.2.0", ] @@ -3921,7 +3710,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -4064,9 +3853,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.98" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "libloading" @@ -4096,9 +3885,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.37.1" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b" +checksum = "9004c06878ef8f3b4b4067e69a140d87ed20bf777287f82223e49713b36ee433" dependencies = [ "atomic", "bytes 1.0.1", @@ -4126,18 +3915,18 @@ dependencies = [ "libp2p-wasm-ext", "libp2p-websocket", "libp2p-yamux", - "parity-multiaddr", + "multiaddr", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.8", "smallvec 1.6.1", "wasm-timer", ] [[package]] name = "libp2p-core" -version = "0.28.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71dd51b562e14846e65bad00e5808d0644376e6588668c490d3c48e1dfeb4a9a" +checksum = "af9b4abdeaa420593a297c8592f63fad4234f4b88dc9343b8fd8e736c35faa59" dependencies = [ "asn1_der", "bs58", @@ -4147,15 +3936,15 @@ dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", "lazy_static", - "libsecp256k1 0.3.5", + "libsecp256k1 0.5.0", "log", - "multihash", + "multiaddr", + "multihash 0.14.0", "multistream-select", - "parity-multiaddr", "parking_lot 0.11.1", - "pin-project 1.0.7", - "prost", - "prost-build", + "pin-project 1.0.8", + "prost 0.8.0", + "prost-build 0.8.0", "rand 0.7.3", "ring", "rw-stream-sink", @@ -4169,9 +3958,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08" +checksum = "66097fccc0b7f8579f90a03ea76ba6196332ea049fd07fd969490a06819dcdc8" dependencies = [ "flate2", "futures 0.3.16", @@ -4180,9 +3969,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b" +checksum = "58ff08b3196b85a17f202d80589e93b1660a574af67275706657fdc762e42c32" dependencies = [ "async-std-resolver", "futures 0.3.16", @@ -4194,9 +3983,9 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf" +checksum = "404eca8720967179dac7a5b4275eb91f904a53859c69ca8d018560ad6beb214f" dependencies = [ "cuckoofilter", "fnv", @@ -4204,17 +3993,17 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.8.0", + "prost-build 0.8.0", "rand 0.7.3", "smallvec 1.6.1", ] [[package]] name = "libp2p-gossipsub" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cb9a89a301afde1e588c73f7e9131e12a5388725f290a9047b878862db1b53" +checksum = "b1cc48709bcbc3a3321f08a73560b4bbb4166a7d56f6fdb615bc775f4f91058e" dependencies = [ "asynchronous-codec 0.6.0", "base64 0.13.0", @@ -4226,8 +4015,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.8.0", + "prost-build 0.8.0", "rand 0.7.3", "regex", "sha2 0.9.2", @@ -4238,25 +4027,25 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46" +checksum = "a7b61f6cf07664fb97016c318c4d4512b3dd4cc07238607f3f0163245f99008e" dependencies = [ "futures 0.3.16", "libp2p-core", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.8.0", + "prost-build 0.8.0", "smallvec 1.6.1", "wasm-timer", ] [[package]] name = "libp2p-kad" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07312ebe5ee4fd2404447a0609814574df55c65d4e20838b957bbd34907d820" +checksum = "50ed78489c87924235665a0ab345b298ee34dff0f7ad62c0ba6608b2144fb75e" dependencies = [ "arrayvec 0.5.2", "asynchronous-codec 0.6.0", @@ -4267,8 +4056,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.8.0", + "prost-build 0.8.0", "rand 0.7.3", "sha2 0.9.2", "smallvec 1.6.1", @@ -4280,9 +4069,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c221897b3fd7f215de7ecfec215c5eba598e5b61c605b5f8b56fe8a4fb507724" +checksum = "a29e6cbc2a24b8471b6567e580a0e8e7b70a6d0f0ea2be0844d1e842d7d4fa33" dependencies = [ "async-io", "data-encoding", @@ -4301,9 +4090,9 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d" +checksum = "313d9ea526c68df4425f580024e67a9d3ffd49f2c33de5154b1f5019816f7a99" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", @@ -4319,9 +4108,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd" +checksum = "3f1db7212f342b6ba7c981cc40e31f76e9e56cb48e65fa4c142ecaca5839523e" dependencies = [ "bytes 1.0.1", "curve25519-dalek 3.0.0", @@ -4329,9 +4118,9 @@ dependencies = [ "lazy_static", "libp2p-core", "log", - "prost", - "prost-build", - "rand 0.7.3", + "prost 0.8.0", + "prost-build 0.8.0", + "rand 0.8.4", "sha2 0.9.2", "snow", "static_assertions", @@ -4341,9 +4130,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1" +checksum = "2482cfd9eb0b7a0baaf3e7b329dc4f2785181a161b1a47b7192f8d758f54a439" dependencies = [ "futures 0.3.16", "libp2p-core", @@ -4356,30 +4145,30 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11" +checksum = "13b4783e5423870b9a5c199f65a7a3bc66d86ab56b2b9beebf3c338d889cf8e4" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", "futures 0.3.16", "libp2p-core", "log", - "prost", - "prost-build", + "prost 0.8.0", + "prost-build 0.8.0", "unsigned-varint 0.7.0", "void", ] [[package]] name = "libp2p-pnet" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599" +checksum = "07cb4dd4b917e5b40ddefe49b96b07adcd8d342e0317011d175b7b2bb1dcc974" dependencies = [ "futures 0.3.16", "log", - "pin-project 1.0.7", + "pin-project 1.0.8", "rand 0.7.3", "salsa20", "sha3", @@ -4387,9 +4176,9 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d" +checksum = "0133f6cfd81cdc16e716de2982e012c62e6b9d4f12e41967b3ee361051c622aa" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", @@ -4398,9 +4187,9 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.7", - "prost", - "prost-build", + "pin-project 1.0.8", + "prost 0.8.0", + "prost-build 0.8.0", "rand 0.7.3", "smallvec 1.6.1", "unsigned-varint 0.7.0", @@ -4410,9 +4199,9 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3" +checksum = "06cdae44b6821466123af93cbcdec7c9e6ba9534a8af9cdc296446d39416d241" dependencies = [ "async-trait", "bytes 1.0.1", @@ -4430,9 +4219,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92" +checksum = "7083861341e1555467863b4cd802bea1e8c4787c0f7b5110097d0f1f3248f9a9" dependencies = [ "either", "futures 0.3.16", @@ -4446,19 +4235,19 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed" +checksum = "ab8cb308d4fc854869f5abb54fdab0833d2cf670d407c745849dc47e6e08d79c" dependencies = [ "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "libp2p-tcp" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9" +checksum = "79edd26b6b4bb5feee210dcda562dca186940dfecb0024b979c3f50824b3bf28" dependencies = [ "async-io", "futures 0.3.16", @@ -4473,9 +4262,9 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5" +checksum = "280e793440dd4e9f273d714f4497325c72cddb0fe85a49f9a03c88f41dd20182" dependencies = [ "async-std", "futures 0.3.16", @@ -4485,9 +4274,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de" +checksum = "f553b7140fad3d7a76f50497b0ea591e26737d9607428a75509fc191e4d1b1f6" dependencies = [ "futures 0.3.16", "js-sys", @@ -4499,9 +4288,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74" +checksum = "ddf99dcbf5063e9d59087f61b1e85c686ceab2f5abedb472d32288065c0e5e27" dependencies = [ "either", "futures 0.3.16", @@ -4517,9 +4306,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4" +checksum = "214cc0dd9c37cbed27f0bb1eba0c41bbafdb93a8be5e9d6ae1e6b4b42cd044bf" dependencies = [ "futures 0.3.16", "libp2p-core", @@ -4542,17 +4331,20 @@ dependencies = [ [[package]] name = "libsecp256k1" -version = "0.3.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962" +checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7" dependencies = [ "arrayref", - "crunchy", - "digest 0.8.1", - "hmac-drbg 0.2.0", + "base64 0.12.3", + "digest 0.9.0", + "hmac-drbg", + "libsecp256k1-core", + "libsecp256k1-gen-ecmult", + "libsecp256k1-gen-genmult", "rand 0.7.3", - "sha2 0.8.2", - "subtle 2.4.0", + "serde", + "sha2 0.9.2", "typenum", ] @@ -4565,7 +4357,7 @@ dependencies = [ "arrayref", "base64 0.12.3", "digest 0.9.0", - "hmac-drbg 0.3.0", + "hmac-drbg", "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", @@ -4795,15 +4587,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg 1.0.1", -] - [[package]] name = "memoffset" version = "0.6.1" @@ -4854,7 +4637,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -4889,7 +4672,7 @@ checksum = "19ce18b5423c573a13e80cb3046ea0af6379ef725dc3af4886bdb8f4e5093068" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -4922,27 +4705,28 @@ dependencies = [ ] [[package]] -name = "mio-extras" -version = "2.0.6" +name = "mio" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ - "lazycell", + "libc", "log", - "mio", - "slab", + "miow 0.3.6", + "ntapi", + "winapi 0.3.9", ] [[package]] -name = "mio-named-pipes" -version = "0.1.7" +name = "mio-extras" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ + "lazycell", "log", - "mio", - "miow 0.3.6", - "winapi 0.3.9", + "mio 0.6.23", + "slab", ] [[package]] @@ -4953,7 +4737,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -4984,6 +4768,24 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" +[[package]] +name = "multiaddr" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +dependencies = [ + "arrayref", + "bs58", + "byteorder", + "data-encoding", + "multihash 0.14.0", + "percent-encoding 2.1.0", + "serde", + "static_assertions", + "unsigned-varint 0.7.0", + "url 2.2.0", +] + [[package]] name = "multibase" version = "0.8.0" @@ -5012,17 +4814,30 @@ dependencies = [ "unsigned-varint 0.5.1", ] +[[package]] +name = "multihash" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" +dependencies = [ + "digest 0.9.0", + "generic-array 0.14.4", + "multihash-derive", + "sha2 0.9.2", + "unsigned-varint 0.7.0", +] + [[package]] name = "multihash-derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f" +checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate 1.0.0", "proc-macro-error 1.0.4", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", "synstructure", ] @@ -5041,7 +4856,7 @@ dependencies = [ "bytes 1.0.1", "futures 0.3.16", "log", - "pin-project 1.0.7", + "pin-project 1.0.8", "smallvec 1.6.1", "unsigned-varint 0.6.0", ] @@ -5072,7 +4887,7 @@ checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -5121,7 +4936,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-system", "parity-scale-codec", @@ -5154,6 +4969,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-bigint" version = "0.2.6" @@ -5291,7 +5115,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5304,11 +5128,10 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", - "pallet-session", "pallet-timestamp", "parity-scale-codec", "sp-application-crypto", @@ -5320,7 +5143,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5335,7 +5158,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5349,7 +5172,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5372,7 +5195,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5386,7 +5209,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" dependencies = [ "beefy-primitives", "frame-support", @@ -5402,7 +5225,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#267ea4530647376704cc116b6d524857c1a596b0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#0a4141ada1d25e949e3b0f8d7e9da39826634223" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5427,7 +5250,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5441,7 +5264,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5457,7 +5280,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5478,7 +5301,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "bp-message-dispatch", @@ -5523,7 +5346,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5539,7 +5362,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5554,7 +5377,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5570,12 +5393,14 @@ dependencies = [ "sp-runtime", "sp-std", "static_assertions", + "strum 0.21.0", + "strum_macros 0.21.1", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5592,7 +5417,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5606,7 +5431,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5628,7 +5453,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5643,7 +5468,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5662,7 +5487,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5678,7 +5503,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5693,7 +5518,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5710,7 +5535,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5726,7 +5551,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5737,20 +5562,18 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-core", - "sp-rpc", "sp-runtime", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", - "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5759,7 +5582,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5772,7 +5595,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5788,7 +5611,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5810,13 +5633,12 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", - "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5825,7 +5647,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5838,9 +5660,8 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "enumflags2", "frame-support", "frame-system", "parity-scale-codec", @@ -5852,7 +5673,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5867,7 +5688,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5887,7 +5708,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -5903,7 +5724,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5916,7 +5737,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5926,7 +5747,6 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "paste", "rand_chacha 0.2.2", "serde", "sp-application-crypto", @@ -5934,24 +5754,23 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-std", - "static_assertions", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "log", "sp-arithmetic", @@ -5960,7 +5779,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -5973,12 +5792,11 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-inherents", @@ -5991,7 +5809,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -6006,7 +5824,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-support", "frame-system", @@ -6022,7 +5840,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -6039,7 +5857,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6050,7 +5868,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -6066,13 +5884,12 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", - "sp-core", "sp-runtime", "sp-std", ] @@ -6080,7 +5897,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-benchmarking", "frame-support", @@ -6095,9 +5912,8 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "enumflags2", "frame-benchmarking", "frame-support", "frame-system", @@ -6109,7 +5925,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "frame-support", "frame-system", @@ -6175,24 +5991,6 @@ dependencies = [ "snap", ] -[[package]] -name = "parity-multiaddr" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58341485071825827b7f03cf7efd1cb21e6a709bea778fb50227fd45d2f361b4" -dependencies = [ - "arrayref", - "bs58", - "byteorder", - "data-encoding", - "multihash", - "percent-encoding 2.1.0", - "serde", - "static_assertions", - "unsigned-varint 0.7.0", - "url 2.2.0", -] - [[package]] name = "parity-scale-codec" version = "2.2.0" @@ -6216,7 +6014,7 @@ dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -6227,20 +6025,15 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] name = "parity-tokio-ipc" -version = "0.4.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf" +checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", + "futures 0.3.16", "libc", "log", - "mio-named-pipes", - "miow 0.3.6", "rand 0.7.3", - "tokio 0.1.22", - "tokio-named-pipes", - "tokio-uds", + "tokio 1.10.0", "winapi 0.3.9", ] @@ -6269,7 +6062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.28", - "syn 1.0.73", + "syn 1.0.74", "synstructure", ] @@ -6290,15 +6083,15 @@ checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" [[package]] name = "parity-ws" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61" +checksum = "d0ab8a461779bd022964cae2b4989fa9c99deb270bec162da2125ec03c09fcaa" dependencies = [ "byteorder", "bytes 0.4.12", "httparse", "log", - "mio", + "mio 0.6.23", "mio-extras", "rand 0.7.3", "sha-1 0.8.2", @@ -6322,17 +6115,6 @@ dependencies = [ "parking_lot_core 0.4.0", ] -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.6.2", - "rustc_version", -] - [[package]] name = "parking_lot" version = "0.10.2" @@ -6362,22 +6144,7 @@ checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" dependencies = [ "libc", "rand 0.6.5", - "rustc_version", - "smallvec 0.6.13", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "rustc_version", + "rustc_version 0.2.3", "smallvec 0.6.13", "winapi 0.3.9", ] @@ -6410,12 +6177,31 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + [[package]] name = "paste" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1" +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + [[package]] name = "pbkdf2" version = "0.3.0" @@ -6482,7 +6268,7 @@ dependencies = [ "pest_meta", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -6517,11 +6303,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" dependencies = [ - "pin-project-internal 1.0.7", + "pin-project-internal 1.0.8", ] [[package]] @@ -6532,18 +6318,18 @@ checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "pin-project-internal" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -6579,7 +6365,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6593,7 +6379,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6606,8 +6392,9 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ + "derive_more 0.99.14", "futures 0.3.16", "lru", "parity-scale-codec", @@ -6629,7 +6416,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "lru", @@ -6648,7 +6435,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "frame-benchmarking-cli", "futures 0.3.16", @@ -6668,7 +6455,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6774,9 +6561,10 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "always-assert", + "derive_more 0.99.14", "futures 0.3.16", "futures-timer 3.0.2", "polkadot-node-network-protocol", @@ -6794,7 +6582,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6806,8 +6594,9 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ + "derive_more 0.99.14", "futures 0.3.16", "lru", "parity-scale-codec", @@ -6830,7 +6619,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6844,7 +6633,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6862,7 +6651,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", "futures 0.3.16", @@ -6875,14 +6664,13 @@ dependencies = [ "polkadot-primitives", "sc-network", "sp-consensus", - "strum", "tracing", ] [[package]] name = "polkadot-node-collation-generation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "parity-scale-codec", @@ -6900,7 +6688,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "derive_more 0.99.14", @@ -6930,7 +6718,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "futures 0.3.16", @@ -6950,7 +6738,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "futures 0.3.16", @@ -6968,7 +6756,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "polkadot-node-subsystem", @@ -6983,7 +6771,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7001,7 +6789,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "polkadot-node-subsystem", @@ -7016,7 +6804,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -7033,7 +6821,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "derive_more 0.99.14", @@ -7052,7 +6840,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-participation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "polkadot-node-primitives", @@ -7065,7 +6853,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7082,7 +6870,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "futures 0.3.16", @@ -7097,7 +6885,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "always-assert", "assert_matches", @@ -7107,7 +6895,7 @@ dependencies = [ "futures-timer 3.0.2", "libc", "parity-scale-codec", - "pin-project 1.0.7", + "pin-project 1.0.8", "polkadot-core-primitives", "polkadot-parachain", "rand 0.8.4", @@ -7127,7 +6915,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "memory-lru", @@ -7145,7 +6933,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-std", "lazy_static", @@ -7163,11 +6951,12 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", "futures 0.3.16", "futures-timer 3.0.2", + "jemalloc-ctl", "metered-channel", "sc-network", "sp-application-crypto", @@ -7179,9 +6968,10 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", + "derive_more 0.99.14", "futures 0.3.16", "parity-scale-codec", "polkadot-node-jaeger", @@ -7189,14 +6979,14 @@ dependencies = [ "polkadot-primitives", "sc-authority-discovery", "sc-network", - "strum", + "strum 0.21.0", "thiserror", ] [[package]] name = "polkadot-node-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "futures 0.3.16", "parity-scale-codec", @@ -7220,7 +7010,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7230,14 +7020,14 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", "futures 0.3.16", "futures-timer 3.0.2", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.8", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7256,7 +7046,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-std", "async-trait", @@ -7268,7 +7058,7 @@ dependencies = [ "mick-jaeger", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.8", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7286,16 +7076,17 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", + "derive_more 0.99.14", "futures 0.3.16", "futures-timer 3.0.2", "itertools 0.10.0", "lru", "metered-channel", "parity-scale-codec", - "pin-project 1.0.7", + "pin-project 1.0.8", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -7316,7 +7107,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", "futures 0.3.16", @@ -7338,24 +7129,24 @@ dependencies = [ [[package]] name = "polkadot-overseer-all-subsystems-gen" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "assert_matches", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "polkadot-overseer-gen" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", "futures 0.3.16", "futures-timer 3.0.2", "metered-channel", - "pin-project 1.0.7", + "pin-project 1.0.8", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-overseer-gen-proc-macro", @@ -7366,18 +7157,18 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "polkadot-parachain" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "derive_more 0.99.14", "frame-support", @@ -7393,7 +7184,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "frame-system", @@ -7423,7 +7214,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7456,7 +7247,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -7531,7 +7322,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitvec 0.20.1", "frame-benchmarking", @@ -7574,7 +7365,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "bitflags", "bitvec 0.20.1", @@ -7613,7 +7404,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "async-trait", "beefy-gadget", @@ -7651,6 +7442,7 @@ dependencies = [ "polkadot-node-core-parachains-inherent", "polkadot-node-core-provisioner", "polkadot-node-core-runtime-api", + "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7709,9 +7501,10 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "arrayvec 0.5.2", + "derive_more 0.99.14", "futures 0.3.16", "indexmap", "parity-scale-codec", @@ -7720,7 +7513,6 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sc-network", "sp-keystore", "sp-staking", "thiserror", @@ -7730,7 +7522,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7740,7 +7532,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -7765,7 +7557,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -7825,7 +7617,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "frame-benchmarking", "frame-system", @@ -7889,21 +7681,23 @@ dependencies = [ [[package]] name = "poly1305" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8" +checksum = "9fcffab1f78ebbdf4b93b68c1ffebc24037eedf271edaca795732b24e5e4e349" dependencies = [ - "cpuid-bool 0.2.0", + "cpufeatures", + "opaque-debug 0.3.0", "universal-hash", ] [[package]] name = "polyval" -version = "0.4.5" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +checksum = "a6ba6a405ef63530d6cb12802014b22f9c5751bd17cdcddbe9e46d5c8ae83287" dependencies = [ - "cpuid-bool 0.2.0", + "cfg-if 1.0.0", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -7981,7 +7775,7 @@ dependencies = [ "proc-macro-error-attr 0.4.12", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", "version_check", ] @@ -7994,7 +7788,7 @@ dependencies = [ "proc-macro-error-attr 1.0.4", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", "version_check", ] @@ -8006,7 +7800,7 @@ checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", "syn-mid", "version_check", ] @@ -8073,7 +7867,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" dependencies = [ "bytes 1.0.1", - "prost-derive", + "prost-derive 0.7.0", +] + +[[package]] +name = "prost" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +dependencies = [ + "bytes 1.0.1", + "prost-derive 0.8.0", ] [[package]] @@ -8088,8 +7892,26 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", - "prost-types", + "prost 0.7.0", + "prost-types 0.7.0", + "tempfile", + "which", +] + +[[package]] +name = "prost-build" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" +dependencies = [ + "bytes 1.0.1", + "heck", + "itertools 0.10.0", + "log", + "multimap", + "petgraph", + "prost 0.8.0", + "prost-types 0.8.0", "tempfile", "which", ] @@ -8104,7 +7926,20 @@ dependencies = [ "itertools 0.9.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", +] + +[[package]] +name = "prost-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +dependencies = [ + "anyhow", + "itertools 0.10.0", + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", ] [[package]] @@ -8114,7 +7949,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" dependencies = [ "bytes 1.0.1", - "prost", + "prost 0.7.0", +] + +[[package]] +name = "prost-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" +dependencies = [ + "bytes 1.0.1", + "prost 0.8.0", ] [[package]] @@ -8433,7 +8278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" dependencies = [ "autocfg 1.0.1", - "crossbeam-deque 0.8.0", + "crossbeam-deque", "either", "rayon-core", ] @@ -8445,8 +8290,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", - "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.1", + "crossbeam-deque", + "crossbeam-utils", "lazy_static", "num_cpus", ] @@ -8475,17 +8320,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.0" @@ -8526,7 +8360,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -8584,10 +8418,9 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "env_logger 0.8.3", - "hex", + "env_logger 0.9.0", "jsonrpsee-proc-macros", "jsonrpsee-ws-client", "log", @@ -8713,7 +8546,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "beefy-primitives", "bp-messages", @@ -8792,18 +8625,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.1", -] - [[package]] name = "rustc-demangle" version = "0.1.18" @@ -8832,16 +8653,12 @@ dependencies = [ ] [[package]] -name = "rustls" -version = "0.18.1" +name = "rustc_version" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct", - "webpki", + "semver 0.11.0", ] [[package]] @@ -8857,18 +8674,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls-native-certs" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8" -dependencies = [ - "openssl-probe", - "rustls 0.18.1", - "schannel", - "security-framework 1.0.0", -] - [[package]] name = "rustls-native-certs" version = "0.5.0" @@ -8876,9 +8681,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" dependencies = [ "openssl-probe", - "rustls 0.19.1", + "rustls", "schannel", - "security-framework 2.3.1", + "security-framework", ] [[package]] @@ -8914,14 +8719,14 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" dependencies = [ - "rustc_version", + "rustc_version 0.2.3", ] [[package]] name = "salsa20" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399f290ffc409596022fce5ea5d4138184be4784f2b28c62c59f0d8389059a15" +checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0" dependencies = [ "cipher", ] @@ -8938,7 +8743,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "log", "sp-core", @@ -8949,23 +8754,21 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "derive_more 0.99.14", - "either", "futures 0.3.16", "futures-timer 3.0.2", "ip_network", "libp2p", "log", "parity-scale-codec", - "prost", - "prost-build", + "prost 0.8.0", + "prost-build 0.7.0", "rand 0.7.3", "sc-client-api", "sc-network", - "serde_json", "sp-api", "sp-authority-discovery", "sp-blockchain", @@ -8978,7 +8781,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -9001,7 +8804,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9017,7 +8820,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9033,18 +8836,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "chrono", "fdlimit", @@ -9082,14 +8885,11 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "derive_more 0.99.14", "fnv", "futures 0.3.16", "hash-db", - "kvdb", - "lazy_static", "log", "parity-scale-codec", "parking_lot 0.11.1", @@ -9101,24 +8901,20 @@ dependencies = [ "sp-core", "sp-database", "sp-externalities", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-std", "sp-storage", "sp-trie", "sp-utils", - "sp-version", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "blake2-rfc", "hash-db", "kvdb", "kvdb-memorydb", @@ -9127,10 +8923,8 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.11.1", "sc-client-api", - "sc-executor", "sc-state-db", "sp-arithmetic", "sp-blockchain", @@ -9139,13 +8933,12 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-trie", - "substrate-prometheus-endpoint", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "futures 0.3.16", @@ -9164,18 +8957,16 @@ dependencies = [ "sp-utils", "substrate-prometheus-endpoint", "thiserror", - "wasm-timer", ] [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "derive_more 0.99.14", "futures 0.3.16", - "futures-timer 3.0.2", "log", "parity-scale-codec", "sc-block-builder", @@ -9192,23 +8983,20 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-inherents", - "sp-io", "sp-keystore", "sp-runtime", - "sp-version", "substrate-prometheus-endpoint", ] [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "derive_more 0.99.14", "fork-tree", "futures 0.3.16", - "futures-timer 3.0.2", "log", "merlin", "num-bigint", @@ -9222,7 +9010,6 @@ dependencies = [ "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-consensus-uncles", "sc-keystore", "sc-telemetry", "schnorrkel", @@ -9240,7 +9027,6 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-utils", "sp-version", "substrate-prometheus-endpoint", ] @@ -9248,7 +9034,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9272,7 +9058,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9285,19 +9071,17 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "futures 0.3.16", "futures-timer 3.0.2", - "impl-trait-for-tuples", "log", "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", "sp-api", - "sp-application-crypto", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -9307,14 +9091,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-trie", "thiserror", ] [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "sc-client-api", "sp-authorship", @@ -9325,14 +9108,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "derive_more 0.99.14", "lazy_static", - "libsecp256k1 0.3.5", + "libsecp256k1 0.6.0", "log", "parity-scale-codec", - "parity-wasm 0.42.2", "parking_lot 0.11.1", "sc-executor-common", "sc-executor-wasmi", @@ -9343,7 +9124,6 @@ dependencies = [ "sp-io", "sp-panic-handler", "sp-runtime-interface", - "sp-serializer", "sp-tasks", "sp-trie", "sp-version", @@ -9354,7 +9134,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "derive_more 0.99.14", "parity-scale-codec", @@ -9371,12 +9151,13 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "log", "parity-scale-codec", "sc-allocator", "sc-executor-common", + "scoped-tls", "sp-core", "sp-runtime-interface", "sp-wasm-interface", @@ -9386,14 +9167,13 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "cfg-if 1.0.0", "libc", "log", "parity-scale-codec", "parity-wasm 0.42.2", - "pwasm-utils", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -9406,7 +9186,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9415,11 +9195,9 @@ dependencies = [ "fork-tree", "futures 0.3.16", "futures-timer 3.0.2", - "linked-hash-map", "log", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.7", "rand 0.8.4", "sc-block-builder", "sc-client-api", @@ -9436,18 +9214,16 @@ dependencies = [ "sp-consensus", "sp-core", "sp-finality-grandpa", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-utils", "substrate-prometheus-endpoint", - "wasm-timer", ] [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "derive_more 0.99.14", "finality-grandpa", @@ -9471,7 +9247,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "ansi_term 0.12.1", "futures 0.3.16", @@ -9483,36 +9259,29 @@ dependencies = [ "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", - "wasm-timer", ] [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "derive_more 0.99.14", - "futures 0.3.16", - "futures-util", "hex", - "merlin", "parking_lot 0.11.1", - "rand 0.7.3", "serde_json", "sp-application-crypto", "sp-core", "sp-keystore", - "subtle 2.4.0", ] [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "hash-db", - "lazy_static", "parity-scale-codec", "parking_lot 0.11.1", "sc-client-api", @@ -9528,18 +9297,16 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", - "bs58", "bytes 1.0.1", "cid", "derive_more 0.99.14", "either", - "erased-serde", "fnv", "fork-tree", "futures 0.3.16", @@ -9551,12 +9318,11 @@ dependencies = [ "linked_hash_set", "log", "lru", - "nohash-hasher", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.7", - "prost", - "prost-build", + "pin-project 1.0.8", + "prost 0.8.0", + "prost-build 0.7.0", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -9576,14 +9342,13 @@ dependencies = [ "thiserror", "unsigned-varint 0.6.0", "void", - "wasm-timer", "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -9594,20 +9359,19 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "tracing", - "wasm-timer", ] [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", "fnv", "futures 0.3.16", "futures-timer 3.0.2", "hex", - "hyper 0.13.9", + "hyper", "hyper-rustls", "log", "num_cpus", @@ -9615,7 +9379,6 @@ dependencies = [ "parking_lot 0.11.1", "rand 0.7.3", "sc-client-api", - "sc-keystore", "sc-network", "sp-api", "sp-core", @@ -9628,7 +9391,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "futures 0.3.16", "libp2p", @@ -9641,7 +9404,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9650,7 +9413,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "futures 0.3.16", "hash-db", @@ -9662,8 +9425,6 @@ dependencies = [ "sc-block-builder", "sc-chain-spec", "sc-client-api", - "sc-executor", - "sc-keystore", "sc-rpc-api", "sc-tracing", "sc-transaction-pool-api", @@ -9676,8 +9437,6 @@ dependencies = [ "sp-rpc", "sp-runtime", "sp-session", - "sp-state-machine", - "sp-tracing", "sp-utils", "sp-version", ] @@ -9685,7 +9444,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", @@ -9710,41 +9469,37 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "futures 0.1.30", + "futures 0.3.16", "jsonrpc-core", "jsonrpc-http-server", "jsonrpc-ipc-server", "jsonrpc-pubsub", "jsonrpc-ws-server", "log", - "serde", "serde_json", - "sp-runtime", "substrate-prometheus-endpoint", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "directories", "exit-future 0.2.0", - "futures 0.1.30", "futures 0.3.16", "futures-timer 3.0.2", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", - "lazy_static", "log", "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.8", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -9773,7 +9528,6 @@ dependencies = [ "sp-core", "sp-externalities", "sp-inherents", - "sp-io", "sp-keystore", "sp-runtime", "sp-session", @@ -9790,13 +9544,12 @@ dependencies = [ "thiserror", "tracing", "tracing-futures", - "wasm-timer", ] [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "log", "parity-scale-codec", @@ -9805,13 +9558,12 @@ dependencies = [ "parking_lot 0.11.1", "sc-client-api", "sp-core", - "thiserror", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9833,31 +9585,28 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "chrono", "futures 0.3.16", "libp2p", "log", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.8", "rand 0.7.3", "serde", "serde_json", - "take_mut", "thiserror", - "void", "wasm-timer", ] [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "ansi_term 0.12.1", "atty", - "erased-serde", "lazy_static", "log", "once_cell", @@ -9866,44 +9615,38 @@ dependencies = [ "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-log", "tracing-subscriber", "wasm-bindgen", - "wasm-timer", "web-sys", ] [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "derive_more 0.99.14", "futures 0.3.16", "intervalier", "linked-hash-map", @@ -9924,18 +9667,16 @@ dependencies = [ "sp-utils", "substrate-prometheus-endpoint", "thiserror", - "wasm-timer", ] [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "derive_more 0.99.14", "futures 0.3.16", "log", - "parity-scale-codec", "serde", "sp-blockchain", "sp-runtime", @@ -9964,7 +9705,7 @@ dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -10032,19 +9773,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "security-framework" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "core-foundation-sys 0.7.0", - "libc", - "security-framework-sys 1.0.0", -] - [[package]] name = "security-framework" version = "2.3.1" @@ -10052,20 +9780,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" dependencies = [ "bitflags", - "core-foundation 0.9.1", - "core-foundation-sys 0.8.2", - "libc", - "security-framework-sys 2.3.0", -] - -[[package]] -name = "security-framework-sys" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" -dependencies = [ - "core-foundation-sys 0.7.0", + "core-foundation", + "core-foundation-sys", "libc", + "security-framework-sys", ] [[package]] @@ -10074,7 +9792,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" dependencies = [ - "core-foundation-sys 0.8.2", + "core-foundation-sys", "libc", ] @@ -10138,7 +9856,7 @@ checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -10172,7 +9890,7 @@ checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpuid-bool 0.1.2", + "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -10197,7 +9915,7 @@ checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpuid-bool 0.1.2", + "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -10300,7 +10018,7 @@ dependencies = [ "approx", "num-complex", "num-traits", - "paste", + "paste 1.0.4", ] [[package]] @@ -10321,11 +10039,11 @@ dependencies = [ [[package]] name = "slot-range-helper" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "enumn", "parity-scale-codec", - "paste", + "paste 1.0.4", "sp-runtime", "sp-std", ] @@ -10362,17 +10080,17 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "snow" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795dd7aeeee24468e5a32661f6d27f7b5cbed802031b2d7640c7b10f8fb2dd50" +checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "rand 0.7.3", - "rand_core 0.5.1", + "rand 0.8.4", + "rand_core 0.6.1", "ring", - "rustc_version", + "rustc_version 0.3.3", "sha2 0.9.2", "subtle 2.4.0", "x25519-dalek", @@ -10433,7 +10151,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "hash-db", "log", @@ -10450,19 +10168,19 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "serde", @@ -10474,7 +10192,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "integer-sqrt", "num-traits", @@ -10488,7 +10206,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "sp-api", @@ -10500,7 +10218,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "parity-scale-codec", @@ -10512,7 +10230,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "sp-api", @@ -10524,7 +10242,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "futures 0.3.16", "log", @@ -10542,7 +10260,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "futures 0.3.16", @@ -10561,7 +10279,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "parity-scale-codec", @@ -10578,7 +10296,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "merlin", @@ -10600,7 +10318,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -10610,7 +10328,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -10622,7 +10340,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "base58", "blake2-rfc", @@ -10635,7 +10353,7 @@ dependencies = [ "hex", "impl-serde", "lazy_static", - "libsecp256k1 0.3.5", + "libsecp256k1 0.6.0", "log", "merlin", "num-traits", @@ -10666,7 +10384,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -10675,17 +10393,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "environmental", "parity-scale-codec", @@ -10696,7 +10414,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "finality-grandpa", "log", @@ -10713,7 +10431,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10727,11 +10445,11 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "futures 0.3.16", "hash-db", - "libsecp256k1 0.3.5", + "libsecp256k1 0.6.0", "log", "parity-scale-codec", "parking_lot 0.11.1", @@ -10752,18 +10470,18 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.20.0", ] [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -10780,7 +10498,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "ruzstd", "zstd", @@ -10789,7 +10507,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "serde", @@ -10802,18 +10520,18 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "sp-api", "sp-core", @@ -10823,7 +10541,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "backtrace", ] @@ -10831,18 +10549,17 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "rustc-hash", "serde", "sp-core", - "tracing-core", ] [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "either", "hash256-std-hasher", @@ -10850,7 +10567,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "paste", + "paste 1.0.4", "rand 0.7.3", "serde", "sp-application-crypto", @@ -10863,7 +10580,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10880,19 +10597,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "serde", "serde_json", @@ -10901,7 +10618,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "sp-api", @@ -10914,7 +10631,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10924,7 +10641,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "hash-db", "log", @@ -10947,12 +10664,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10965,7 +10682,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "log", "sp-core", @@ -10978,7 +10695,7 @@ dependencies = [ [[package]] name = "sp-test-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -10991,7 +10708,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -11002,13 +10719,12 @@ dependencies = [ "sp-runtime", "sp-std", "thiserror", - "wasm-timer", ] [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "erased-serde", "log", @@ -11026,7 +10742,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "sp-api", "sp-runtime", @@ -11035,7 +10751,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", "log", @@ -11050,7 +10766,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "hash-db", "memory-db", @@ -11064,10 +10780,9 @@ dependencies = [ [[package]] name = "sp-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "futures 0.3.16", - "futures-core", "futures-timer 3.0.2", "lazy_static", "prometheus", @@ -11076,7 +10791,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11091,19 +10806,18 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "parity-scale-codec", - "proc-macro-crate 1.0.0", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11281,7 +10995,7 @@ dependencies = [ "memchr", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -11297,25 +11011,6 @@ dependencies = [ "rand 0.8.4", ] -[[package]] -name = "stream-cipher" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89" -dependencies = [ - "block-cipher", - "generic-array 0.14.4", -] - -[[package]] -name = "string" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -dependencies = [ - "bytes 0.4.12", -] - [[package]] name = "strsim" version = "0.8.0" @@ -11343,7 +11038,7 @@ dependencies = [ "proc-macro-error 1.0.4", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -11352,7 +11047,16 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" dependencies = [ - "strum_macros", + "strum_macros 0.20.1", +] + +[[package]] +name = "strum" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" +dependencies = [ + "strum_macros 0.21.1", ] [[package]] @@ -11364,7 +11068,19 @@ dependencies = [ "heck", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", +] + +[[package]] +name = "strum_macros" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +dependencies = [ + "heck", + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", ] [[package]] @@ -11383,7 +11099,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "platforms", ] @@ -11391,7 +11107,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.16", @@ -11403,7 +11119,6 @@ dependencies = [ "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", - "serde", "sp-api", "sp-block-builder", "sp-blockchain", @@ -11414,26 +11129,24 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-std", "derive_more 0.99.14", "futures-util", - "hyper 0.13.9", + "hyper", "log", "prometheus", - "tokio 0.2.24", + "tokio 1.10.0", ] [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "async-trait", - "futures 0.1.30", "futures 0.3.16", - "hash-db", "hex", "parity-scale-codec", "sc-client-api", @@ -11457,7 +11170,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "futures 0.3.16", "substrate-test-utils-derive", @@ -11467,20 +11180,19 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "proc-macro-crate 1.0.0", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ "ansi_term 0.12.1", - "atty", "build-helper", "cargo_metadata", "sp-maybe-compressed-blob", @@ -11515,9 +11227,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", @@ -11532,7 +11244,7 @@ checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -11543,16 +11255,10 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", "unicode-xid 0.2.1", ] -[[package]] -name = "take_mut" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" - [[package]] name = "tap" version = "1.0.0" @@ -11614,7 +11320,7 @@ checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -11701,30 +11407,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "tokio" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "mio", - "num_cpus", - "tokio-codec", - "tokio-current-thread", - "tokio-executor", - "tokio-fs", - "tokio-io", - "tokio-reactor", - "tokio-sync", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", - "tokio-udp", - "tokio-uds", -] - [[package]] name = "tokio" version = "0.2.24" @@ -11733,12 +11415,10 @@ checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" dependencies = [ "bytes 0.5.6", "fnv", - "futures-core", "iovec", "lazy_static", "libc", - "memchr", - "mio", + "mio 0.6.23", "mio-uds", "num_cpus", "pin-project-lite 0.1.11", @@ -11750,76 +11430,18 @@ dependencies = [ [[package]] name = "tokio" -version = "1.6.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975" +checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b" dependencies = [ "autocfg 1.0.1", + "bytes 1.0.1", + "libc", + "memchr", + "mio 0.7.13", + "num_cpus", "pin-project-lite 0.2.4", -] - -[[package]] -name = "tokio-buf" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" -dependencies = [ - "bytes 0.4.12", - "either", - "futures 0.1.30", -] - -[[package]] -name = "tokio-codec" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "tokio-io", -] - -[[package]] -name = "tokio-current-thread" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" -dependencies = [ - "futures 0.1.30", - "tokio-executor", -] - -[[package]] -name = "tokio-executor" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.30", -] - -[[package]] -name = "tokio-fs" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" -dependencies = [ - "futures 0.1.30", - "tokio-io", - "tokio-threadpool", -] - -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "log", + "winapi 0.3.9", ] [[package]] @@ -11830,51 +11452,7 @@ checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", -] - -[[package]] -name = "tokio-named-pipes" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "mio", - "mio-named-pipes", - "tokio 0.1.22", -] - -[[package]] -name = "tokio-reactor" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.30", - "lazy_static", - "log", - "mio", - "num_cpus", - "parking_lot 0.9.0", - "slab", - "tokio-executor", - "tokio-io", - "tokio-sync", -] - -[[package]] -name = "tokio-rustls" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" -dependencies = [ - "futures-core", - "rustls 0.18.1", - "tokio 0.2.24", - "webpki", + "syn 1.0.74", ] [[package]] @@ -11884,104 +11462,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736" dependencies = [ "futures-core", - "rustls 0.19.1", + "rustls", "tokio 0.2.24", "webpki", ] [[package]] -name = "tokio-service" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" -dependencies = [ - "futures 0.1.30", -] - -[[package]] -name = "tokio-sync" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" -dependencies = [ - "fnv", - "futures 0.1.30", -] - -[[package]] -name = "tokio-tcp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "iovec", - "mio", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-threadpool" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" -dependencies = [ - "crossbeam-deque 0.7.3", - "crossbeam-queue", - "crossbeam-utils 0.7.2", - "futures 0.1.30", - "lazy_static", - "log", - "num_cpus", - "slab", - "tokio-executor", -] - -[[package]] -name = "tokio-timer" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.30", - "slab", - "tokio-executor", -] - -[[package]] -name = "tokio-udp" -version = "0.1.6" +name = "tokio-rustls" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "log", - "mio", - "tokio-codec", - "tokio-io", - "tokio-reactor", + "rustls", + "tokio 1.10.0", + "webpki", ] [[package]] -name = "tokio-uds" -version = "0.2.7" +name = "tokio-stream" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" +checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" dependencies = [ - "bytes 0.4.12", - "futures 0.1.30", - "iovec", - "libc", - "log", - "mio", - "mio-uds", - "tokio-codec", - "tokio-io", - "tokio-reactor", + "futures-core", + "pin-project-lite 0.2.4", + "tokio 1.10.0", ] [[package]] @@ -11999,6 +11504,20 @@ dependencies = [ "tokio 0.2.24", ] +[[package]] +name = "tokio-util" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.2.4", + "tokio 1.10.0", +] + [[package]] name = "toml" version = "0.5.8" @@ -12021,7 +11540,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" dependencies = [ "cfg-if 1.0.0", - "log", "pin-project-lite 0.2.4", "tracing-attributes", "tracing-core", @@ -12035,7 +11553,7 @@ checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", ] [[package]] @@ -12053,7 +11571,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.7", + "pin-project 1.0.8", "tracing", ] @@ -12080,9 +11598,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5" +checksum = "b9cbe87a2fa7e35900ce5de20220a582a9483a7063811defce79d7cbd59d4cfe" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -12189,22 +11707,17 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4" +source = "git+https://github.com/paritytech/substrate?branch=master#7e44628a345137872ac7be5f88a383f5c45329ea" dependencies = [ - "frame-try-runtime", "log", "parity-scale-codec", "remote-externalities", "sc-chain-spec", "sc-cli", - "sc-client-api", "sc-executor", "sc-service", "serde", - "sp-api", - "sp-blockchain", "sp-core", - "sp-externalities", "sp-keystore", "sp-runtime", "sp-state-machine", @@ -12218,7 +11731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" dependencies = [ "cfg-if 0.1.10", - "rand 0.7.3", + "rand 0.6.5", "static_assertions", ] @@ -12431,17 +11944,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "want" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -dependencies = [ - "futures 0.1.30", - "log", - "try-lock", -] - [[package]] name = "want" version = "0.3.0" @@ -12485,7 +11987,7 @@ dependencies = [ "log", "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", "wasm-bindgen-shared", ] @@ -12519,7 +12021,7 @@ checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -12601,7 +12103,7 @@ dependencies = [ "lazy_static", "libc", "log", - "paste", + "paste 1.0.4", "psm", "region", "rustc-demangle", @@ -12766,7 +12268,7 @@ dependencies = [ "libc", "log", "mach", - "memoffset 0.6.1", + "memoffset", "more-asserts", "rand 0.8.4", "region", @@ -12816,7 +12318,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -13058,18 +12560,19 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", + "xcm-procedural", ] [[package]] name = "xcm-builder" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "frame-support", "frame-system", @@ -13088,7 +12591,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#63a4d8b420b06f410c446120d136fc3ec0c46b6a" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -13102,6 +12605,16 @@ dependencies = [ "xcm", ] +[[package]] +name = "xcm-procedural" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=master#2b0d32a7b8cd3e61dc0555e5a2570a8f47cc171a" +dependencies = [ + "proc-macro2 1.0.28", + "quote 1.0.9", + "syn 1.0.74", +] + [[package]] name = "yamux" version = "0.9.0" @@ -13118,9 +12631,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" dependencies = [ "zeroize_derive", ] @@ -13133,7 +12646,7 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.73", + "syn 1.0.74", "synstructure", ] diff --git a/cumulus/polkadot-parachains/Cargo.toml b/cumulus/polkadot-parachains/Cargo.toml index f2f5339e9d4..1fc37782281 100644 --- a/cumulus/polkadot-parachains/Cargo.toml +++ b/cumulus/polkadot-parachains/Cargo.toml @@ -63,7 +63,7 @@ sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } # RPC related dependencies -jsonrpc-core = "15.1.0" +jsonrpc-core = "18.0.0" sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "master" } frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" } pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/cumulus/polkadot-parachains/rococo/src/lib.rs b/cumulus/polkadot-parachains/rococo/src/lib.rs index 0daab9df615..e1b0c53e155 100644 --- a/cumulus/polkadot-parachains/rococo/src/lib.rs +++ b/cumulus/polkadot-parachains/rococo/src/lib.rs @@ -370,7 +370,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecuteFilter = Everything; type XcmExecutor = XcmExecutor<XcmConfig>; type XcmTeleportFilter = Everything; - type XcmReserveTransferFilter = (); + type XcmReserveTransferFilter = frame_support::traits::Nothing; type Weigher = FixedWeightBounds<UnitWeightCost, Call>; type LocationInverter = LocationInverter<Ancestry>; } diff --git a/cumulus/polkadot-parachains/src/command.rs b/cumulus/polkadot-parachains/src/command.rs index 5432a4c33c6..d0aec70a083 100644 --- a/cumulus/polkadot-parachains/src/command.rs +++ b/cumulus/polkadot-parachains/src/command.rs @@ -583,10 +583,6 @@ impl CliConfiguration<Self> for RelayChainCli { self.base.base.rpc_cors(is_dev) } - fn telemetry_external_transport(&self) -> Result<Option<sc_service::config::ExtTransport>> { - self.base.base.telemetry_external_transport() - } - fn default_heap_pages(&self) -> Result<Option<u64>> { self.base.base.default_heap_pages() } diff --git a/cumulus/polkadot-parachains/src/service.rs b/cumulus/polkadot-parachains/src/service.rs index 8c51971002a..7a25bcb5a2e 100644 --- a/cumulus/polkadot-parachains/src/service.rs +++ b/cumulus/polkadot-parachains/src/service.rs @@ -27,6 +27,7 @@ use cumulus_primitives_core::{ relay_chain::v1::{Hash as PHash, PersistedValidationData}, ParaId, }; +use polkadot_service::NativeExecutionDispatch; use crate::rpc; pub use parachains_common::{AccountId, Balance, Block, Hash, Header, Index as Nonce}; @@ -38,8 +39,7 @@ use sc_consensus::{ import_queue::{BasicQueue, Verifier as VerifierT}, BlockImportParams, }; -use sc_executor::native_executor_instance; -pub use sc_executor::NativeExecutor; +use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; @@ -54,43 +54,80 @@ use sp_runtime::{ use std::sync::Arc; use substrate_prometheus_endpoint::Registry; -// Native executor instance. -native_executor_instance!( - pub RococoParachainRuntimeExecutor, - rococo_parachain_runtime::api::dispatch, - rococo_parachain_runtime::native_version, -); +/// Native executor instance. +pub struct RococoParachainRuntimeExecutor; -// Native executor instance. -native_executor_instance!( - pub ShellRuntimeExecutor, - shell_runtime::api::dispatch, - shell_runtime::native_version, -); +impl sc_executor::NativeExecutionDispatch for RococoParachainRuntimeExecutor { + type ExtendHostFunctions = (); + + fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> { + rococo_parachain_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + rococo_parachain_runtime::native_version() + } +} + +/// Native executor instance. +pub struct ShellRuntimeExecutor; + +impl sc_executor::NativeExecutionDispatch for ShellRuntimeExecutor { + type ExtendHostFunctions = (); + + fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> { + shell_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + shell_runtime::native_version() + } +} // Native Statemint executor instance. -native_executor_instance!( - pub StatemintRuntimeExecutor, - statemint_runtime::api::dispatch, - statemint_runtime::native_version, - frame_benchmarking::benchmarking::HostFunctions, -); - -// Native Statemine executor instance. -native_executor_instance!( - pub StatemineRuntimeExecutor, - statemine_runtime::api::dispatch, - statemine_runtime::native_version, - frame_benchmarking::benchmarking::HostFunctions, -); - -// Native Westmint executor instance. -native_executor_instance!( - pub WestmintRuntimeExecutor, - westmint_runtime::api::dispatch, - westmint_runtime::native_version, - frame_benchmarking::benchmarking::HostFunctions, -); +pub struct StatemintRuntimeExecutor; + +impl sc_executor::NativeExecutionDispatch for StatemintRuntimeExecutor { + type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + + fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> { + statemint_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + statemint_runtime::native_version() + } +} + +/// Native Statemine executor instance. +pub struct StatemineRuntimeExecutor; + +impl sc_executor::NativeExecutionDispatch for StatemineRuntimeExecutor { + type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + + fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> { + statemine_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + statemine_runtime::native_version() + } +} + +/// Native Westmint executor instance. +pub struct WestmintRuntimeExecutor; + +impl sc_executor::NativeExecutionDispatch for WestmintRuntimeExecutor { + type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + + fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> { + westmint_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + westmint_runtime::native_version() + } +} /// Starts a `ServiceBuilder` for a full service. /// @@ -101,17 +138,23 @@ pub fn new_partial<RuntimeApi, Executor, BIQ>( build_import_queue: BIQ, ) -> Result< PartialComponents< - TFullClient<Block, RuntimeApi, Executor>, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, TFullBackend<Block>, (), - sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>, - sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, Executor>>, + sc_consensus::DefaultImportQueue< + Block, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, + >, + sc_transaction_pool::FullPool< + Block, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, + >, (Option<Telemetry>, Option<TelemetryWorkerHandle>), >, sc_service::Error, > where - RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, Executor>> + RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>> + Send + Sync + 'static, @@ -124,14 +167,17 @@ where > + sp_offchain::OffchainWorkerApi<Block> + sp_block_builder::BlockBuilder<Block>, sc_client_api::StateBackendFor<TFullBackend<Block>, Block>: sp_api::StateBackend<BlakeTwo256>, - Executor: sc_executor::NativeExecutionDispatch + 'static, + Executor: NativeExecutionDispatch + 'static, BIQ: FnOnce( - Arc<TFullClient<Block, RuntimeApi, Executor>>, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, &Configuration, Option<TelemetryHandle>, &TaskManager, ) -> Result< - sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>, + sc_consensus::DefaultImportQueue< + Block, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, + >, sc_service::Error, >, { @@ -146,10 +192,17 @@ where }) .transpose()?; + let executor = sc_executor::NativeElseWasmExecutor::<Executor>::new( + config.wasm_method, + config.default_heap_pages, + config.max_runtime_instances, + ); + let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::<Block, RuntimeApi, Executor>( + sc_service::new_full_parts::<Block, RuntimeApi, _>( &config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + executor, )?; let client = Arc::new(client); @@ -200,9 +253,12 @@ async fn start_shell_node_impl<RuntimeApi, Executor, RB, BIQ, BIC>( rpc_ext_builder: RB, build_import_queue: BIQ, build_consensus: BIC, -) -> sc_service::error::Result<(TaskManager, Arc<TFullClient<Block, RuntimeApi, Executor>>)> +) -> sc_service::error::Result<( + TaskManager, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, +)> where - RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, Executor>> + RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>> + Send + Sync + 'static, @@ -218,26 +274,34 @@ where sc_client_api::StateBackendFor<TFullBackend<Block>, Block>: sp_api::StateBackend<BlakeTwo256>, Executor: sc_executor::NativeExecutionDispatch + 'static, RB: Fn( - Arc<TFullClient<Block, RuntimeApi, Executor>>, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, ) -> Result<jsonrpc_core::IoHandler<sc_rpc::Metadata>, sc_service::Error> + Send + 'static, BIQ: FnOnce( - Arc<TFullClient<Block, RuntimeApi, Executor>>, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, &Configuration, Option<TelemetryHandle>, &TaskManager, ) -> Result< - sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>, + sc_consensus::DefaultImportQueue< + Block, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, + >, sc_service::Error, >, BIC: FnOnce( - Arc<TFullClient<Block, RuntimeApi, Executor>>, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, Option<&Registry>, Option<TelemetryHandle>, &TaskManager, &polkadot_service::NewFull<polkadot_service::Client>, - Arc<sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, Executor>>>, + Arc< + sc_transaction_pool::FullPool< + Block, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, + >, + >, Arc<NetworkService<Block, Hash>>, SyncCryptoStorePtr, bool, @@ -365,9 +429,12 @@ async fn start_node_impl<RuntimeApi, Executor, RB, BIQ, BIC>( _rpc_ext_builder: RB, build_import_queue: BIQ, build_consensus: BIC, -) -> sc_service::error::Result<(TaskManager, Arc<TFullClient<Block, RuntimeApi, Executor>>)> +) -> sc_service::error::Result<( + TaskManager, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, +)> where - RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, Executor>> + RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>> + Send + Sync + 'static, @@ -390,21 +457,29 @@ where + Send + 'static, BIQ: FnOnce( - Arc<TFullClient<Block, RuntimeApi, Executor>>, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, &Configuration, Option<TelemetryHandle>, &TaskManager, ) -> Result< - sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>, + sc_consensus::DefaultImportQueue< + Block, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, + >, sc_service::Error, > + 'static, BIC: FnOnce( - Arc<TFullClient<Block, RuntimeApi, Executor>>, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, Option<&Registry>, Option<TelemetryHandle>, &TaskManager, &polkadot_service::NewFull<polkadot_service::Client>, - Arc<sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, Executor>>>, + Arc< + sc_transaction_pool::FullPool< + Block, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, + >, + >, Arc<NetworkService<Block, Hash>>, SyncCryptoStorePtr, bool, @@ -536,7 +611,11 @@ where /// Build the import queue for the rococo parachain runtime. pub fn rococo_parachain_build_import_queue( client: Arc< - TFullClient<Block, rococo_parachain_runtime::RuntimeApi, RococoParachainRuntimeExecutor>, + TFullClient< + Block, + rococo_parachain_runtime::RuntimeApi, + NativeElseWasmExecutor<RococoParachainRuntimeExecutor>, + >, >, config: &Configuration, telemetry: Option<TelemetryHandle>, @@ -544,7 +623,11 @@ pub fn rococo_parachain_build_import_queue( ) -> Result< sc_consensus::DefaultImportQueue< Block, - TFullClient<Block, rococo_parachain_runtime::RuntimeApi, RococoParachainRuntimeExecutor>, + TFullClient< + Block, + rococo_parachain_runtime::RuntimeApi, + NativeElseWasmExecutor<RococoParachainRuntimeExecutor>, + >, >, sc_service::Error, > { @@ -587,7 +670,13 @@ pub async fn start_rococo_parachain_node( id: ParaId, ) -> sc_service::error::Result<( TaskManager, - Arc<TFullClient<Block, rococo_parachain_runtime::RuntimeApi, RococoParachainRuntimeExecutor>>, + Arc< + TFullClient< + Block, + rococo_parachain_runtime::RuntimeApi, + NativeElseWasmExecutor<RococoParachainRuntimeExecutor>, + >, + >, )> { start_node_impl::<rococo_parachain_runtime::RuntimeApi, RococoParachainRuntimeExecutor, _, _, _>( parachain_config, @@ -677,14 +766,16 @@ pub async fn start_rococo_parachain_node( /// Build the import queue for the shell runtime. pub fn shell_build_import_queue( - client: Arc<TFullClient<Block, shell_runtime::RuntimeApi, ShellRuntimeExecutor>>, + client: Arc< + TFullClient<Block, shell_runtime::RuntimeApi, NativeElseWasmExecutor<ShellRuntimeExecutor>>, + >, config: &Configuration, _: Option<TelemetryHandle>, task_manager: &TaskManager, ) -> Result< sc_consensus::DefaultImportQueue< Block, - TFullClient<Block, shell_runtime::RuntimeApi, ShellRuntimeExecutor>, + TFullClient<Block, shell_runtime::RuntimeApi, NativeElseWasmExecutor<ShellRuntimeExecutor>>, >, sc_service::Error, > { @@ -705,9 +796,17 @@ pub async fn start_shell_node( id: ParaId, ) -> sc_service::error::Result<( TaskManager, - Arc<TFullClient<Block, shell_runtime::RuntimeApi, ShellRuntimeExecutor>>, + Arc< + TFullClient<Block, shell_runtime::RuntimeApi, NativeElseWasmExecutor<ShellRuntimeExecutor>>, + >, )> { - start_shell_node_impl::<shell_runtime::RuntimeApi, ShellRuntimeExecutor, _, _, _>( + start_shell_node_impl::< + shell_runtime::RuntimeApi, + ShellRuntimeExecutor, + _, + _, + _, + >( parachain_config, polkadot_config, id, @@ -879,16 +978,19 @@ where /// Build the import queue for the statemint/statemine/westmine runtime. pub fn statemint_build_import_queue<RuntimeApi, Executor>( - client: Arc<TFullClient<Block, RuntimeApi, Executor>>, + client: Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, config: &Configuration, telemetry_handle: Option<TelemetryHandle>, task_manager: &TaskManager, ) -> Result< - sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>, + sc_consensus::DefaultImportQueue< + Block, + TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>, + >, sc_service::Error, > where - RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, Executor>> + RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>> + Send + Sync + 'static, @@ -961,9 +1063,12 @@ pub async fn start_statemint_node<RuntimeApi, Executor>( parachain_config: Configuration, polkadot_config: Configuration, id: ParaId, -) -> sc_service::error::Result<(TaskManager, Arc<TFullClient<Block, RuntimeApi, Executor>>)> +) -> sc_service::error::Result<( + TaskManager, + Arc<TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>>, +)> where - RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, Executor>> + RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>> + Send + Sync + 'static, diff --git a/cumulus/test/client/src/lib.rs b/cumulus/test/client/src/lib.rs index 6d042392807..cbb0327fe96 100644 --- a/cumulus/test/client/src/lib.rs +++ b/cumulus/test/client/src/lib.rs @@ -17,7 +17,7 @@ //! A Cumulus test client. mod block_builder; -use codec::{Encode, Decode}; +use codec::{Decode, Encode}; use runtime::{ Balance, Block, BlockHashCount, Call, GenesisConfig, Runtime, Signature, SignedExtra, SignedPayload, UncheckedExtrinsic, VERSION, @@ -39,12 +39,20 @@ pub use substrate_test_client::*; pub type ParachainBlockData = cumulus_primitives_core::ParachainBlockData<Block>; mod local_executor { - use substrate_test_client::sc_executor::native_executor_instance; - native_executor_instance!( - pub LocalExecutor, - cumulus_test_runtime::api::dispatch, - cumulus_test_runtime::native_version, - ); + /// Native executor instance. + pub struct LocalExecutor; + + impl sc_executor::NativeExecutionDispatch for LocalExecutor { + type ExtendHostFunctions = (); + + fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> { + cumulus_test_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + cumulus_test_runtime::native_version() + } + } } /// Native executor used for tests. @@ -55,7 +63,7 @@ pub type Backend = substrate_test_client::Backend<Block>; /// Test client executor. pub type Executor = - client::LocalCallExecutor<Block, Backend, sc_executor::NativeExecutor<LocalExecutor>>; + client::LocalCallExecutor<Block, Backend, sc_executor::NativeElseWasmExecutor<LocalExecutor>>; /// Test client builder for Cumulus pub type TestClientBuilder = diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml index 164fbf16be5..29e1be80f44 100644 --- a/cumulus/test/service/Cargo.toml +++ b/cumulus/test/service/Cargo.toml @@ -57,7 +57,7 @@ cumulus-test-runtime = { path = "../runtime" } cumulus-test-relay-validation-worker-provider = { path = "../relay-validation-worker-provider" } # RPC related dependencies -jsonrpc-core = "15.1.0" +jsonrpc-core = "18.0.0" [dev-dependencies] futures = "0.3.5" diff --git a/cumulus/test/service/src/lib.rs b/cumulus/test/service/src/lib.rs index 07373538cfa..570f29ee27c 100644 --- a/cumulus/test/service/src/lib.rs +++ b/cumulus/test/service/src/lib.rs @@ -31,8 +31,6 @@ use cumulus_primitives_core::ParaId; use cumulus_test_runtime::{Hash, Header, NodeBlock as Block, RuntimeApi}; use polkadot_primitives::v1::{CollatorPair, Hash as PHash, PersistedValidationData}; use sc_client_api::execution_extensions::ExecutionStrategies; -use sc_executor::native_executor_instance; -pub use sc_executor::NativeExecutor; use sc_network::{config::TransportConfig, multiaddr, NetworkService}; use sc_service::{ config::{ @@ -78,15 +76,27 @@ impl ParachainConsensus<Block> for NullConsensus { /// The signature of the announce block fn. pub type AnnounceBlockFn = Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>; -// Native executor instance. -native_executor_instance!( - pub RuntimeExecutor, - cumulus_test_runtime::api::dispatch, - cumulus_test_runtime::native_version, -); +/// Native executor instance. +pub struct RuntimeExecutor; + +impl sc_executor::NativeExecutionDispatch for RuntimeExecutor { + type ExtendHostFunctions = (); + + fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> { + cumulus_test_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + cumulus_test_runtime::native_version() + } +} /// The client type being used by the test service. -pub type Client = TFullClient<runtime::NodeBlock, runtime::RuntimeApi, RuntimeExecutor>; +pub type Client = TFullClient< + runtime::NodeBlock, + runtime::RuntimeApi, + sc_executor::NativeElseWasmExecutor<RuntimeExecutor>, +>; /// Starts a `ServiceBuilder` for a full service. /// @@ -105,8 +115,14 @@ pub fn new_partial( >, sc_service::Error, > { + let executor = sc_executor::NativeElseWasmExecutor::<RuntimeExecutor>::new( + config.wasm_method, + config.default_heap_pages, + config.max_runtime_instances, + ); + let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::<Block, RuntimeApi, RuntimeExecutor>(&config, None)?; + sc_service::new_full_parts::<Block, RuntimeApi, _>(&config, None, executor)?; let client = Arc::new(client); let registry = config.prometheus_registry(); @@ -155,14 +171,12 @@ async fn start_node_impl<RB>( consensus: Consensus, ) -> sc_service::error::Result<( TaskManager, - Arc<TFullClient<Block, RuntimeApi, RuntimeExecutor>>, + Arc<Client>, Arc<NetworkService<Block, H256>>, RpcHandlers, )> where - RB: Fn( - Arc<TFullClient<Block, RuntimeApi, RuntimeExecutor>>, - ) -> Result<jsonrpc_core::IoHandler<sc_rpc::Metadata>, sc_service::Error> + RB: Fn(Arc<Client>) -> Result<jsonrpc_core::IoHandler<sc_rpc::Metadata>, sc_service::Error> + Send + 'static, { @@ -629,7 +643,6 @@ pub fn node_config( rpc_max_payload: None, prometheus_config: None, telemetry_endpoints: None, - telemetry_external_transport: None, default_heap_pages: None, offchain_worker: OffchainWorkerConfig { enabled: true, -- GitLab