From ea10fa823087e399f4093f0bbd884ea3ef355167 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 10 Dec 2020 16:28:02 +0300 Subject: [PATCH] Upgdate to latest polkadot & substrate (#263) * Upgdate to latest polkadot & substrate * Fix code formatting (cargo fmt) * Fix unit tests --- Cargo.lock | 995 ++++++++++--------- collator/src/lib.rs | 10 +- network/src/lib.rs | 4 +- network/src/tests.rs | 10 +- parachain-upgrade/src/lib.rs | 13 +- rococo-parachains/runtime/src/lib.rs | 55 +- runtime/src/validate_block/implementation.rs | 8 +- service/src/lib.rs | 6 +- test/runtime/src/lib.rs | 55 +- test/service/src/lib.rs | 1 + 10 files changed, 630 insertions(+), 527 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d5536fd98..5cb5548981 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7" +checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4" [[package]] name = "approx" @@ -176,7 +176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -206,9 +206,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d373d78ded7d0b3fa8039375718cde0aace493f2e34fb60f51cbf567562ca801" +checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146" dependencies = [ "async-task", "concurrent-queue", @@ -233,9 +233,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.1.10" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54bc4c1c7292475efb2253227dbcfad8fe1ca4c02bc62c510cc2f3da5c4704e" +checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd" dependencies = [ "concurrent-queue", "fastrand", @@ -261,16 +261,34 @@ dependencies = [ ] [[package]] -name = "async-std" -version = "1.7.0" +name = "async-process" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1" +checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda" dependencies = [ + "async-io", + "blocking", + "cfg-if 0.1.10", + "event-listener", + "futures-lite", + "once_cell", + "signal-hook", + "winapi 0.3.9", +] + +[[package]] +name = "async-std" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9f84f1280a2b436a2c77c2582602732b6c2f4321d5494d6e799e6c367859a8" +dependencies = [ + "async-channel", "async-global-executor", "async-io", "async-mutex", + "async-process", "blocking", - "crossbeam-utils 0.8.0", + "crossbeam-utils 0.8.1", "futures-channel", "futures-core", "futures-io", @@ -281,7 +299,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.1.11", + "pin-project-lite 0.2.0", "pin-utils", "slab", "wasm-bindgen-futures", @@ -295,15 +313,15 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-tls" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52" +checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400" dependencies = [ "futures-core", "futures-io", - "rustls", + "rustls 0.19.0", "webpki", - "webpki-roots 0.20.0", + "webpki-roots", ] [[package]] @@ -314,7 +332,7 @@ checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -357,9 +375,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.54" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28" +checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" dependencies = [ "addr2line", "cfg-if 1.0.0", @@ -614,9 +632,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.61" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" dependencies = [ "jobserver", ] @@ -713,15 +731,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "cloudabi" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467" -dependencies = [ - "bitflags", -] - [[package]] name = "concurrent-queue" version = "1.2.2" @@ -733,9 +742,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" +checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" [[package]] name = "constant_time_eq" @@ -765,6 +774,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + [[package]] name = "cranelift-bforest" version = "0.66.0" @@ -789,7 +804,7 @@ dependencies = [ "log", "regalloc", "serde", - "smallvec 1.5.0", + "smallvec 1.5.1", "target-lexicon", "thiserror", ] @@ -827,7 +842,7 @@ checksum = "2ef419efb4f94ecc02e5d9fbcc910d2bb7f0040e2de570e63a454f883bc891d6" dependencies = [ "cranelift-codegen", "log", - "smallvec 1.5.0", + "smallvec 1.5.1", "target-lexicon", ] @@ -873,7 +888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.0", + "crossbeam-utils 0.8.1", ] [[package]] @@ -894,8 +909,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.0", - "crossbeam-utils 0.8.0", + "crossbeam-epoch 0.9.1", + "crossbeam-utils 0.8.1", ] [[package]] @@ -909,21 +924,21 @@ dependencies = [ "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset", + "memoffset 0.5.6", "scopeguard 1.1.0", ] [[package]] name = "crossbeam-epoch" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f" +checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" dependencies = [ "cfg-if 1.0.0", "const_fn", - "crossbeam-utils 0.8.0", + "crossbeam-utils 0.8.1", "lazy_static", - "memoffset", + "memoffset 0.6.1", "scopeguard 1.1.0", ] @@ -951,13 +966,12 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" dependencies = [ "autocfg 1.0.1", "cfg-if 1.0.0", - "const_fn", "lazy_static", ] @@ -1335,7 +1349,7 @@ dependencies = [ "substrate-test-client", "substrate-test-runtime-client", "substrate-test-utils", - "tokio 0.2.22", + "tokio 0.2.24", ] [[package]] @@ -1392,7 +1406,7 @@ checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -1483,7 +1497,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -1547,7 +1561,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -1654,7 +1668,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", "synstructure", ] @@ -1753,15 +1767,25 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", ] +[[package]] +name = "form_urlencoded" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +dependencies = [ + "matches", + "percent-encoding 2.1.0", +] + [[package]] name = "frame-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -1779,7 +1803,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "chrono", "frame-benchmarking", @@ -1801,7 +1825,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -1817,7 +1841,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "serde", @@ -1828,7 +1852,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "bitflags", "frame-metadata", @@ -1839,7 +1863,7 @@ dependencies = [ "parity-scale-codec", "paste", "serde", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-arithmetic", "sp-core", "sp-inherents", @@ -1853,40 +1877,40 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1902,7 +1926,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sp-api", @@ -1910,9 +1934,9 @@ dependencies = [ [[package]] name = "fs-swap" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921d332c89b3b61a826de38c61ee5b6e02c56806cade1b0e5d81bd71f57a71bb" +checksum = "5839fda247e24ca4919c87c71dd5ca658f1f39e4f06829f80e3f15c3bafcfc2c" dependencies = [ "lazy_static", "libc", @@ -2047,7 +2071,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -2258,7 +2282,7 @@ dependencies = [ "http 0.2.1", "indexmap", "slab", - "tokio 0.2.22", + "tokio 0.2.24", "tokio-util", "tracing", "tracing-futures", @@ -2511,7 +2535,7 @@ dependencies = [ "itoa", "pin-project 1.0.2", "socket2", - "tokio 0.2.22", + "tokio 0.2.24", "tower-service", "tracing", "want 0.3.0", @@ -2528,9 +2552,9 @@ dependencies = [ "futures-util", "hyper 0.13.9", "log", - "rustls", + "rustls 0.18.1", "rustls-native-certs", - "tokio 0.2.22", + "tokio 0.2.24", "tokio-rustls", "webpki", ] @@ -2578,6 +2602,22 @@ dependencies = [ "libc", ] +[[package]] +name = "if-watch" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d7c5e361e6b05c882b4847dd98992534cebc6fcde7f4bc98225bcf10fd6d0d" +dependencies = [ + "async-io", + "futures 0.3.8", + "futures-lite", + "if-addrs", + "ipnet", + "libc", + "log", + "winapi 0.3.9", +] + [[package]] name = "impl-codec" version = "0.4.2" @@ -2604,7 +2644,7 @@ checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -2620,9 +2660,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" dependencies = [ "cfg-if 1.0.0", ] @@ -2702,9 +2742,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8" +checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" dependencies = [ "wasm-bindgen", ] @@ -2756,7 +2796,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -2849,8 +2889,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "frame-executive", @@ -2893,7 +2933,7 @@ dependencies = [ "rustc-hex", "serde", "serde_derive", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -2928,7 +2968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0315ef2f688e33844400b31f11c263f2b3dc21d8b9355c6891c5f185fae43f9a" dependencies = [ "parity-util-mem", - "smallvec 1.5.0", + "smallvec 1.5.1", ] [[package]] @@ -2957,7 +2997,7 @@ dependencies = [ "parking_lot 0.10.2", "regex", "rocksdb", - "smallvec 1.5.0", + "smallvec 1.5.1", ] [[package]] @@ -2980,9 +3020,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" +checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" [[package]] name = "libloading" @@ -3002,9 +3042,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.31.2" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "724846a3194368fefcac7ebdab12e01b8ac382e3efe399ddbd28851ab34f396f" +checksum = "022cdac4ab124be12de581e591796d4dfb7d1f1eef94669d2c1eaa0e98dd2f0e" dependencies = [ "atomic", "bytes 0.5.6", @@ -3034,7 +3074,7 @@ dependencies = [ "parity-multiaddr", "parking_lot 0.11.1", "pin-project 1.0.2", - "smallvec 1.5.0", + "smallvec 1.5.1", "wasm-timer", ] @@ -3066,7 +3106,7 @@ dependencies = [ "ring", "rw-stream-sink", "sha2 0.9.2", - "smallvec 1.5.0", + "smallvec 1.5.1", "thiserror", "unsigned-varint", "void", @@ -3080,7 +3120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156" dependencies = [ "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -3120,7 +3160,7 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "smallvec 1.5.0", + "smallvec 1.5.1", ] [[package]] @@ -3144,7 +3184,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "sha2 0.9.2", - "smallvec 1.5.0", + "smallvec 1.5.1", "unsigned-varint", "wasm-timer", ] @@ -3161,7 +3201,7 @@ dependencies = [ "log", "prost", "prost-build", - "smallvec 1.5.0", + "smallvec 1.5.1", "wasm-timer", ] @@ -3184,7 +3224,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "sha2 0.9.2", - "smallvec 1.5.0", + "smallvec 1.5.1", "uint", "unsigned-varint", "void", @@ -3193,24 +3233,23 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4458ec36b5ab2662fb4d5c8bb9b6e1591da0ab6efe8881c7a7670ef033bc8937" +checksum = "7b934ee03a361f317df7d75defa4177b285534c58f49d5e6e240278e13ef3f65" dependencies = [ - "async-std", + "async-io", "data-encoding", "dns-parser", - "either", "futures 0.3.8", + "if-watch", "lazy_static", "libp2p-core", "libp2p-swarm", "log", - "net2", "rand 0.7.3", - "smallvec 1.5.0", + "smallvec 1.5.1", + "socket2", "void", - "wasm-timer", ] [[package]] @@ -3227,7 +3266,7 @@ dependencies = [ "nohash-hasher", "parking_lot 0.11.1", "rand 0.7.3", - "smallvec 1.5.0", + "smallvec 1.5.1", "unsigned-varint", ] @@ -3301,9 +3340,9 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e952dcc9d2d7e7e45ae8bfcff255723091bd43e3e9a7741a0af8a17fe55b3ed" +checksum = "bd96c3580fe59a9379ac7906c2f61c7f5ad3b7515362af0e72153a7cc9a45550" dependencies = [ "async-trait", "bytes 0.5.6", @@ -3314,7 +3353,7 @@ dependencies = [ "lru", "minicbor", "rand 0.7.3", - "smallvec 1.5.0", + "smallvec 1.5.1", "unsigned-varint", "wasm-timer", ] @@ -3330,7 +3369,7 @@ dependencies = [ "libp2p-core", "log", "rand 0.7.3", - "smallvec 1.5.0", + "smallvec 1.5.1", "void", "wasm-timer", ] @@ -3379,9 +3418,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.26.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5736e2fccdcea6e728bbaf903bddc113be223313ce2c756ad9fe43b5a2b0f06" +checksum = "522a877ce42ededf1f5dd011dbc40ea116f1776818f09dacb3d7a206f3ad6305" dependencies = [ "async-tls", "either", @@ -3389,12 +3428,12 @@ dependencies = [ "libp2p-core", "log", "quicksink", - "rustls", + "rustls 0.19.0", "rw-stream-sink", "soketto", - "url 2.1.1", + "url 2.2.0", "webpki", - "webpki-roots 0.21.0", + "webpki-roots", ] [[package]] @@ -3495,9 +3534,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c" +checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" dependencies = [ "scopeguard 1.1.0", ] @@ -3535,9 +3574,9 @@ dependencies = [ [[package]] name = "lru_time_cache" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebac060fafad3adedd0c66a80741a92ff4bc8e94a273df2ba3770ab206f2e29a" +checksum = "2cc2beb26938dfd9988fc368548b70bcdfaf955f55aa788e1682198de794a451" [[package]] name = "mach" @@ -3571,9 +3610,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "matrixmultiply" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f" +checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" dependencies = [ "rawpointer", ] @@ -3609,6 +3648,15 @@ dependencies = [ "autocfg 1.0.1", ] +[[package]] +name = "memoffset" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +dependencies = [ + "autocfg 1.0.1", +] + [[package]] name = "memory-db" version = "0.24.1" @@ -3664,7 +3712,7 @@ checksum = "2e071b3159835ee91df62dbdbfdd7ec366b7ea77c838f43aff4acda6b61bcfb9" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -3679,9 +3727,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" dependencies = [ "cfg-if 0.1.10", "fuchsia-zircon", @@ -3690,7 +3738,7 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.1", + "miow 0.2.2", "net2", "slab", "winapi 0.2.8", @@ -3716,7 +3764,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", "mio", - "miow 0.3.5", + "miow 0.3.6", "winapi 0.3.9", ] @@ -3733,9 +3781,9 @@ dependencies = [ [[package]] name = "miow" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" dependencies = [ "kernel32-sys", "net2", @@ -3745,9 +3793,9 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ "socket2", "winapi 0.3.9", @@ -3761,9 +3809,9 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" [[package]] name = "multihash" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe" +checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" dependencies = [ "digest 0.9.0", "generic-array 0.14.4", @@ -3774,15 +3822,15 @@ dependencies = [ [[package]] name = "multihash-derive" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a" +checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f" dependencies = [ "proc-macro-crate", "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", "synstructure", ] @@ -3802,7 +3850,7 @@ dependencies = [ "futures 0.3.8", "log", "pin-project 1.0.2", - "smallvec 1.5.0", + "smallvec 1.5.1", "unsigned-varint", ] @@ -3845,9 +3893,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.35" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" dependencies = [ "cfg-if 0.1.10", "libc", @@ -4000,9 +4048,9 @@ checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" [[package]] name = "once_cell" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" dependencies = [ "parking_lot 0.11.1", ] @@ -4037,7 +4085,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4053,7 +4101,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4068,7 +4116,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4093,7 +4141,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4107,7 +4155,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4122,7 +4170,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4137,7 +4185,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4151,7 +4199,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4172,7 +4220,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4188,7 +4236,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4207,7 +4255,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4223,7 +4271,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4237,7 +4285,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4252,7 +4300,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4266,7 +4314,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4281,7 +4329,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4296,7 +4344,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4309,7 +4357,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "enumflags2", "frame-support", @@ -4324,7 +4372,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4339,7 +4387,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4359,7 +4407,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4373,7 +4421,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4393,18 +4441,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "pallet-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4418,7 +4466,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4435,14 +4483,14 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "serde", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-core", "sp-io", "sp-runtime", @@ -4452,7 +4500,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4470,7 +4518,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "parity-scale-codec", @@ -4483,7 +4531,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4497,7 +4545,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-support", "frame-system", @@ -4512,7 +4560,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "enumflags2", "frame-support", @@ -4563,7 +4611,7 @@ dependencies = [ "serde", "static_assertions", "unsigned-varint", - "url 2.1.1", + "url 2.2.0", ] [[package]] @@ -4588,7 +4636,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -4608,7 +4656,7 @@ dependencies = [ "libc", "log", "mio-named-pipes", - "miow 0.3.5", + "miow 0.3.6", "rand 0.7.3", "tokio 0.1.22", "tokio-named-pipes", @@ -4628,7 +4676,7 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.10.2", "primitive-types", - "smallvec 1.5.0", + "smallvec 1.5.1", "winapi 0.3.9", ] @@ -4639,7 +4687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.24", - "syn 1.0.48", + "syn 1.0.54", "synstructure", ] @@ -4673,7 +4721,7 @@ dependencies = [ "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.1.1", + "url 2.2.0", ] [[package]] @@ -4720,8 +4768,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.1", - "parking_lot_core 0.8.0", + "lock_api 0.4.2", + "parking_lot_core 0.8.1", ] [[package]] @@ -4744,7 +4792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" dependencies = [ "cfg-if 0.1.10", - "cloudabi 0.0.3", + "cloudabi", "libc", "redox_syscall", "rustc_version", @@ -4759,25 +4807,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" dependencies = [ "cfg-if 0.1.10", - "cloudabi 0.0.3", + "cloudabi", "libc", "redox_syscall", - "smallvec 1.5.0", + "smallvec 1.5.1", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" +checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0" dependencies = [ - "cfg-if 0.1.10", - "cloudabi 0.1.0", + "cfg-if 1.0.0", "instant", "libc", "redox_syscall", - "smallvec 1.5.0", + "smallvec 1.5.1", "winapi 0.3.9", ] @@ -4872,7 +4919,7 @@ dependencies = [ "pest_meta", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -4922,7 +4969,7 @@ checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -4933,7 +4980,7 @@ checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -4969,7 +5016,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "parity-scale-codec", @@ -4984,7 +5031,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "parity-scale-codec", @@ -5002,8 +5049,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "frame-benchmarking-cli", "log", @@ -5023,7 +5070,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "polkadot-node-network-protocol", @@ -5038,7 +5085,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.7.30" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "parity-scale-codec", "sp-core", @@ -5048,8 +5095,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -5062,7 +5109,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "async-trait", "futures 0.3.8", @@ -5079,7 +5126,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "polkadot-erasure-coding", @@ -5096,7 +5143,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -5117,7 +5164,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "futures 0.3.8", @@ -5136,7 +5183,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "polkadot-node-subsystem", @@ -5152,7 +5199,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-selection" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "polkadot-node-subsystem", @@ -5167,7 +5214,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "parity-scale-codec", @@ -5184,7 +5231,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "polkadot-node-subsystem", @@ -5198,7 +5245,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-proposer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -5222,7 +5269,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "futures 0.3.8", @@ -5238,7 +5285,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "polkadot-node-subsystem", @@ -5253,7 +5300,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -5264,7 +5311,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "parity-scale-codec", @@ -5277,7 +5324,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "async-trait", "derive_more 0.99.11", @@ -5290,7 +5337,7 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-core", "substrate-prometheus-endpoint", "thiserror", @@ -5301,7 +5348,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "async-trait", "futures 0.3.8", @@ -5315,7 +5362,7 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-core", "tracing", "tracing-futures", @@ -5324,7 +5371,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "async-trait", "futures 0.3.8", @@ -5348,7 +5395,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "async-trait", "futures 0.3.8", @@ -5365,8 +5412,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "derive_more 0.99.11", "futures 0.3.8", @@ -5389,7 +5436,7 @@ dependencies = [ [[package]] name = "polkadot-pov-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "polkadot-node-network-protocol", @@ -5403,8 +5450,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "frame-system", @@ -5428,8 +5475,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "jsonrpc-core", "pallet-transaction-payment-rpc", @@ -5458,8 +5505,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "frame-executive", @@ -5500,7 +5547,7 @@ dependencies = [ "rustc-hex", "serde", "serde_derive", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -5521,8 +5568,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "frame-support", @@ -5557,7 +5604,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.8.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "derive_more 0.99.11", @@ -5593,7 +5640,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.8.3" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "frame-benchmarking", "frame-system-rpc-runtime-api", @@ -5670,7 +5717,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "arrayvec 0.5.2", "futures 0.3.8", @@ -5687,8 +5734,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -5697,8 +5744,8 @@ dependencies = [ [[package]] name = "polkadot-test-client" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -5721,8 +5768,8 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "frame-executive", @@ -5755,7 +5802,7 @@ dependencies = [ "rustc-hex", "serde", "serde_derive", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -5775,8 +5822,8 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "frame-benchmarking", "frame-system", @@ -5827,8 +5874,8 @@ dependencies = [ [[package]] name = "polkadot-validation" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "futures 0.3.8", "log", @@ -5868,20 +5915,21 @@ dependencies = [ [[package]] name = "poly1305" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce46de8e53ee414ca4d02bfefac75d8c12fba948b76622a40b4be34dfce980" +checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8" dependencies = [ + "cpuid-bool 0.2.0", "universal-hash", ] [[package]] name = "polyval" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5884790f1ce3553ad55fec37b5aaac5882e0e845a2612df744d6c85c9bf046c" +checksum = "b4fd92d8e0c06d08525d2e2643cc2b5c80c69ae8eb12c18272d501cd7079ccc0" dependencies = [ - "cfg-if 0.1.10", + "cpuid-bool 0.2.0", "universal-hash", ] @@ -5919,9 +5967,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8" +checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809" dependencies = [ "fixed-hash", "impl-codec", @@ -5947,7 +5995,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", "version_check", ] @@ -6044,7 +6092,7 @@ dependencies = [ "itertools 0.8.2", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -6268,7 +6316,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" dependencies = [ - "cloudabi 0.0.3", + "cloudabi", "fuchsia-cprng", "libc", "rand_core 0.4.2", @@ -6341,7 +6389,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.0", + "crossbeam-utils 0.8.1", "lazy_static", "num_cpus", ] @@ -6378,7 +6426,7 @@ version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a415a013dd7c5d4221382329a5a3482566da675737494935cbbbcdec04662f9d" dependencies = [ - "smallvec 1.5.0", + "smallvec 1.5.1", ] [[package]] @@ -6398,7 +6446,7 @@ checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -6409,7 +6457,7 @@ checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8" dependencies = [ "log", "rustc-hash", - "smallvec 1.5.0", + "smallvec 1.5.1", ] [[package]] @@ -6469,9 +6517,9 @@ checksum = "e005d658ad26eacc2b6c506dfde519f4e277e328d0eb3379ca61647d70a8f531" [[package]] name = "ring" -version = "0.16.15" +version = "0.16.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4" +checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226" dependencies = [ "cc", "libc", @@ -6552,7 +6600,7 @@ dependencies = [ "substrate-build-script-utils", "substrate-test-client", "substrate-test-runtime-client", - "tokio 0.2.22", + "tokio 0.2.24", "trie-root 0.15.2", ] @@ -6566,8 +6614,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "frame-executive", "frame-support", @@ -6595,7 +6643,7 @@ dependencies = [ "polkadot-runtime-parachains", "serde", "serde_derive", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -6625,14 +6673,14 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.7.2", + "crossbeam-utils 0.8.1", ] [[package]] @@ -6681,6 +6729,19 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" +dependencies = [ + "base64 0.13.0", + "log", + "ring", + "sct", + "webpki", +] + [[package]] name = "rustls-native-certs" version = "0.4.0" @@ -6688,7 +6749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8" dependencies = [ "openssl-probe", - "rustls", + "rustls 0.18.1", "schannel", "security-framework", ] @@ -6740,7 +6801,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "async-trait", "derive_more 0.99.11", @@ -6768,7 +6829,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6791,7 +6852,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6808,7 +6869,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6829,18 +6890,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "sc-cli" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "atty", "chrono", @@ -6874,7 +6935,7 @@ dependencies = [ "structopt", "thiserror", "tiny-bip39", - "tokio 0.2.22", + "tokio 0.2.24", "tracing", "tracing-log", "tracing-subscriber", @@ -6883,18 +6944,18 @@ dependencies = [ [[package]] name = "sc-cli-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "fnv", @@ -6928,7 +6989,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "blake2-rfc", "hash-db", @@ -6958,7 +7019,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6969,7 +7030,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "fork-tree", @@ -7014,7 +7075,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "futures 0.3.8", @@ -7038,7 +7099,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7051,7 +7112,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7077,7 +7138,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "log", "sc-client-api", @@ -7091,7 +7152,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "lazy_static", @@ -7120,7 +7181,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "parity-scale-codec", @@ -7136,7 +7197,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "log", "parity-scale-codec", @@ -7151,7 +7212,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "log", "parity-scale-codec", @@ -7169,7 +7230,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "finality-grandpa", @@ -7206,7 +7267,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "finality-grandpa", @@ -7230,7 +7291,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "ansi_term 0.12.1", "futures 0.3.8", @@ -7248,7 +7309,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "async-trait", "derive_more 0.99.11", @@ -7268,7 +7329,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "hash-db", "lazy_static", @@ -7287,7 +7348,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "async-std", "async-trait", @@ -7323,7 +7384,7 @@ dependencies = [ "serde_json", "slog", "slog_derive", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -7341,7 +7402,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7356,7 +7417,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "bytes 0.5.6", "fnv", @@ -7383,7 +7444,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "libp2p", @@ -7396,7 +7457,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7405,7 +7466,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "hash-db", @@ -7439,7 +7500,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "futures 0.3.8", @@ -7463,7 +7524,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.1.30", "jsonrpc-core", @@ -7481,7 +7542,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "directories 3.0.1", "exit-future 0.2.0", @@ -7545,7 +7606,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "log", "parity-scale-codec", @@ -7560,7 +7621,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7580,7 +7641,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7601,7 +7662,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "ansi_term 0.12.1", "erased-serde", @@ -7625,7 +7686,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "futures 0.3.8", @@ -7647,7 +7708,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "futures-diagnose", @@ -7693,6 +7754,7 @@ dependencies = [ "merlin", "rand 0.7.3", "rand_core 0.5.1", + "serde", "sha2 0.8.2", "subtle 2.3.0", "zeroize", @@ -7733,7 +7795,7 @@ checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -7824,29 +7886,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "serde_json" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" +checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" dependencies = [ "itoa", "ryu", @@ -7873,7 +7935,7 @@ checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpuid-bool", + "cpuid-bool 0.1.2", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -7898,7 +7960,7 @@ checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpuid-bool", + "cpuid-bool 0.1.2", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -7961,6 +8023,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +[[package]] +name = "signal-hook" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.2.2" @@ -7996,9 +8068,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "slog" -version = "2.5.2" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc9c640a4adbfbcc11ffb95efe5aa7af7309e002adab54b185507dbf2377b99" +checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" dependencies = [ "erased-serde", ] @@ -8035,7 +8107,7 @@ checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -8049,9 +8121,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85" +checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75" [[package]] name = "snow" @@ -8073,11 +8145,11 @@ dependencies = [ [[package]] name = "socket2" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" +checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi 0.3.9", @@ -8102,7 +8174,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "log", "sp-core", @@ -8114,7 +8186,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "hash-db", "parity-scale-codec", @@ -8130,19 +8202,19 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "blake2-rfc", "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "serde", @@ -8154,7 +8226,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "integer-sqrt", "num-traits 0.2.14", @@ -8167,7 +8239,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sp-api", @@ -8179,7 +8251,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8190,7 +8262,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sp-api", @@ -8202,7 +8274,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "log", @@ -8220,7 +8292,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "serde", "serde_json", @@ -8229,7 +8301,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -8255,7 +8327,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#1ec8a7f57ba5faac74c09296eab9977fb331c386" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sp-api", @@ -8269,7 +8341,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "merlin", "parity-scale-codec", @@ -8289,7 +8361,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8298,7 +8370,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8310,7 +8382,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "base58", "blake2-rfc", @@ -8354,7 +8426,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -8363,17 +8435,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "sp-externalities" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "environmental", "parity-scale-codec", @@ -8384,7 +8456,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "finality-grandpa", "log", @@ -8401,7 +8473,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", @@ -8413,7 +8485,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "hash-db", @@ -8437,7 +8509,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "lazy_static", "sp-core", @@ -8448,7 +8520,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "async-trait", "derive_more 0.99.11", @@ -8457,6 +8529,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "schnorrkel", + "serde", "sp-core", "sp-externalities", ] @@ -8464,7 +8537,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "serde", @@ -8476,18 +8549,18 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "sp-api", "sp-core", @@ -8497,7 +8570,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "backtrace", ] @@ -8505,7 +8578,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "serde", "sp-core", @@ -8514,7 +8587,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "either", "hash256-std-hasher", @@ -8535,8 +8608,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ + "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", "sp-externalities", @@ -8551,19 +8625,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "serde", "serde_json", @@ -8572,7 +8646,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sp-api", @@ -8585,7 +8659,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8595,7 +8669,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "hash-db", "log", @@ -8603,7 +8677,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "rand 0.7.3", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-core", "sp-externalities", "sp-panic-handler", @@ -8617,12 +8691,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8635,7 +8709,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "log", "sp-core", @@ -8648,7 +8722,7 @@ dependencies = [ [[package]] name = "sp-test-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#1ec8a7f57ba5faac74c09296eab9977fb331c386" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -8661,7 +8735,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8675,7 +8749,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "log", "parity-scale-codec", @@ -8688,7 +8762,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "derive_more 0.99.11", "futures 0.3.8", @@ -8704,7 +8778,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "hash-db", "memory-db", @@ -8718,7 +8792,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "futures-core", @@ -8730,7 +8804,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8742,7 +8816,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8835,7 +8909,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -8856,7 +8930,7 @@ dependencies = [ "heck", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -8875,7 +8949,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "platforms", ] @@ -8883,7 +8957,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.8", @@ -8906,7 +8980,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "async-std", "derive_more 0.99.11", @@ -8914,13 +8988,13 @@ dependencies = [ "hyper 0.13.9", "log", "prometheus", - "tokio 0.2.22", + "tokio 0.2.24", ] [[package]] name = "substrate-test-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#39278096356942a087213b0f21c976ac100cb8f8" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.1.30", "futures 0.3.8", @@ -8947,7 +9021,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#1ec8a7f57ba5faac74c09296eab9977fb331c386" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "cfg-if 0.1.10", "frame-executive", @@ -8989,7 +9063,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#1ec8a7f57ba5faac74c09296eab9977fb331c386" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "parity-scale-codec", @@ -9010,21 +9084,21 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#1ec8a7f57ba5faac74c09296eab9977fb331c386" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "futures 0.3.8", "substrate-test-utils-derive", - "tokio 0.2.22", + "tokio 0.2.24", ] [[package]] name = "substrate-test-utils-derive" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#1ec8a7f57ba5faac74c09296eab9977fb331c386" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "proc-macro-crate", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -9046,7 +9120,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#1ec8a7f57ba5faac74c09296eab9977fb331c386" +source = "git+https://github.com/paritytech/substrate?branch=master#12823277857d73e8b9e520930783996c227099a6" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9083,9 +9157,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.48" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" +checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -9100,7 +9174,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", "unicode-xid 0.2.1", ] @@ -9132,9 +9206,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -9176,7 +9250,7 @@ checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -9237,9 +9311,18 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" +checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" @@ -9267,9 +9350,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" +checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" dependencies = [ "bytes 0.5.6", "fnv", @@ -9354,13 +9437,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -9402,8 +9485,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", - "rustls", - "tokio 0.2.22", + "rustls 0.18.1", + "tokio 0.2.24", "webpki", ] @@ -9513,7 +9596,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.11", - "tokio 0.2.22", + "tokio 0.2.24", ] [[package]] @@ -9552,7 +9635,7 @@ checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", ] [[package]] @@ -9609,7 +9692,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.5.0", + "smallvec 1.5.1", "thread_local", "tracing", "tracing-core", @@ -9633,7 +9716,7 @@ dependencies = [ "hashbrown 0.8.2", "log", "rustc-hex", - "smallvec 1.5.0", + "smallvec 1.5.1", ] [[package]] @@ -9715,18 +9798,18 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" [[package]] name = "unicode-width" @@ -9787,10 +9870,11 @@ dependencies = [ [[package]] name = "url" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ + "form_urlencoded", "idna 0.2.0", "matches", "percent-encoding 2.1.0", @@ -9887,36 +9971,36 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" +checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68" +checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" dependencies = [ "bumpalo", "lazy_static", "log", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da" +checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", @@ -9924,9 +10008,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038" +checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" dependencies = [ "quote 1.0.7", "wasm-bindgen-macro-support", @@ -9934,22 +10018,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" +checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" +checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" [[package]] name = "wasm-gc-api" @@ -10026,7 +10110,7 @@ dependencies = [ "log", "region", "rustc-demangle", - "smallvec 1.5.0", + "smallvec 1.5.1", "target-lexicon", "wasmparser 0.59.0", "wasmtime-environ", @@ -10159,7 +10243,7 @@ dependencies = [ "lazy_static", "libc", "log", - "memoffset", + "memoffset 0.5.6", "more-asserts", "region", "thiserror", @@ -10169,27 +10253,27 @@ dependencies = [ [[package]] name = "wast" -version = "26.0.1" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3f174eed73e885ede6c8fcc3fbea8c3757afa521840676496cde56bb742ddab" +checksum = "9c0586061bfacc035034672c8d760802b428ab4c80a92e2a392425c516df9be1" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.27" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b2dccbce4d0e14875091846e110a2369267b18ddd0d6423479b88dad914d71" +checksum = "c06d55b5ec4f9d9396fa99abaafa0688597395e57827dffd89731412ae90c9bf" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d" +checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" dependencies = [ "js-sys", "wasm-bindgen", @@ -10197,23 +10281,14 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ "ring", "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.21.0" @@ -10234,8 +10309,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.8.26" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +version = "0.8.27" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "bitvec", "frame-executive", @@ -10280,7 +10355,7 @@ dependencies = [ "rustc-hex", "serde", "serde_derive", - "smallvec 1.5.0", + "smallvec 1.5.1", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -10375,7 +10450,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.8.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#d72570266223d2ace38a777cad785b63b7fc485b" +source = "git+https://github.com/paritytech/polkadot?branch=master#381cae23063f7fe6c5264e02e7a2bf79d6270eaa" dependencies = [ "parity-scale-codec", ] @@ -10396,9 +10471,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a" +checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" dependencies = [ "zeroize_derive", ] @@ -10411,7 +10486,7 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", + "syn 1.0.54", "synstructure", ] diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 4d5ddd1f4d..7708b131d1 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -72,7 +72,9 @@ pub struct Collator { polkadot_client: Arc, } -impl Clone for Collator { +impl Clone + for Collator +{ fn clone(&self) -> Self { Self { para_id: self.para_id.clone(), @@ -88,7 +90,8 @@ impl Clone for Collator Collator +impl + Collator where Block: BlockT, PF: Environment + 'static + Send, @@ -144,8 +147,7 @@ where /// /// Returns `None` in case of an error. fn retrieve_dmq_contents(&self, relay_parent: PHash) -> Option { - self - .polkadot_client + self.polkadot_client .runtime_api() .dmq_contents_with_context( &BlockId::hash(relay_parent), diff --git a/network/src/lib.rs b/network/src/lib.rs index 40fe2ae1f8..aabefb43c3 100644 --- a/network/src/lib.rs +++ b/network/src/lib.rs @@ -54,7 +54,7 @@ use futures::{ }; use log::trace; -use std::{marker::PhantomData, pin::Pin, sync::Arc, fmt}; +use std::{fmt, marker::PhantomData, pin::Pin, sync::Arc}; use wait_on_relay_chain_block::WaitOnRelayChainBlock; @@ -62,7 +62,7 @@ type BoxedError = Box; #[derive(Debug)] struct BlockAnnounceError(String); -impl std::error::Error for BlockAnnounceError { } +impl std::error::Error for BlockAnnounceError {} impl fmt::Display for BlockAnnounceError { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { diff --git a/network/src/tests.rs b/network/src/tests.rs index 17b62de2a1..6816eb70ec 100644 --- a/network/src/tests.rs +++ b/network/src/tests.rs @@ -19,11 +19,11 @@ use cumulus_test_service::runtime::{Block, Header}; use futures::{executor::block_on, poll, task::Poll}; use polkadot_node_primitives::{SignedFullStatement, Statement}; use polkadot_primitives::v1::{ - Block as PBlock, BlockNumber, CandidateCommitments, CandidateDescriptor, - CandidateEvent, CommittedCandidateReceipt, CoreState, GroupRotationInfo, Hash as PHash, - HeadData, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption, - ParachainHost, PersistedValidationData, SessionIndex, SigningContext, ValidationCode, - ValidationData, ValidatorId, ValidatorIndex, SessionInfo, + Block as PBlock, BlockNumber, CandidateCommitments, CandidateDescriptor, CandidateEvent, + CommittedCandidateReceipt, CoreState, GroupRotationInfo, Hash as PHash, HeadData, Id as ParaId, + InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption, ParachainHost, + PersistedValidationData, SessionIndex, SessionInfo, SigningContext, ValidationCode, + ValidationData, ValidatorId, ValidatorIndex, }; use polkadot_test_client::{ Client as PClient, ClientBlockImportExt, DefaultTestClientBuilderExt, FullBackend as PBackend, diff --git a/parachain-upgrade/src/lib.rs b/parachain-upgrade/src/lib.rs index a798a1eff4..447a912ab0 100644 --- a/parachain-upgrade/src/lib.rs +++ b/parachain-upgrade/src/lib.rs @@ -263,14 +263,12 @@ mod tests { dispatch::UnfilteredDispatchable, impl_outer_event, impl_outer_origin, parameter_types, traits::{OnFinalize, OnInitialize}, - weights::Weight, }; use frame_system::{InitKind, RawOrigin}; use sp_core::H256; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, IdentityLookup}, - Perbill, }; use sp_version::RuntimeVersion; @@ -296,9 +294,6 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u64 = 250; - pub const MaximumBlockWeight: Weight = 1024; - pub const MaximumBlockLength: u32 = 2 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); pub Version: RuntimeVersion = RuntimeVersion { spec_name: sp_version::create_runtime_str!("test"), impl_name: sp_version::create_runtime_str!("system-test"), @@ -321,18 +316,14 @@ mod tests { type Header = Header; type Event = TestEvent; type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; + type BlockLength = (); + type BlockWeights = (); type Version = Version; type PalletInfo = (); type AccountData = (); type OnNewAccount = (); type OnKilledAccount = (); type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); type BaseCallFilter = (); type SystemWeightInfo = (); } diff --git a/rococo-parachains/runtime/src/lib.rs b/rococo-parachains/runtime/src/lib.rs index 1664c850a1..8096795ca0 100644 --- a/rococo-parachains/runtime/src/lib.rs +++ b/rococo-parachains/runtime/src/lib.rs @@ -27,7 +27,7 @@ use sp_api::impl_runtime_apis; use sp_core::OpaqueMetadata; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, - traits::{BlakeTwo256, Block as BlockT, IdentityLookup, Saturating}, + traits::{BlakeTwo256, Block as BlockT, IdentityLookup}, transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, }; @@ -40,9 +40,13 @@ use sp_version::RuntimeVersion; pub use frame_support::{ construct_runtime, parameter_types, traits::Randomness, - weights::{constants::WEIGHT_PER_SECOND, IdentityFee, Weight}, + weights::{ + constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + DispatchClass, IdentityFee, Weight, + }, StorageValue, }; +use frame_system::limits::{BlockLength, BlockWeights}; pub use pallet_balances::Call as BalancesCall; pub use pallet_timestamp::Call as TimestampCall; #[cfg(any(feature = "std", test))] @@ -95,16 +99,38 @@ pub fn native_version() -> NativeVersion { } } +/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers. +/// This is used to limit the maximal weight of a single extrinsic. +const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); +/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used +/// by Operational extrinsics. +const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); +/// We allow for 2 seconds of compute with a 6 second average block time. +const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND; + parameter_types! { pub const BlockHashCount: BlockNumber = 250; - pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND; - /// Assume 10% of weight for average on_initialize calls. - pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get() - .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get(); - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); - pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; pub const Version: RuntimeVersion = VERSION; - pub const ExtrinsicBaseWeight: Weight = 10_000_000; + pub RuntimeBlockLength: BlockLength = + BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO); + pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder() + .base_block(BlockExecutionWeight::get()) + .for_class(DispatchClass::all(), |weights| { + weights.base_extrinsic = ExtrinsicBaseWeight::get(); + }) + .for_class(DispatchClass::Normal, |weights| { + weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT); + }) + .for_class(DispatchClass::Operational, |weights| { + weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT); + // Operational transactions have some extra reserved space, so that they + // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`. + weights.reserved = Some( + MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT + ); + }) + .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) + .build_or_panic(); } impl frame_system::Config for Runtime { @@ -130,12 +156,6 @@ impl frame_system::Config for Runtime { type Origin = Origin; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = BlockHashCount; - /// Maximum weight of each block. With a default weight system of 1byte == 1weight, 4mb is ok. - type MaximumBlockWeight = MaximumBlockWeight; - /// Maximum size of all encoded transactions (in bytes) that are allowed in one block. - type MaximumBlockLength = MaximumBlockLength; - /// Portion of the block weight that is available to all normal transactions. - type AvailableBlockRatio = AvailableBlockRatio; /// Runtime version. type Version = Version; /// Converts a module to an index of this module in the runtime. @@ -144,11 +164,10 @@ impl frame_system::Config for Runtime { type OnNewAccount = (); type OnKilledAccount = (); type DbWeight = (); - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type BlockExecutionWeight = (); - type MaximumExtrinsicWeight = MaximumExtrinsicWeight; type BaseCallFilter = (); type SystemWeightInfo = (); + type BlockWeights = RuntimeBlockWeights; + type BlockLength = RuntimeBlockLength; } parameter_types! { diff --git a/runtime/src/validate_block/implementation.rs b/runtime/src/validate_block/implementation.rs index 3a9f81d3ff..f0adcc1f78 100644 --- a/runtime/src/validate_block/implementation.rs +++ b/runtime/src/validate_block/implementation.rs @@ -263,8 +263,8 @@ impl<'a, B: BlockT> Externalities for WitnessExt<'a, B> { self.inner.place_child_storage(child_info, key, value) } - fn kill_child_storage(&mut self, child_info: &ChildInfo) { - self.inner.kill_child_storage(child_info) + fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option) -> bool { + self.inner.kill_child_storage(child_info, limit) } fn clear_prefix(&mut self, prefix: &[u8]) { @@ -450,9 +450,9 @@ fn host_default_child_storage_clear(storage_key: &[u8], key: &[u8]) { with_externalities(|ext| ext.place_child_storage(&child_info, key.to_vec(), None)) } -fn host_default_child_storage_storage_kill(storage_key: &[u8]) { +fn host_default_child_storage_storage_kill(storage_key: &[u8], limit: Option) -> bool { let child_info = ChildInfo::new_default(storage_key); - with_externalities(|ext| ext.kill_child_storage(&child_info)) + with_externalities(|ext| ext.kill_child_storage(&child_info, limit)) } fn host_default_child_storage_exists(storage_key: &[u8], key: &[u8]) -> bool { diff --git a/service/src/lib.rs b/service/src/lib.rs index 39086e4262..61d69831dc 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -301,10 +301,6 @@ pub fn build_polkadot_full_node( if is_light { Err("Light client not supported.".into()) } else { - polkadot_service::build_full( - config, - polkadot_service::IsCollator::Yes(collator_id), - None, - ) + polkadot_service::build_full(config, polkadot_service::IsCollator::Yes(collator_id), None) } } diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs index 0e7bb52667..ce8f4b74f3 100644 --- a/test/runtime/src/lib.rs +++ b/test/runtime/src/lib.rs @@ -26,7 +26,7 @@ use sp_api::{decl_runtime_apis, impl_runtime_apis}; use sp_core::OpaqueMetadata; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, - traits::{BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, Saturating, Verify}, + traits::{BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, Verify}, transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, MultiSignature, }; @@ -39,9 +39,13 @@ use sp_version::RuntimeVersion; pub use frame_support::{ construct_runtime, parameter_types, traits::Randomness, - weights::{constants::WEIGHT_PER_SECOND, IdentityFee, Weight}, + weights::{ + constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + DispatchClass, IdentityFee, Weight, + }, StorageValue, }; +use frame_system::limits::{BlockLength, BlockWeights}; pub use pallet_balances::Call as BalancesCall; pub use pallet_timestamp::Call as TimestampCall; #[cfg(any(feature = "std", test))] @@ -88,16 +92,38 @@ pub fn native_version() -> NativeVersion { } } +/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers. +/// This is used to limit the maximal weight of a single extrinsic. +const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); +/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used +/// by Operational extrinsics. +const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); +/// We allow for 2 seconds of compute with a 6 second average block time. +const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND; + parameter_types! { pub const BlockHashCount: BlockNumber = 250; - pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND; - /// Assume 10% of weight for average on_initialize calls. - pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get() - .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get(); - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); - pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; pub const Version: RuntimeVersion = VERSION; - pub const ExtrinsicBaseWeight: Weight = 10_000_000; + pub RuntimeBlockLength: BlockLength = + BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO); + pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder() + .base_block(BlockExecutionWeight::get()) + .for_class(DispatchClass::all(), |weights| { + weights.base_extrinsic = ExtrinsicBaseWeight::get(); + }) + .for_class(DispatchClass::Normal, |weights| { + weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT); + }) + .for_class(DispatchClass::Operational, |weights| { + weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT); + // Operational transactions have some extra reserved space, so that they + // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`. + weights.reserved = Some( + MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT + ); + }) + .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) + .build_or_panic(); } impl frame_system::Config for Runtime { @@ -123,12 +149,6 @@ impl frame_system::Config for Runtime { type Origin = Origin; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = BlockHashCount; - /// Maximum weight of each block. With a default weight system of 1byte == 1weight, 4mb is ok. - type MaximumBlockWeight = MaximumBlockWeight; - /// Maximum size of all encoded transactions (in bytes) that are allowed in one block. - type MaximumBlockLength = MaximumBlockLength; - /// Portion of the block weight that is available to all normal transactions. - type AvailableBlockRatio = AvailableBlockRatio; /// Runtime version. type Version = Version; type PalletInfo = PalletInfo; @@ -136,11 +156,10 @@ impl frame_system::Config for Runtime { type OnNewAccount = (); type OnKilledAccount = (); type DbWeight = (); - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type BlockExecutionWeight = (); - type MaximumExtrinsicWeight = MaximumExtrinsicWeight; type BaseCallFilter = (); type SystemWeightInfo = (); + type BlockWeights = RuntimeBlockWeights; + type BlockLength = RuntimeBlockLength; } parameter_types! { diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs index 34c970325b..ffde9bf944 100644 --- a/test/service/src/lib.rs +++ b/test/service/src/lib.rs @@ -382,6 +382,7 @@ pub fn node_config( transaction_pool: Default::default(), network: network_config, keystore: KeystoreConfig::InMemory, + keystore_remote: Default::default(), database: DatabaseConfig::RocksDb { path: root.join("db"), cache_size: 128,