diff --git a/Cargo.lock b/Cargo.lock index 217ab21a8847..85708c2e6105 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "adler32" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" [[package]] name = "ahash" @@ -51,7 +51,7 @@ checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" dependencies = [ "approx", "num-complex", - "num-traits 0.2.11", + "num-traits 0.2.12", ] [[package]] @@ -84,14 +84,14 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" dependencies = [ - "num-traits 0.2.11", + "num-traits 0.2.12", ] [[package]] name = "arc-swap" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62" +checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" [[package]] name = "arrayref" @@ -129,8 +129,8 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ - "quote 1.0.6", - "syn 1.0.27", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -226,14 +226,15 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" [[package]] name = "backtrace" -version = "0.3.48" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df2f85c8a2abbe3b7d7e748052fdd9b76a0458fdeb16ad4223f5eca78c7c130" +checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" dependencies = [ "addr2line", "cfg-if", "libc", - "object 0.19.0", + "miniz_oxide", + "object 0.20.0", "rustc-demangle", ] @@ -251,9 +252,9 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42" +checksum = "e223af0dc48c96d4f8342ec01a4974f139df863896b316681efd36742f22cc67" [[package]] name = "bincode" @@ -281,8 +282,8 @@ dependencies = [ "lazycell", "log 0.4.8", "peeking_take_while", - "proc-macro2 1.0.17", - "quote 1.0.6", + "proc-macro2 1.0.18", + "quote 1.0.7", "regex", "rustc-hash", "shlex", @@ -407,9 +408,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5356f1d23ee24a1f785a56d1d1a5f0fd5b0f6a0c0fb2412ce11da71649ab78f6" +checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" [[package]] name = "byte-slice-cast" @@ -493,7 +494,7 @@ checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" dependencies = [ "js-sys", "num-integer", - "num-traits 0.2.11", + "num-traits 0.2.12", "time", "wasm-bindgen", ] @@ -526,9 +527,9 @@ dependencies = [ [[package]] name = "clear_on_drop" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" +checksum = "c9cc5db465b294c3fa986d5bbb0f3017cd850bff6dd6c52f9ccff8b4d21b7b08" dependencies = [ "cc", ] @@ -743,12 +744,13 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ "cfg-if", "crossbeam-utils", + "maybe-uninit", ] [[package]] @@ -789,14 +791,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839" +checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" dependencies = [ "byteorder", "digest", "rand_core 0.5.1", - "subtle 2.2.2", + "subtle 2.2.3", "zeroize", ] @@ -834,13 +836,13 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.7" +version = "0.99.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2127768764f1556535c01b5326ef94bd60ff08dcfbdc544d53e69ed155610f5d" +checksum = "bc655351f820d774679da6cdc23355a93de496867d8203496675162e17b1d671" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -870,11 +872,10 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ - "cfg-if", "libc", "redox_users", "winapi 0.3.8", @@ -958,9 +959,9 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -984,9 +985,9 @@ checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4" [[package]] name = "erased-serde" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88b6d1705e16a4d62e05ea61cc0496c2bd190f4fa8e5c1f11ce747be6bcf3d1" +checksum = "6ca8b296792113e1500fd935ae487be6e00ce318952a6880555554824d6ebf38" dependencies = [ "serde", ] @@ -1064,9 +1065,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "synstructure", ] @@ -1126,7 +1127,7 @@ dependencies = [ "futures 0.3.5", "futures-timer 2.0.2", "log 0.4.8", - "num-traits 0.2.11", + "num-traits 0.2.12", "parity-scale-codec", "parking_lot 0.9.0", ] @@ -1171,7 +1172,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", ] @@ -1179,7 +1180,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -1196,7 +1197,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1214,7 +1215,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -1229,7 +1230,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "serde", @@ -1240,7 +1241,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "bitmask", "frame-metadata", @@ -1265,40 +1266,40 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support-procedural-tools", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "frame-system" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1314,7 +1315,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -1328,7 +1329,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sp-api", @@ -1477,9 +1478,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -1743,9 +1744,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71" +checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" dependencies = [ "libc", ] @@ -1768,9 +1769,9 @@ dependencies = [ [[package]] name = "hex-literal-impl" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4c5c844e2fee0bf673d54c2c177f1713b3d2af2ff6e666b49cb7572e6cf42d" +checksum = "853f769599eb31de176303197b7ba4973299c38c7a7604a6bc88c3eef05b9b46" dependencies = [ "proc-macro-hack", ] @@ -1887,9 +1888,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96816e1d921eca64d208a85aab4f7798455a8e34229ee5a88c935bdee1b78b14" +checksum = "a6e7655b9594024ad0ee439f3b5a7299369dc2a3f459b47c696f9ff676f9aa1f" dependencies = [ "bytes 0.5.4", "futures-channel", @@ -1901,8 +1902,8 @@ dependencies = [ "httparse", "itoa", "log 0.4.8", - "net2", "pin-project", + "socket2", "time", "tokio 0.2.21", "tower-service", @@ -1918,7 +1919,7 @@ dependencies = [ "bytes 0.5.4", "ct-logs", "futures-util", - "hyper 0.13.5", + "hyper 0.13.6", "log 0.4.8", "rustls", "rustls-native-certs", @@ -1982,16 +1983,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "indexmap" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" +checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" dependencies = [ "autocfg 1.0.0", ] @@ -2053,9 +2054,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" +checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" [[package]] name = "jemalloc-sys" @@ -2089,9 +2090,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.39" +version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5a448de267e7358beaf4a5d849518fe9a0c13fce7afd44b06e68550e5562a7" +checksum = "ce10c23ad2ea25ceca0093bd3192229da4c5b3c0f2de499c1ecac0d98d452177" dependencies = [ "wasm-bindgen", ] @@ -2141,9 +2142,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fadf6945e227246825a583514534d864554e9f23d80b3c77d034b10983db5ef" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -2401,9 +2402,9 @@ checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" [[package]] name = "libflate" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fbe6b967a94346446d37ace319ae85be7eca261bb8149325811ac435d35d64" +checksum = "784f4ec5908a9d7f4e53658906386667e8b02e9389a47cfebf45d324ba9e8d25" dependencies = [ "adler32", "crc32fast", @@ -2504,8 +2505,8 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f09548626b737ed64080fde595e06ce1117795b8b9fc4d2629fa36561c583171" dependencies = [ - "quote 1.0.6", - "syn 1.0.27", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -2739,7 +2740,7 @@ dependencies = [ "hmac-drbg", "rand 0.7.3", "sha2", - "subtle 2.2.2", + "subtle 2.2.3", "typenum", ] @@ -2810,18 +2811,18 @@ dependencies = [ [[package]] name = "lru" -version = "0.4.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e488db3a9e108382265a30764f43cfc87517322e5d04ae0603b32a33461dca3" +checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237" dependencies = [ "hashbrown", ] [[package]] name = "mach" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" dependencies = [ "libc", ] @@ -2913,9 +2914,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" +checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" dependencies = [ "adler32", ] @@ -3049,7 +3050,7 @@ dependencies = [ "matrixmultiply", "num-complex", "num-rational", - "num-traits 0.2.11", + "num-traits 0.2.12", "rand 0.6.5", "typenum", ] @@ -3084,7 +3085,7 @@ dependencies = [ "byteorder", "enum-primitive-derive", "libc", - "num-traits 0.2.11", + "num-traits 0.2.12", "thiserror", ] @@ -3129,9 +3130,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "5.1.1" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "memchr", "version_check", @@ -3154,7 +3155,7 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ "autocfg 1.0.0", "num-integer", - "num-traits 0.2.11", + "num-traits 0.2.12", ] [[package]] @@ -3164,17 +3165,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ "autocfg 1.0.0", - "num-traits 0.2.11", + "num-traits 0.2.12", ] [[package]] name = "num-integer" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" +checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" dependencies = [ "autocfg 1.0.0", - "num-traits 0.2.11", + "num-traits 0.2.12", ] [[package]] @@ -3186,7 +3187,7 @@ dependencies = [ "autocfg 1.0.0", "num-bigint", "num-integer", - "num-traits 0.2.11", + "num-traits 0.2.12", ] [[package]] @@ -3195,14 +3196,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.11", + "num-traits 0.2.12", ] [[package]] name = "num-traits" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" dependencies = [ "autocfg 1.0.0", "libm", @@ -3229,9 +3230,9 @@ dependencies = [ [[package]] name = "object" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" +checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" [[package]] name = "once_cell" @@ -3266,7 +3267,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3282,7 +3283,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3297,7 +3298,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3319,7 +3320,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3333,7 +3334,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3349,7 +3350,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3364,7 +3365,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3379,7 +3380,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3395,7 +3396,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3415,7 +3416,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3431,7 +3432,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3451,7 +3452,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3467,7 +3468,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3481,7 +3482,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3496,7 +3497,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3510,7 +3511,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3525,7 +3526,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3546,7 +3547,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3561,7 +3562,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3574,7 +3575,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "enumflags2", "frame-support", @@ -3589,7 +3590,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3604,7 +3605,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3624,7 +3625,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3638,7 +3639,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3652,7 +3653,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3674,18 +3675,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "pallet-sudo" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", @@ -3699,7 +3700,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3717,12 +3718,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "frame-system", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", + "serde", "smallvec 1.4.0", "sp-runtime", "sp-std", @@ -3731,7 +3733,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3749,7 +3751,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-support", "parity-scale-codec", @@ -3762,7 +3764,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3777,7 +3779,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-benchmarking", "frame-support", @@ -3793,7 +3795,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3890,9 +3892,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a0ec292e92e8ec7c58e576adacc1e3f399c597c8f263c42f18420abe58e7245" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -3942,8 +3944,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ - "proc-macro2 1.0.17", - "syn 1.0.27", + "proc-macro2 1.0.18", + "syn 1.0.31", "synstructure", ] @@ -4005,9 +4007,9 @@ dependencies = [ [[package]] name = "paste" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431e8f72b90f8a7af91dec890d9814000cb371258e0ec7370d93e085361f531" +checksum = "026c63fe245362be0322bfec5a9656d458d13f9cfb1785d1b38458b9968e8080" dependencies = [ "paste-impl", "proc-macro-hack", @@ -4015,14 +4017,11 @@ dependencies = [ [[package]] name = "paste-impl" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af5fc872ba284d8d84608bf8a0fa9b5376c96c23f503b007dfd9e34dde5606" +checksum = "7b9281a268ec213237dcd2aa3c3d0f46681b04ced37c1616fd36567a9e6954b0" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", ] [[package]] @@ -4071,29 +4070,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.17" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791" +checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.17" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58db2081ba5b4c93bd6be09c40fd36cb9193a8336c384f3b40012e531aa7e40" +checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "pin-project-lite" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7505eeebd78492e0f6108f7171c4948dbb120ee8119d9d77d0afa5469bef67f" +checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715" [[package]] name = "pin-utils" @@ -4137,7 +4136,7 @@ dependencies = [ name = "polkadot-availability-store" version = "0.8.10" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "exit-future", "futures 0.3.5", "kvdb", @@ -4299,7 +4298,7 @@ dependencies = [ name = "polkadot-parachain" version = "0.8.10" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", @@ -4456,6 +4455,7 @@ dependencies = [ "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", + "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", "parity-scale-codec", @@ -4836,9 +4836,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "version_check", ] @@ -4848,9 +4848,9 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "syn-mid", "version_check", ] @@ -4863,9 +4863,9 @@ checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" [[package]] name = "proc-macro-nested" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" +checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" @@ -4878,9 +4878,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101" +checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" dependencies = [ "unicode-xid 0.2.0", ] @@ -4950,9 +4950,9 @@ checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" dependencies = [ "anyhow", "itertools 0.8.2", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -5005,11 +5005,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2 1.0.17", + "proc-macro2 1.0.18", ] [[package]] @@ -5231,10 +5231,11 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" +checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" dependencies = [ + "autocfg 1.0.0", "crossbeam-deque", "either", "rayon-core", @@ -5242,9 +5243,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" +checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" dependencies = [ "crossbeam-deque", "crossbeam-queue", @@ -5290,22 +5291,22 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a214c7875e1b63fc1618db7c80efc0954f6156c9ff07699fd9039e255accdd1" +checksum = "745c1787167ddae5569661d5ffb8b25ae5fedbf46717eaa92d652221cec72623" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eb59cda66fcb9aec25841fb76bc01d2b34282dcdd705028da297db6f3eec8" +checksum = "7d21b475ab879ef0e315ad99067fa25778c3b0377f57f1b00207448dac1a3144" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -5321,9 +5322,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.7" +version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" dependencies = [ "aho-corasick", "memchr", @@ -5333,15 +5334,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.17" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" +checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" [[package]] name = "region" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "448e868c6e4cfddfa49b6a72c95906c04e8547465e9536575b95c70a4044f856" +checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" dependencies = [ "bitflags", "libc", @@ -5351,18 +5352,18 @@ dependencies = [ [[package]] name = "remove_dir_all" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ "winapi 0.3.8", ] [[package]] name = "ring" -version = "0.16.13" +version = "0.16.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703516ae74571f24b465b4a1431e81e2ad51336cb0ded733a55a1aa3eccac196" +checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4" dependencies = [ "cc", "libc", @@ -5482,9 +5483,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "safe-mix" @@ -5498,10 +5499,10 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "bytes 0.5.4", - "derive_more 0.99.7", + "derive_more 0.99.8", "futures 0.3.5", "futures-timer 3.0.2", "libp2p", @@ -5525,7 +5526,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5549,7 +5550,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5565,7 +5566,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5581,23 +5582,23 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "sc-cli" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "ansi_term 0.12.1", "atty", "chrono", - "derive_more 0.99.7", + "derive_more 0.99.8", "env_logger", "fdlimit", "futures 0.3.5", @@ -5632,9 +5633,9 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "fnv", "futures 0.3.5", "hash-db", @@ -5668,7 +5669,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "blake2-rfc", "hash-db", @@ -5697,7 +5698,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5708,9 +5709,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "fork-tree", "futures 0.3.5", "futures-timer 3.0.2", @@ -5718,7 +5719,7 @@ dependencies = [ "merlin", "num-bigint", "num-rational", - "num-traits 0.2.11", + "num-traits 0.2.12", "parity-scale-codec", "parking_lot 0.10.2", "pdqselect", @@ -5750,9 +5751,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "futures 0.3.5", "jsonrpc-core", "jsonrpc-core-client", @@ -5773,7 +5774,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5786,7 +5787,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5808,7 +5809,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "log 0.4.8", "sc-client-api", @@ -5822,9 +5823,9 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "lazy_static", "libsecp256k1", "log 0.4.8", @@ -5850,9 +5851,9 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "log 0.4.8", "parity-scale-codec", "parity-wasm", @@ -5867,7 +5868,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5882,7 +5883,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5903,10 +5904,10 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "assert_matches", - "derive_more 0.99.7", + "derive_more 0.99.8", "finality-grandpa", "fork-tree", "futures 0.3.5", @@ -5941,9 +5942,9 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "finality-grandpa", "futures 0.3.5", "jsonrpc-core", @@ -5958,7 +5959,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -5977,22 +5978,22 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "hex", "parking_lot 0.10.2", "rand 0.7.3", "serde_json", "sp-application-crypto", "sp-core", - "subtle 2.2.2", + "subtle 2.2.3", ] [[package]] name = "sc-light" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "hash-db", "lazy_static", @@ -6011,12 +6012,12 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "bitflags", "bs58", "bytes 0.5.4", - "derive_more 0.99.7", + "derive_more 0.99.8", "either", "erased-serde", "fnv", @@ -6063,7 +6064,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6078,7 +6079,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "env_logger", "futures 0.3.5", @@ -6105,13 +6106,13 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "bytes 0.5.4", "fnv", "futures 0.3.5", "futures-timer 3.0.2", - "hyper 0.13.5", + "hyper 0.13.6", "hyper-rustls", "log 0.4.8", "num_cpus", @@ -6132,7 +6133,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "libp2p", @@ -6145,7 +6146,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6154,7 +6155,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "hash-db", @@ -6186,9 +6187,9 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "futures 0.3.5", "jsonrpc-core", "jsonrpc-core-client", @@ -6210,7 +6211,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6226,9 +6227,9 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "directories", "exit-future", "futures 0.1.29", @@ -6289,7 +6290,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6303,7 +6304,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "bytes 0.5.4", "futures 0.3.5", @@ -6325,7 +6326,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "erased-serde", "log 0.4.8", @@ -6340,9 +6341,9 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "futures 0.3.5", "linked-hash-map", "log 0.4.8", @@ -6360,9 +6361,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "futures 0.3.5", "futures-diagnose", "intervalier", @@ -6407,7 +6408,7 @@ dependencies = [ "rand 0.7.3", "rand_core 0.5.1", "sha2", - "subtle 2.2.2", + "subtle 2.2.3", "zeroize", ] @@ -6438,9 +6439,9 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -6511,29 +6512,29 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.110" +version = "1.0.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e7b308464d16b56eba9964e4972a3eee817760ab60d88c3f86e1fecb08204c" +checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.110" +version = "1.0.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984" +checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "serde_json" -version = "1.0.53" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2" +checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" dependencies = [ "itoa", "ryu", @@ -6674,9 +6675,9 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -6708,7 +6709,7 @@ dependencies = [ "ring", "rustc_version", "sha2", - "subtle 2.2.2", + "subtle 2.2.3", "x25519-dalek", ] @@ -6747,9 +6748,9 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "log 0.4.8", "sp-core", "sp-std", @@ -6759,7 +6760,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "hash-db", "parity-scale-codec", @@ -6774,19 +6775,19 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "blake2-rfc", "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "sp-application-crypto" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "serde", @@ -6798,10 +6799,10 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "integer-sqrt", - "num-traits 0.2.11", + "num-traits 0.2.12", "parity-scale-codec", "serde", "sp-debug-derive", @@ -6811,7 +6812,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sp-api", @@ -6823,7 +6824,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6834,7 +6835,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sp-api", @@ -6846,9 +6847,9 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "log 0.4.8", "lru", "parity-scale-codec", @@ -6862,7 +6863,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "serde", "serde_json", @@ -6871,9 +6872,9 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "futures 0.3.5", "futures-timer 3.0.2", "libp2p", @@ -6894,7 +6895,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sp-api", @@ -6908,7 +6909,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "merlin", "parity-scale-codec", @@ -6925,7 +6926,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6937,12 +6938,12 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "base58", "blake2-rfc", "byteorder", - "derive_more 0.99.7", + "derive_more 0.99.8", "ed25519-dalek", "futures 0.3.5", "hash-db", @@ -6953,7 +6954,7 @@ dependencies = [ "libsecp256k1", "log 0.4.8", "merlin", - "num-traits 0.2.11", + "num-traits 0.2.12", "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", @@ -6979,7 +6980,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6988,17 +6989,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "sp-externalities" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "environmental", "parity-scale-codec", @@ -7009,7 +7010,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7025,7 +7026,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7035,9 +7036,9 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "parity-scale-codec", "parking_lot 0.10.2", "sp-core", @@ -7047,7 +7048,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "hash-db", @@ -7067,7 +7068,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "lazy_static", "sp-core", @@ -7078,7 +7079,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "serde", @@ -7090,18 +7091,18 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "sp-offchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "sp-api", "sp-core", @@ -7111,7 +7112,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "backtrace", "log 0.4.8", @@ -7120,7 +7121,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "serde", "sp-core", @@ -7129,7 +7130,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "either", "hash256-std-hasher", @@ -7151,7 +7152,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7166,19 +7167,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "Inflector", "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "sp-serializer" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "serde", "serde_json", @@ -7187,7 +7188,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sp-api", @@ -7200,7 +7201,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7210,11 +7211,11 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "hash-db", "log 0.4.8", - "num-traits 0.2.11", + "num-traits 0.2.12", "parity-scale-codec", "parking_lot 0.10.2", "rand 0.7.3", @@ -7229,12 +7230,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" [[package]] name = "sp-storage" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7246,7 +7247,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7260,7 +7261,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "tracing", ] @@ -7268,9 +7269,9 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ - "derive_more 0.99.7", + "derive_more 0.99.8", "futures 0.3.5", "log 0.4.8", "parity-scale-codec", @@ -7284,7 +7285,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "hash-db", "memory-db", @@ -7298,7 +7299,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "futures-core", @@ -7310,7 +7311,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7322,7 +7323,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7395,9 +7396,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef" +checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" dependencies = [ "clap", "lazy_static", @@ -7406,15 +7407,15 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a" +checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -7433,9 +7434,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" dependencies = [ "heck", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -7453,7 +7454,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "chrono", "clear_on_drop", @@ -7480,7 +7481,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "platforms", ] @@ -7488,7 +7489,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7511,12 +7512,12 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "async-std", - "derive_more 0.99.7", + "derive_more 0.99.8", "futures-util", - "hyper 0.13.5", + "hyper 0.13.6", "log 0.4.8", "prometheus", "tokio 0.2.21", @@ -7525,7 +7526,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "hash-db", @@ -7547,7 +7548,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "cfg-if", "frame-executive", @@ -7587,7 +7588,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7608,7 +7609,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#17be6fd5e5dec2b358dbffa9ce07e4bc1d3e01e2" +source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" [[package]] name = "substrate-wasm-builder-runner" @@ -7713,9 +7714,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941" +checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" [[package]] name = "syn" @@ -7741,12 +7742,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.27" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef781e621ee763a2a40721a8861ec519cb76966aee03bb5d00adb6a31dc1c1de" +checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", + "proc-macro2 1.0.18", + "quote 1.0.7", "unicode-xid 0.2.0", ] @@ -7756,9 +7757,9 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -7772,13 +7773,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "unicode-xid 0.2.0", ] @@ -7912,22 +7913,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13f926965ad00595dd129fa12823b04bbf866e9085ab0a5f2b05b850fbfc344" +checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479" +checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -7992,6 +7993,12 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinyvec" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" + [[package]] name = "tokio" version = "0.1.22" @@ -8294,9 +8301,9 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c6b59d116d218cb2d990eb06b77b64043e0268ef7323aae63d8b30ae462923" +checksum = "a41f40ed0e162c911ac6fcb53ecdc8134c46905fdbbae8c50add462a538b495f" dependencies = [ "cfg-if", "tracing-attributes", @@ -8309,9 +8316,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -8404,11 +8411,11 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" dependencies = [ - "smallvec 1.4.0", + "tinyvec", ] [[package]] @@ -8483,9 +8490,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" +checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" [[package]] name = "vec_map" @@ -8543,9 +8550,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasm-bindgen" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c7d40d09cdbf0f4895ae58cf57d92e1e57a9dd8ed2e8390514b54a47cc5551" +checksum = "4c2dc4aa152834bc334f506c1a06b866416a8b6697d5c9f75b9a689c8486def0" dependencies = [ "cfg-if", "serde", @@ -8555,24 +8562,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3972e137ebf830900db522d6c8fd74d1900dcfc733462e9a12e942b00b4ac94" +checksum = "ded84f06e0ed21499f6184df0e0cb3494727b0c5da89534e0fcc55c51d812101" dependencies = [ "bumpalo", "lazy_static", "log 0.4.8", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a369c5e1dfb7569e14d62af4da642a3cbc2f9a3652fe586e26ac22222aa4b04" +checksum = "64487204d863f109eb77e8462189d111f27cb5712cc9fdb3461297a76963a2f6" dependencies = [ "cfg-if", "js-sys", @@ -8582,32 +8589,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd85aa2c579e8892442954685f0d801f9129de24fa2136b2c6a539c76b65776" +checksum = "838e423688dac18d73e31edce74ddfac468e37b1506ad163ffaf0a46f703ffe3" dependencies = [ - "quote 1.0.6", + "quote 1.0.7", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb197bd3a47553334907ffd2f16507b4f4f01bbec3ac921a7719e0decdfe72a" +checksum = "3156052d8ec77142051a533cdd686cba889537b213f948cd1d20869926e68e92" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91c2916119c17a8e316507afaaa2dd94b47646048014bbdf6bef098c1bb58ad" +checksum = "c9ba19973a58daf4db6f352eda73dc0e289493cd29fb2632eb172085b6521acd" [[package]] name = "wasm-timer" @@ -8634,7 +8641,7 @@ dependencies = [ "libc", "memory_units", "num-rational", - "num-traits 0.2.11", + "num-traits 0.2.12", "parity-wasm", "wasmi-validation", ] @@ -8683,7 +8690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed54fd9d64dfeeee7c285fd126174a6b5e6d4efc7e5a1566fdb635e60ff6a74e" dependencies = [ "anyhow", - "base64 0.12.1", + "base64 0.12.2", "bincode", "cranelift-codegen", "cranelift-entity", @@ -8707,27 +8714,27 @@ dependencies = [ [[package]] name = "wast" -version = "17.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0e1c36b928fca33dbaf96235188f5fad22ee87100e26cc606bd0fbabdf1932" +checksum = "01b1f23531740a81f9300bd2febd397a95c76bfa4aa4bfaf4ca8b1ee3438f337" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b50f9e5e5c81e6fd987ae6997a9f4bbb751df2dec1d8cadb0b5778f1ec13bbe" +checksum = "4006d418d59293172aebfeeadb7673459dc151874a79135946ea7996b6a98515" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.39" +version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bc359e5dd3b46cb9687a051d50a2fdd228e4ba7cf6fcf861a5365c3d671a642" +checksum = "7b72fe77fd39e4bd3eaa4412fd299a0be6b3dfe9d2597e2f1c20beb968f41d17" dependencies = [ "js-sys", "wasm-bindgen", @@ -8735,9 +8742,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef" +checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae" dependencies = [ "ring", "untrusted", @@ -8932,9 +8939,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84300bb493cc878f3638b981c62b4632ec1a5c52daaa3036651e8c106d3b55ea" +checksum = "35897c31eee7767d5c787e3475f4c0c62a2efa6067e0ffdf6ebc755c850532ae" dependencies = [ "futures 0.3.5", "log 0.4.8", @@ -8959,26 +8966,26 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "synstructure", ] [[package]] name = "zstd" -version = "0.5.2+zstd.1.4.5" +version = "0.5.3+zstd.1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644352b10ce7f333d6e0af85bd4f5322dc449416dc1211c6308e95bca8923db4" +checksum = "01b32eaf771efa709e8308605bbf9319bf485dc1503179ec0469b611937c0cd8" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "2.0.4+zstd.1.4.5" +version = "2.0.5+zstd.1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7113c0c9aed2c55181f2d9f5b0a36e7d2c0183b11c058ab40b35987479efe4d7" +checksum = "1cfb642e0d27f64729a639c52db457e0ae906e7bc6f5fe8f5c453230400f1055" dependencies = [ "libc", "zstd-sys", @@ -8986,9 +8993,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.16+zstd.1.4.5" +version = "1.4.17+zstd.1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c442965efc45353be5a9b9969c9b0872fff6828c7e06d118dda2cb2d0bb11d5a" +checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b" dependencies = [ "cc", "glob", diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index ecdcabf22141..1a1186f59286 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -31,6 +31,7 @@ system = { package = "frame-system", git = "https://github.com/paritytech/substr timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -76,6 +77,7 @@ std = [ "system/std", "timestamp/std", "vesting/std", + "transaction-payment/std", ] runtime-benchmarks = [ "libsecp256k1/hmac", diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index 8562a376c170..543e2c739adb 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -16,10 +16,9 @@ //! Auxillary struct/enums for polkadot runtime. -use sp_runtime::traits::{Convert, Saturating}; -use sp_runtime::{FixedPointNumber, FixedI128, Perquintill}; -use frame_support::traits::{OnUnbalanced, Imbalance, Currency, Get}; -use crate::{MaximumBlockWeight, NegativeImbalance}; +use sp_runtime::traits::Convert; +use frame_support::traits::{OnUnbalanced, Imbalance, Currency}; +use crate::NegativeImbalance; /// Logic for the author to get a portion of fees. pub struct ToAuthor(sp_std::marker::PhantomData); @@ -72,55 +71,3 @@ where { fn convert(x: u128) -> u128 { x * Self::factor() } } - -/// Update the given multiplier based on the following formula -/// -/// diff = (previous_block_weight - target_weight)/max_weight -/// v = 0.00004 -/// next_weight = weight * (1 + (v * diff) + (v * diff)^2 / 2) -/// -/// Where `target_weight` must be given as the `Get` implementation of the `T` generic type. -/// https://research.web3.foundation/en/latest/polkadot/Token%20Economics/#relay-chain-transaction-fees -pub struct TargetedFeeAdjustment(sp_std::marker::PhantomData<(T, R)>); - -impl, R: system::Trait> Convert for TargetedFeeAdjustment { - fn convert(multiplier: FixedI128) -> FixedI128 { - let max_weight = MaximumBlockWeight::get(); - let block_weight = >::block_weight().total().min(max_weight); - let target_weight = (T::get() * max_weight) as u128; - let block_weight = block_weight as u128; - - // determines if the first_term is positive - let positive = block_weight >= target_weight; - let diff_abs = block_weight.max(target_weight) - block_weight.min(target_weight); - // safe, diff_abs cannot exceed u64 and it can always be computed safely even with the lossy - // `FixedI128::saturating_from_rational`. - let diff = FixedI128::saturating_from_rational(diff_abs, max_weight.max(1)); - let diff_squared = diff.saturating_mul(diff); - - // 0.00004 = 4/100_000 = 40_000/10^9 - let v = FixedI128::saturating_from_rational(4, 100_000); - // 0.00004^2 = 16/10^10 Taking the future /2 into account... 8/10^10 - let v_squared_2 = FixedI128::saturating_from_rational(8, 10_000_000_000u64); - - let first_term = v.saturating_mul(diff); - let second_term = v_squared_2.saturating_mul(diff_squared); - - if positive { - // Note: this is merely bounded by how big the multiplier and the inner value can go, - // not by any economical reasoning. - let excess = first_term.saturating_add(second_term); - multiplier.saturating_add(excess) - } else { - // Defensive-only: first_term > second_term. Safe subtraction. - let negative = first_term.saturating_sub(second_term); - multiplier.saturating_sub(negative) - // despite the fact that apply_to saturates weight (final fee cannot go below 0) - // it is crucially important to stop here and don't further reduce the weight fee - // multiplier. While at -1, it means that the network is so un-congested that all - // transactions have no weight fee. We stop here and only increase if the network - // became more busy. - .max(FixedI128::saturating_from_integer(-1)) - } - } -} diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index a882256c74f4..49a6dcced0d7 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -28,11 +28,12 @@ pub mod crowdfund; pub mod impls; use primitives::BlockNumber; -use sp_runtime::{Perbill, traits::Saturating}; +use sp_runtime::{Perquintill, Perbill, FixedPointNumber, traits::Saturating}; use frame_support::{ parameter_types, traits::{Currency}, weights::{Weight, constants::WEIGHT_PER_SECOND}, }; +use transaction_payment::{TargetedFeeAdjustment, Multiplier}; use static_assertions::const_assert; pub use frame_support::weights::constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; @@ -46,18 +47,122 @@ pub use attestations::{Call as AttestationsCall, MORE_ATTESTATIONS_IDENTIFIER}; pub use parachains::Call as ParachainsCall; /// Implementations of some helper traits passed into runtime modules as associated types. -pub use impls::{CurrencyToVoteHandler, TargetedFeeAdjustment, ToAuthor}; +pub use impls::{CurrencyToVoteHandler, ToAuthor}; pub type NegativeImbalance = as Currency<::AccountId>>::NegativeImbalance; +/// We assume that an on-initialize consumes 10% of the weight on average, hence a single extrinsic +/// will not be allowed to consume more than `AvailableBlockRatio - 10%`. const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(10); + +// Common constants used in all runtimes. parameter_types! { pub const BlockHashCount: BlockNumber = 2400; + /// Block time that can be used by weights. pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND; + /// Portion of the block available to normal class of dispatches. pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + /// Maximum weight that a _single_ extrinsic can take. pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get() .saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT) * MaximumBlockWeight::get(); + /// Maximum length of block. 5MB. pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; + /// The portion of the `AvailableBlockRatio` that we adjust the fees with. Blocks filled less + /// than this will decrease the weight and more will increase. + pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); + /// The adjustment variable of the runtime. Higher values will cause `TargetBlockFullness` to + /// change the fees more rapidly. + pub AdjustmentVariable: Multiplier = Multiplier::saturating_from_rational(3, 100_000); + /// Minimum amount of the multiplier. This value cannot be too low. A test case should ensure + /// that combined with `AdjustmentVariable`, we can recover from the minimum. + /// See `multiplier_can_grow_from_zero`. + pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000_000u128); } const_assert!(AvailableBlockRatio::get().deconstruct() >= AVERAGE_ON_INITIALIZE_WEIGHT.deconstruct()); + +/// Parameterized slow adjusting fee updated based on +/// https://w3f-research.readthedocs.io/en/latest/polkadot/Token%20Economics.html#-2.-slow-adjusting-mechanism +pub type SlowAdjustingFeeUpdate = TargetedFeeAdjustment< + R, + TargetBlockFullness, + AdjustmentVariable, + MinimumMultiplier +>; + +#[cfg(test)] +mod multiplier_tests { + use super::*; + use frame_support::{impl_outer_origin, parameter_types, weights::Weight}; + use sp_core::H256; + use sp_runtime::{ + testing::Header, + traits::{BlakeTwo256, IdentityLookup, Convert}, + Perbill, + }; + + #[derive(Clone, PartialEq, Eq, Debug)] + pub struct Runtime; + + impl_outer_origin!{ + pub enum Origin for Runtime {} + } + + parameter_types! { + pub const BlockHashCount: u64 = 250; + pub const ExtrinsicBaseWeight: u64 = 100; + pub const MaximumBlockWeight: Weight = 1024; + pub const MaximumBlockLength: u32 = 2 * 1024; + pub const AvailableBlockRatio: Perbill = Perbill::one(); + } + + impl system::Trait for Runtime { + type BaseCallFilter = (); + type Origin = Origin; + type Index = u64; + type BlockNumber = u64; + type Call = (); + type Hash = H256; + type Hashing = BlakeTwo256; + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; + type Event = (); + type BlockHashCount = BlockHashCount; + type MaximumBlockWeight = MaximumBlockWeight; + type DbWeight = (); + type BlockExecutionWeight = (); + type ExtrinsicBaseWeight = ExtrinsicBaseWeight; + type MaximumExtrinsicWeight = MaximumBlockWeight; + type MaximumBlockLength = MaximumBlockLength; + type AvailableBlockRatio = AvailableBlockRatio; + type Version = (); + type ModuleToIndex = (); + type AccountData = (); + type OnNewAccount = (); + type OnKilledAccount = (); + } + + type System = system::Module; + + fn run_with_system_weight(w: Weight, assertions: F) where F: Fn() -> () { + let mut t: sp_io::TestExternalities = + system::GenesisConfig::default().build_storage::().unwrap().into(); + t.execute_with(|| { + System::set_block_limits(w, 0); + assertions() + }); + } + + #[test] + fn multiplier_can_grow_from_zero() { + let minimum_multiplier = MinimumMultiplier::get(); + let target = TargetBlockFullness::get() * (AvailableBlockRatio::get() * MaximumBlockWeight::get()); + // if the min is too small, then this will not change, and we are doomed forever. + // the weight is 1/10th bigger than target. + run_with_system_weight(target * 101 / 100, || { + let next = SlowAdjustingFeeUpdate::::convert(minimum_multiplier); + assert!(next > minimum_multiplier, "{:?} !>= {:?}", next, minimum_multiplier); + }) + } +} diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index db4d6e6e57fb..84376032372d 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -27,15 +27,16 @@ use primitives::{ AccountId, AccountIndex, Balance, BlockNumber, Hash, Nonce, Signature, Moment, parachain::{self, ActiveParas, AbridgedCandidateReceipt, SigningContext}, }; -use runtime_common::{attestations, claims, parachains, registrar, slots, - impls::{CurrencyToVoteHandler, TargetedFeeAdjustment, ToAuthor}, +use runtime_common::{ + attestations, claims, parachains, registrar, slots, SlowAdjustingFeeUpdate, + impls::{CurrencyToVoteHandler, ToAuthor}, NegativeImbalance, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight, }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, ModuleId, - ApplyExtrinsicResult, KeyTypeId, Percent, Permill, Perbill, Perquintill, PerThing, + ApplyExtrinsicResult, KeyTypeId, Percent, Permill, Perbill, transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority}, curve::PiecewiseLinear, traits::{ @@ -85,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kusama"), impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, - spec_version: 2010, + spec_version: 2011, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -198,22 +199,14 @@ impl balances::Trait for Runtime { parameter_types! { pub const TransactionByteFee: Balance = 10 * MILLICENTS; - pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); } -// for a sane configuration, this should always be less than `AvailableBlockRatio`. -const_assert!( - TargetBlockFullness::get().deconstruct() < - (AvailableBlockRatio::get().deconstruct() as ::Inner) - * (::ACCURACY / ::ACCURACY as ::Inner) -); - impl transaction_payment::Trait for Runtime { type Currency = Balances; type OnTransactionPayment = DealWithFees; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; - type FeeMultiplierUpdate = TargetedFeeAdjustment; + type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } parameter_types! { diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index f24afd529c31..6b05529f61d4 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -20,8 +20,9 @@ // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. #![recursion_limit="256"] -use runtime_common::{attestations, claims, parachains, registrar, slots, - impls::{CurrencyToVoteHandler, TargetedFeeAdjustment, ToAuthor}, +use runtime_common::{ + attestations, claims, parachains, registrar, slots, SlowAdjustingFeeUpdate, + impls::{CurrencyToVoteHandler, ToAuthor}, NegativeImbalance, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight, @@ -36,8 +37,8 @@ use primitives::{ }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, ModuleId, - ApplyExtrinsicResult, KeyTypeId, Percent, Permill, Perbill, Perquintill, PerThing, - transaction_validity::{ + ApplyExtrinsicResult, KeyTypeId, Percent, Permill, Perbill, + transaction_validity::{ TransactionValidity, TransactionSource, TransactionPriority, }, curve::PiecewiseLinear, @@ -90,7 +91,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("polkadot"), impl_name: create_runtime_str!("parity-polkadot"), authoring_version: 0, - spec_version: 10, + spec_version: 11, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 0, @@ -224,22 +225,15 @@ impl balances::Trait for Runtime { parameter_types! { pub const TransactionByteFee: Balance = 10 * MILLICENTS; - pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); } -// for a sane configuration, this should always be less than `AvailableBlockRatio`. -const_assert!( - TargetBlockFullness::get().deconstruct() < - (AvailableBlockRatio::get().deconstruct() as ::Inner) - * (::ACCURACY / ::ACCURACY as ::Inner) -); impl transaction_payment::Trait for Runtime { type Currency = Balances; type OnTransactionPayment = DealWithFees; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; - type FeeMultiplierUpdate = TargetedFeeAdjustment; + type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } parameter_types! { diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 2ff98ead961b..51b6b4bbdec9 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -26,14 +26,15 @@ use primitives::{ AccountId, AccountIndex, Balance, BlockNumber, Hash as HashT, Nonce, Signature, Moment, parachain::{self, ActiveParas, AbridgedCandidateReceipt, SigningContext}, ValidityError, }; -use runtime_common::{attestations, claims, parachains, registrar, slots, - impls::{CurrencyToVoteHandler, TargetedFeeAdjustment}, +use runtime_common::{ + attestations, claims, parachains, registrar, slots, SlowAdjustingFeeUpdate, + impls::CurrencyToVoteHandler, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, - ApplyExtrinsicResult, Perbill, Perquintill, RuntimeDebug, KeyTypeId, + ApplyExtrinsicResult, Perbill, RuntimeDebug, KeyTypeId, transaction_validity::{ TransactionValidity, InvalidTransaction, TransactionValidityError, TransactionSource, TransactionPriority, }, @@ -81,7 +82,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("polkadot-test-runtime"), impl_name: create_runtime_str!("parity-polkadot-test-runtime"), authoring_version: 2, - spec_version: 1052, + spec_version: 1053, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -201,7 +202,6 @@ impl balances::Trait for Runtime { parameter_types! { pub const TransactionByteFee: Balance = 10 * MILLICENTS; - pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); } impl transaction_payment::Trait for Runtime { @@ -209,7 +209,7 @@ impl transaction_payment::Trait for Runtime { type OnTransactionPayment = (); type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; - type FeeMultiplierUpdate = TargetedFeeAdjustment; + type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } parameter_types! { diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 0ce45bf9dd71..4214ece1c4a6 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -21,20 +21,20 @@ #![recursion_limit="256"] use sp_std::prelude::*; -use static_assertions::const_assert; use codec::{Encode, Decode}; use primitives::{ AccountId, AccountIndex, Balance, BlockNumber, Hash, Nonce, Signature, Moment, parachain::{self, ActiveParas, AbridgedCandidateReceipt, SigningContext}, }; -use runtime_common::{attestations, parachains, registrar, - impls::{CurrencyToVoteHandler, TargetedFeeAdjustment, ToAuthor}, +use runtime_common::{ + attestations, parachains, registrar, SlowAdjustingFeeUpdate, + impls::{CurrencyToVoteHandler, ToAuthor}, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight, }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, - ApplyExtrinsicResult, KeyTypeId, Perbill, Perquintill, curve::PiecewiseLinear, PerThing, + ApplyExtrinsicResult, KeyTypeId, Perbill, curve::PiecewiseLinear, transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority}, traits::{ BlakeTwo256, Block as BlockT, OpaqueKeys, ConvertInto, IdentityLookup, @@ -81,7 +81,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("westend"), impl_name: create_runtime_str!("parity-westend"), authoring_version: 2, - spec_version: 30, + spec_version: 31, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -180,22 +180,14 @@ impl balances::Trait for Runtime { parameter_types! { pub const TransactionByteFee: Balance = 10 * MILLICENTS; - pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); } -// for a sane configuration, this should always be less than `AvailableBlockRatio`. -const_assert!( - TargetBlockFullness::get().deconstruct() < - (AvailableBlockRatio::get().deconstruct() as ::Inner) - * (::ACCURACY / ::ACCURACY as ::Inner) -); - impl transaction_payment::Trait for Runtime { type Currency = Balances; type OnTransactionPayment = ToAuthor; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; - type FeeMultiplierUpdate = TargetedFeeAdjustment; + type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } parameter_types! {