diff --git a/Cargo.lock b/Cargo.lock index 23fc8a7e8d..b9d1ef81dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,11 +27,11 @@ checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" [[package]] name = "aead" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf01b9b56e767bb57b94ebf91a58b338002963785cdd7013e21c0d4679471e4" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array", + "generic-array 0.14.3", ] [[package]] @@ -40,35 +40,45 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9" dependencies = [ - "aes-soft", - "aesni", + "aes-soft 0.3.3", + "aesni 0.6.0", "block-cipher-trait", ] +[[package]] +name = "aes" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5" +dependencies = [ + "aes-soft 0.4.0", + "aesni 0.7.0", + "block-cipher", +] + [[package]] name = "aes-ctr" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" dependencies = [ - "aes-soft", - "aesni", + "aes-soft 0.3.3", + "aesni 0.6.0", "ctr", - "stream-cipher", + "stream-cipher 0.3.2", ] [[package]] name = "aes-gcm" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834a6bda386024dbb7c8fc51322856c10ffe69559f972261c868485f5759c638" +checksum = "86f5007801316299f922a6198d1d09a0bae95786815d066d5880d13f7c45ead1" dependencies = [ "aead", - "aes", - "block-cipher-trait", + "aes 0.4.0", + "block-cipher", "ghash", "subtle 2.2.3", - "zeroize", ] [[package]] @@ -79,7 +89,18 @@ checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" dependencies = [ "block-cipher-trait", "byteorder", - "opaque-debug", + "opaque-debug 0.2.3", +] + +[[package]] +name = "aes-soft" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7" +dependencies = [ + "block-cipher", + "byteorder", + "opaque-debug 0.2.3", ] [[package]] @@ -89,8 +110,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" dependencies = [ "block-cipher-trait", - "opaque-debug", - "stream-cipher", + "opaque-debug 0.2.3", + "stream-cipher 0.3.2", +] + +[[package]] +name = "aesni" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264" +dependencies = [ + "block-cipher", + "opaque-debug 0.2.3", ] [[package]] @@ -213,6 +244,17 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" +[[package]] +name = "async-channel" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958a8af017616083a7c739a9c4da4b757a6816593734b4b6145adbe1421526a5" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + [[package]] name = "async-native-tls" version = "0.3.3" @@ -227,28 +269,26 @@ dependencies = [ [[package]] name = "async-std" -version = "1.5.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "538ecb01eb64eecd772087e5b6f7540cbc917f047727339a472dafed2185b267" +checksum = "00d68a33ebc8b57800847d00787307f84a562224a14db069b0acefe4c2abbf5d" dependencies = [ "async-task", - "broadcaster", - "crossbeam-channel", - "crossbeam-deque", "crossbeam-utils", + "futures-channel", "futures-core", "futures-io", - "futures-timer 2.0.2", + "futures-timer 3.0.2", "kv-log-macro", "log", "memchr", - "mio", - "mio-uds", "num_cpus", "once_cell", "pin-project-lite", "pin-utils", "slab", + "smol", + "wasm-bindgen-futures", ] [[package]] @@ -274,19 +314,15 @@ dependencies = [ [[package]] name = "async-task" -version = "1.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ac2c016b079e771204030951c366db398864f5026f84a44dafb0ff20f02085d" -dependencies = [ - "libc", - "winapi 0.3.9", -] +checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3" [[package]] name = "async-tls" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fd83426b89b034bf4e9ceb9c533c2f2386b813fd3dcae0a425ec6f1837d78a" +checksum = "df097e3f506bec0e1a24f06bb3c962c228f36671de841ff579cb99f371772634" dependencies = [ "futures 0.3.5", "rustls", @@ -305,6 +341,12 @@ dependencies = [ "syn 1.0.33", ] +[[package]] +name = "atomic-waker" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" + [[package]] name = "atty" version = "0.2.14" @@ -434,14 +476,15 @@ dependencies = [ [[package]] name = "blake2" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" +checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471" dependencies = [ "byte-tools", - "crypto-mac", - "digest", - "opaque-debug", + "byteorder", + "crypto-mac 0.8.0", + "digest 0.9.0", + "opaque-debug 0.2.3", ] [[package]] @@ -485,7 +528,25 @@ dependencies = [ "block-padding", "byte-tools", "byteorder", - "generic-array", + "generic-array 0.12.3", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array 0.14.3", +] + +[[package]] +name = "block-cipher" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10" +dependencies = [ + "generic-array 0.14.3", ] [[package]] @@ -494,7 +555,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" dependencies = [ - "generic-array", + "generic-array 0.12.3", ] [[package]] @@ -516,6 +577,20 @@ dependencies = [ "byte-tools", ] +[[package]] +name = "blocking" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2468ff7bf85066b4a3678fede6fe66db31846d753ff0adfbfab2c6a6e81612b" +dependencies = [ + "async-channel", + "atomic-waker", + "futures-lite", + "once_cell", + "parking", + "waker-fn", +] + [[package]] name = "bridge-node" version = "0.1.0" @@ -592,20 +667,6 @@ dependencies = [ "substrate-wasm-builder-runner", ] -[[package]] -name = "broadcaster" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c972e21e0d055a36cf73e4daae870941fe7a8abcd5ac3396aab9e4c126bd87" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "futures-util", - "parking_lot 0.10.2", - "slab", -] - [[package]] name = "bs58" version = "0.3.1" @@ -671,6 +732,12 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" +[[package]] +name = "cache-padded" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" + [[package]] name = "cc" version = "1.0.41" @@ -697,24 +764,24 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "chacha20" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a7ae4c498f8447d86baef0fa0831909333f558866fabcb21600625ac5a31c7" +checksum = "086c0f07ac275808b7bf9a39f2fd013aae1498be83632814c8c4e0bd53f2dc58" dependencies = [ - "stream-cipher", + "stream-cipher 0.4.1", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48901293601228db2131606f741db33561f7576b5d19c99cd66222380a7dc863" +checksum = "18b0c90556d8e3fec7cf18d84a2f53d27b21288f2fe481b830fadcf809e48205" dependencies = [ "aead", "chacha20", "poly1305", - "stream-cipher", + "stream-cipher 0.4.1", "zeroize", ] @@ -756,15 +823,6 @@ dependencies = [ "yaml-rust", ] -[[package]] -name = "clear_on_drop" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9cc5db465b294c3fa986d5bbb0f3017cd850bff6dd6c52f9ccff8b4d21b7b08" -dependencies = [ - "cc", -] - [[package]] name = "cloudabi" version = "0.0.3" @@ -783,6 +841,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "concurrent-queue" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1582139bb74d97ef232c30bc236646017db06f13ee7cc01fa24c9e55640f86d4" +dependencies = [ + "cache-padded", +] + [[package]] name = "const-random" version = "0.1.8" @@ -825,6 +892,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90accdee0acac454f78a41d2eefc1212ec6eaa2ae6a216619389e996c0155c3c" +[[package]] +name = "cpuid-bool" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" + [[package]] name = "crc32fast" version = "1.2.0" @@ -834,16 +907,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061" -dependencies = [ - "crossbeam-utils", - "maybe-uninit", -] - [[package]] name = "crossbeam-deque" version = "0.7.3" @@ -904,15 +967,25 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "generic-array", + "generic-array 0.12.3", "subtle 1.0.0", ] +[[package]] +name = "crypto-mac" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +dependencies = [ + "generic-array 0.14.3", + "subtle 2.2.3", +] + [[package]] name = "ct-logs" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113" +checksum = "8c8e13110a84b6315df212c045be706af261fd364791cad863285439ebba672e" dependencies = [ "sct", ] @@ -924,7 +997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" dependencies = [ "block-cipher-trait", - "stream-cipher", + "stream-cipher 0.3.2", ] [[package]] @@ -934,7 +1007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" dependencies = [ "byteorder", - "digest", + "digest 0.8.1", "rand_core 0.5.1", "subtle 2.2.3", "zeroize", @@ -963,7 +1036,16 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array", + "generic-array 0.12.3", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array 0.14.3", ] [[package]] @@ -1009,16 +1091,27 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "ed25519" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf038a7b6fd7ef78ad3348b63f3a17550877b0e28f8d68bcc94894d1412158bc" +dependencies = [ + "signature", +] + [[package]] name = "ed25519-dalek" -version = "1.0.0-pre.3" +version = "1.0.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2" +checksum = "21a8a37f4e8b35af971e6db5e3897e7a6344caa3f92f6544f88125a1f5f0035a" dependencies = [ - "clear_on_drop", "curve25519-dalek", + "ed25519", "rand 0.7.3", - "sha2", + "serde", + "sha2 0.8.2", + "zeroize", ] [[package]] @@ -1214,6 +1307,12 @@ dependencies = [ "uint", ] +[[package]] +name = "event-listener" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829694371bd7bbc6aee17c4ff624aad8bf9f4dc06c6f9f6071eaa08c89530d10" + [[package]] name = "exit-future" version = "0.2.0" @@ -1251,6 +1350,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +[[package]] +name = "fastrand" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a9cb09840f81cd211e435d00a4e487edd263dc3c8ff815c32dd76ad668ebed" + [[package]] name = "fdlimit" version = "0.1.4" @@ -1341,16 +1446,16 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", ] [[package]] name = "frame-benchmarking" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "frame-system", @@ -1366,9 +1471,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ + "Inflector", "frame-benchmarking", "parity-scale-codec", "sc-cli", @@ -1384,8 +1490,8 @@ dependencies = [ [[package]] name = "frame-executive" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "frame-system", @@ -1399,8 +1505,8 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "11.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "serde", @@ -1410,8 +1516,8 @@ dependencies = [ [[package]] name = "frame-support" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "bitmask", "frame-metadata", @@ -1435,8 +1541,8 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -1446,8 +1552,8 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1458,8 +1564,8 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "proc-macro2", "quote 1.0.7", @@ -1468,8 +1574,8 @@ dependencies = [ [[package]] name = "frame-system" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1484,8 +1590,8 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "sp-api", @@ -1621,6 +1727,21 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +[[package]] +name = "futures-lite" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe71459749b2e8e66fb95df721b22fa08661ad384a0c5b519e11d3893b4692a" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.5" @@ -1659,6 +1780,10 @@ name = "futures-timer" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +dependencies = [ + "gloo-timers", + "send_wrapper 0.4.0", +] [[package]] name = "futures-util" @@ -1693,18 +1818,6 @@ dependencies = [ "slab", ] -[[package]] -name = "futures_codec" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0a73299e4718f5452e45980fc1d6957a070abe308d3700b63b8673f47e1c2b3" -dependencies = [ - "bytes 0.5.5", - "futures 0.3.5", - "memchr", - "pin-project", -] - [[package]] name = "futures_codec" version = "0.4.1" @@ -1745,6 +1858,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "generic-array" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60fb4bb6bba52f78a471264d9a3b7d026cc0af47b22cd2cffbc0b787ca003e63" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "get_if_addrs" version = "0.5.3" @@ -1780,9 +1903,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0930ed19a7184089ea46d2fedead2f6dc2b674c5db4276b7da336c7cd83252" +checksum = "d6e27f0689a6e15944bdce7e45425efb87eaa8ab0c6e87f11d0987a9133e2531" dependencies = [ "polyval", ] @@ -1812,6 +1935,19 @@ dependencies = [ "regex", ] +[[package]] +name = "gloo-timers" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "h2" version = "0.1.26" @@ -1884,6 +2020,16 @@ dependencies = [ "autocfg 1.0.0", ] +[[package]] +name = "hashbrown" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb" +dependencies = [ + "ahash 0.3.8", + "autocfg 1.0.0", +] + [[package]] name = "heck" version = "0.3.1" @@ -1939,8 +2085,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" dependencies = [ - "crypto-mac", - "digest", + "crypto-mac 0.7.0", + "digest 0.8.1", ] [[package]] @@ -1949,8 +2095,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" dependencies = [ - "digest", - "generic-array", + "digest 0.8.1", + "generic-array 0.12.3", "hmac", ] @@ -2069,9 +2215,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08" +checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" dependencies = [ "bytes 0.5.5", "ct-logs", @@ -2439,9 +2585,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e763b2a9b500ba47948061d1e8bc3b5f03a8a1f067dbcf822a4d2c84d2b54a3a" +checksum = "0315ef2f688e33844400b31f11c263f2b3dc21d8b9355c6891c5f185fae43f9a" dependencies = [ "parity-util-mem", "smallvec 1.4.1", @@ -2449,9 +2595,9 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73027d5e228de6f503b5b7335d530404fc26230a6ae3e09b33ec6e45408509a4" +checksum = "73de822b260a3bdfb889dbbb65bb2d473eee2253973d6fa4a5d149a2a4a7c66e" dependencies = [ "kvdb", "parity-util-mem", @@ -2460,9 +2606,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84384eca250c7ff67877eda5336f28a86586aaee24acb945643590671f6bfce1" +checksum = "7c341ef15cfb1f923fa3b5138bfbd2d4813a2c1640b473727a53351c7f0b0fa2" dependencies = [ "fs-swap", "kvdb", @@ -2530,9 +2676,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.19.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057eba5432d3e740e313c6e13c9153d0cb76b4f71bfc2e5242ae5bdb7d41af67" +checksum = "0306a49ee6a89468f96089906f36b0eef82c988dcfc8acf3e2dcd6ad1c859f85" dependencies = [ "bytes 0.5.5", "futures 0.3.5", @@ -2552,7 +2698,7 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multihash", - "parity-multiaddr 0.9.1", + "parity-multiaddr", "parking_lot 0.10.2", "pin-project", "smallvec 1.4.1", @@ -2561,9 +2707,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a0387b930c3d4c2533dc4893c1e0394185ddcc019846121b1b27491e45a2c08" +checksum = "6a694fd76d7c33a45a0e6e1525e9b9b5d11127c9c94e560ac0f8abba54ed80af" dependencies = [ "asn1_der", "bs58", @@ -2577,7 +2723,7 @@ dependencies = [ "log", "multihash", "multistream-select", - "parity-multiaddr 0.9.1", + "parity-multiaddr", "parking_lot 0.10.2", "pin-project", "prost", @@ -2585,7 +2731,7 @@ dependencies = [ "rand 0.7.3", "ring", "rw-stream-sink", - "sha2", + "sha2 0.8.2", "smallvec 1.4.1", "thiserror", "unsigned-varint 0.4.0", @@ -2595,9 +2741,9 @@ dependencies = [ [[package]] name = "libp2p-core-derive" -version = "0.19.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09548626b737ed64080fde595e06ce1117795b8b9fc4d2629fa36561c583171" +checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213" dependencies = [ "quote 1.0.7", "syn 1.0.33", @@ -2605,9 +2751,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc186d9a941fd0207cf8f08ef225a735e2d7296258f570155e525f6ee732f87" +checksum = "f751924b6b98e350005e0b87a822beb246792a3fb878c684e088f866158120ac" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2616,9 +2762,9 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f76075b170d908bae616f550ade410d9d27c013fa69042551dbfc757c7c094" +checksum = "912c00a7bf67e0e765daf0cc37e08f675ea26aba3d6d1fbfaee81f19a4c23049" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2632,16 +2778,16 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d6c1d5100973527ae70d82687465b17049c1b717a7964de38b8e65000878ff" +checksum = "44ed3a4c8111c570ab2bffb30c6353178d7603ce3787e3c5f2493c8d3d16d1f0" dependencies = [ "arrayvec 0.5.1", "bytes 0.5.5", "either", "fnv", "futures 0.3.5", - "futures_codec 0.3.4", + "futures_codec", "libp2p-core", "libp2p-swarm", "log", @@ -2649,19 +2795,19 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sha2", + "sha2 0.8.2", "smallvec 1.4.1", "uint", - "unsigned-varint 0.3.3", + "unsigned-varint 0.4.0", "void", "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55b2d4b80986e5bf158270ab23268ec0e7f644ece5436fbaabc5155472f357" +checksum = "cd004c668160fd922f7268b2cd1e4550ff69165d9c744e9eb5770086eb753d02" dependencies = [ "async-std", "data-encoding", @@ -2681,14 +2827,14 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be7d913a4cd57de2013257ec73f07d77bfce390b370023e2d59083e5ca079864" +checksum = "14ae0ffacd30f073f96cd518b2c9cd2cb18ac27c3d136a4b23cf1af99f33e541" dependencies = [ "bytes 0.5.5", "fnv", "futures 0.3.5", - "futures_codec 0.4.1", + "futures_codec", "libp2p-core", "log", "parking_lot 0.10.2", @@ -2697,10 +2843,11 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.19.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a03db664653369f46ee03fcec483a378c20195089bb43a26cb9fb0058009ac88" +checksum = "8f353f8966bbaaf7456535fffd3f366f153148773a0cf04b2ec3860955cb720e" dependencies = [ + "bytes 0.5.5", "curve25519-dalek", "futures 0.3.5", "lazy_static", @@ -2709,7 +2856,7 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sha2", + "sha2 0.8.2", "snow", "static_assertions", "x25519-dalek", @@ -2718,9 +2865,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dedd34e35a9728d52d59ef36a218e411359a353f9011b2574b86ee790978f6" +checksum = "70130cf130e4ba6dc177366e72dd9f86f9e3588fa1a0c4145247e676f16affad" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2733,9 +2880,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.19.1" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce53ff4d127cf8b39adf84dbd381ca32d49bd85788cee08e6669da2495993930" +checksum = "f88d5e2a090a2aadf042cd33484e2f015c6dab212567406a59deece5dedbd133" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2748,9 +2895,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481500c5774c62e8c413e9535b3f33a0e3dbacf2da63b8d3056c686a9df4146" +checksum = "9b1fa2bbad054020cb875546a577a66a65a5bf42eff55ed5265f92ffee3cc052" dependencies = [ "async-std", "futures 0.3.5", @@ -2764,9 +2911,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f59fdbb5706f2723ca108c088b1c7a37f735a8c328021f0508007162627e9885" +checksum = "0feb99e32fea20ffb1bbf56a6fb2614bff7325ff44a515728385170b3420d2c3" dependencies = [ "futures 0.3.5", "js-sys", @@ -2778,12 +2925,11 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.19.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "085fbe4c05c4116c2164ab4d5a521eb6e00516c444f61b3ee9f68c7b1e53580b" +checksum = "046a5201f6e471f22b22b394e4d084269ed1e28cf7300f7b49874385db84c7bd" dependencies = [ "async-tls", - "bytes 0.5.5", "either", "futures 0.3.5", "libp2p-core", @@ -2791,7 +2937,7 @@ dependencies = [ "quicksink", "rustls", "rw-stream-sink", - "soketto 0.3.2", + "soketto", "url 2.1.1", "webpki", "webpki-roots 0.18.0", @@ -2799,9 +2945,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da33e7b5f49c75c6a8afb0b8d1e229f5fa48be9f39bd14cdbc21459a02ac6fc" +checksum = "46ae9bf2f7d8a4be9c7e9b61df9de9dc1bd66419d669098f22f81f8d9571029a" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2830,10 +2976,10 @@ checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962" dependencies = [ "arrayref", "crunchy", - "digest", + "digest 0.8.1", "hmac-drbg", "rand 0.7.3", - "sha2", + "sha2 0.8.2", "subtle 2.2.3", "typenum", ] @@ -2911,7 +3057,7 @@ checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7" dependencies = [ "cfg-if", "generator", - "scoped-tls", + "scoped-tls 0.1.2", ] [[package]] @@ -2971,13 +3117,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.21.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2999ff7a65d5a1d72172f6d51fa2ea03024b51aee709ba5ff81c3c629a2410" +checksum = "36f36ddb0b2cdc25d38babba472108798e3477f02be5165f038c5e393e50c57a" dependencies = [ - "ahash 0.2.18", "hash-db", - "hashbrown 0.6.3", + "hashbrown 0.8.1", "parity-util-mem", ] @@ -3092,9 +3237,9 @@ checksum = "f75db05d738947aa5389863aadafbcf2e509d7ba099dc2ddcdf4fc66bf7a9e03" dependencies = [ "blake2b_simd", "blake2s_simd", - "digest", + "digest 0.8.1", "sha-1", - "sha2", + "sha2 0.8.2", "sha3", "unsigned-varint 0.3.3", ] @@ -3127,7 +3272,7 @@ checksum = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2" dependencies = [ "alga", "approx", - "generic-array", + "generic-array 0.12.3", "matrixmultiply", "num-complex", "num-rational", @@ -3158,8 +3303,8 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", - "security-framework-sys", + "security-framework 0.4.4", + "security-framework-sys 0.4.3", "tempfile", ] @@ -3203,8 +3348,8 @@ dependencies = [ [[package]] name = "node-primitives" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-system", "parity-scale-codec", @@ -3337,6 +3482,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + [[package]] name = "openssl" version = "0.10.30" @@ -3381,8 +3532,8 @@ dependencies = [ [[package]] name = "pallet-aura" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "frame-system", @@ -3398,10 +3549,25 @@ dependencies = [ "sp-timestamp", ] +[[package]] +name = "pallet-authorship" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" +dependencies = [ + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "parity-scale-codec", + "sp-authorship", + "sp-inherents", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-balances" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-benchmarking", "frame-support", @@ -3465,8 +3631,8 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "frame-system", @@ -3481,11 +3647,13 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "pallet-authorship", "pallet-finality-tracker", "pallet-session", "parity-scale-codec", @@ -3501,8 +3669,8 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "frame-system", @@ -3514,8 +3682,8 @@ dependencies = [ [[package]] name = "pallet-session" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "frame-system", @@ -3534,8 +3702,8 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "frame-system", @@ -3548,8 +3716,8 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-benchmarking", "frame-support", @@ -3565,8 +3733,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "frame-system", @@ -3574,14 +3742,16 @@ dependencies = [ "parity-scale-codec", "serde", "smallvec 1.4.1", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-support", "parity-scale-codec", @@ -3603,10 +3773,10 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88e15b5e11d7a4829490630a797c537a68c9e864a139f56fe7a1e6a51f0da25d" dependencies = [ - "aes", + "aes 0.3.2", "aes-ctr", "block-modes", - "digest", + "digest 0.8.1", "ethereum-types", "hmac", "lazy_static", @@ -3616,7 +3786,7 @@ dependencies = [ "rustc-hex", "scrypt", "secp256k1", - "sha2", + "sha2 0.8.2", "subtle 2.2.3", "tiny-keccak 2.0.2", "zeroize", @@ -3636,24 +3806,6 @@ dependencies = [ "parking_lot 0.10.2", ] -[[package]] -name = "parity-multiaddr" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77055f9e81921a8cc7bebeb6cded3d128931d51f1e3dd6251f0770a6d431477" -dependencies = [ - "arrayref", - "bs58", - "byteorder", - "data-encoding", - "parity-multihash", - "percent-encoding 2.1.0", - "serde", - "static_assertions", - "unsigned-varint 0.3.3", - "url 2.1.1", -] - [[package]] name = "parity-multiaddr" version = "0.9.1" @@ -3672,21 +3824,6 @@ dependencies = [ "url 2.1.1", ] -[[package]] -name = "parity-multihash" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a1cd2ba02391b81367bec529fb209019d718684fdc8ad6a712c2b536e46f775" -dependencies = [ - "blake2", - "bytes 0.5.5", - "rand 0.7.3", - "sha-1", - "sha2", - "sha3", - "unsigned-varint 0.3.3", -] - [[package]] name = "parity-scale-codec" version = "1.3.1" @@ -3739,11 +3876,12 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6e2583649a3ca84894d1d71da249abcfda54d5aca24733d72ca10d0f02361c" +checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c" dependencies = [ "cfg-if", + "hashbrown 0.8.1", "impl-trait-for-tuples", "parity-util-mem-derive", "parking_lot 0.10.2", @@ -3769,6 +3907,12 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865" +[[package]] +name = "parking" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cb300f271742d4a2a66c01b6b2fa0c83dfebd2e0bf11addb879a3547b4ed87c" + [[package]] name = "parking_lot" version = "0.9.0" @@ -3872,10 +4016,10 @@ checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" dependencies = [ "base64 0.9.3", "byteorder", - "crypto-mac", + "crypto-mac 0.7.0", "hmac", "rand 0.5.6", - "sha2", + "sha2 0.8.2", "subtle 1.0.0", ] @@ -3962,18 +4106,18 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" [[package]] name = "poly1305" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5829f50f48e9ddb79f3f7c3097029d0caee30f8286accb241416df603b080b8" +checksum = "d9b42192ab143ed7619bf888a7f9c6733a9a2153b218e2cd557cfdb52fbf9bb1" dependencies = [ "universal-hash", ] [[package]] name = "polyval" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec3341498978de3bfd12d1b22f1af1de22818f5473a11e8a6ef997989e3a212" +checksum = "d9a50142b55ab3ed0e9f68dfb3709f1d90d29da24e91033f28b96330643107dc" dependencies = [ "cfg-if", "universal-hash", @@ -4496,6 +4640,12 @@ dependencies = [ "syn 1.0.33", ] +[[package]] +name = "retain_mut" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e005d658ad26eacc2b6c506dfde519f4e277e328d0eb3379ca61647d70a8f531" + [[package]] name = "ring" version = "0.16.12" @@ -4517,9 +4667,9 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" dependencies = [ - "block-buffer", - "digest", - "opaque-debug", + "block-buffer 0.7.3", + "digest 0.8.1", + "opaque-debug 0.2.3", ] [[package]] @@ -4598,11 +4748,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1" +checksum = "cac94b333ee2aac3284c5b8a1b7fb4dd11cba88c244e3fe33cdbd047af0eb693" dependencies = [ - "base64 0.11.0", + "base64 0.12.3", "log", "ring", "sct", @@ -4611,14 +4761,14 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5" +checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8" dependencies = [ "openssl-probe", "rustls", "schannel", - "security-framework", + "security-framework 1.0.0", ] [[package]] @@ -4655,8 +4805,8 @@ checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "sc-basic-authorship" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -4679,8 +4829,8 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -4689,14 +4839,15 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-inherents", "sp-runtime", "sp-state-machine", ] [[package]] name = "sc-chain-spec" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -4711,8 +4862,8 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4722,8 +4873,8 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "ansi_term 0.12.1", "atty", @@ -4745,6 +4896,7 @@ dependencies = [ "sc-service", "sc-telemetry", "sc-tracing", + "serde", "serde_json", "sp-blockchain", "sp-core", @@ -4762,8 +4914,8 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "fnv", @@ -4798,8 +4950,8 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "blake2-rfc", "hash-db", @@ -4827,8 +4979,8 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "sc-client-api", "sp-blockchain", @@ -4838,8 +4990,8 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "futures 0.3.5", @@ -4869,8 +5021,8 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -4883,6 +5035,7 @@ dependencies = [ "sp-application-crypto", "sp-blockchain", "sp-consensus", + "sp-consensus-slots", "sp-core", "sp-inherents", "sp-runtime", @@ -4891,8 +5044,8 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "lazy_static", @@ -4918,8 +5071,8 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "log", @@ -4935,8 +5088,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "log", "parity-scale-codec", @@ -4950,8 +5103,8 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "assert_matches", "derive_more", @@ -4988,14 +5141,13 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", "log", "parity-util-mem", - "parking_lot 0.10.2", "sc-client-api", "sc-network", "sp-blockchain", @@ -5007,8 +5159,8 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "hex", @@ -5023,8 +5175,8 @@ dependencies = [ [[package]] name = "sc-light" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "hash-db", "lazy_static", @@ -5042,8 +5194,8 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "bitflags", "bs58", @@ -5055,7 +5207,7 @@ dependencies = [ "fork-tree", "futures 0.3.5", "futures-timer 3.0.2", - "futures_codec 0.3.4", + "futures_codec", "hex", "ip_network", "libp2p", @@ -5086,7 +5238,7 @@ dependencies = [ "sp-utils", "substrate-prometheus-endpoint", "thiserror", - "unsigned-varint 0.3.3", + "unsigned-varint 0.4.0", "void", "wasm-timer", "zeroize", @@ -5094,8 +5246,8 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5109,8 +5261,8 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "bytes 0.5.5", "fnv", @@ -5136,8 +5288,8 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "futures 0.3.5", "libp2p", @@ -5149,8 +5301,8 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -5158,8 +5310,8 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "futures 0.3.5", "hash-db", @@ -5190,8 +5342,8 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "futures 0.3.5", @@ -5214,8 +5366,8 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5230,8 +5382,8 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "directories", @@ -5244,7 +5396,6 @@ dependencies = [ "lazy_static", "log", "netstat2", - "parity-multiaddr 0.7.3", "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", @@ -5285,7 +5436,7 @@ dependencies = [ "sp-utils", "sp-version", "substrate-prometheus-endpoint", - "sysinfo 0.13.4", + "sysinfo 0.14.15", "tempfile", "tracing", "wasm-timer", @@ -5293,8 +5444,8 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "log", "parity-scale-codec", @@ -5307,10 +5458,9 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ - "bytes 0.5.5", "futures 0.3.5", "futures-timer 3.0.2", "libp2p", @@ -5329,8 +5479,8 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "erased-serde", "log", @@ -5346,8 +5496,8 @@ dependencies = [ [[package]] name = "sc-transaction-graph" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "futures 0.3.5", @@ -5355,6 +5505,7 @@ dependencies = [ "log", "parity-util-mem", "parking_lot 0.10.2", + "retain_mut", "serde", "sp-blockchain", "sp-core", @@ -5366,8 +5517,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "futures 0.3.5", @@ -5413,7 +5564,7 @@ dependencies = [ "merlin", "rand 0.7.3", "rand_core 0.5.1", - "sha2", + "sha2 0.8.2", "subtle 2.2.3", "zeroize", ] @@ -5424,6 +5575,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + [[package]] name = "scopeguard" version = "1.1.0" @@ -5440,7 +5597,7 @@ dependencies = [ "byteorder", "hmac", "pbkdf2", - "sha2", + "sha2 0.8.2", ] [[package]] @@ -5472,6 +5629,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secrecy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f" +dependencies = [ + "zeroize", +] + [[package]] name = "security-framework" version = "0.4.4" @@ -5482,7 +5648,20 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", - "security-framework-sys", + "security-framework-sys 0.4.3", +] + +[[package]] +name = "security-framework" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys 1.0.0", ] [[package]] @@ -5495,6 +5674,16 @@ dependencies = [ "libc", ] +[[package]] +name = "security-framework-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "0.9.0" @@ -5516,6 +5705,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0eddf2e8f50ced781f288c19f18621fa72a3779e3cb58dbf23b07469b0abeb4" +[[package]] +name = "send_wrapper" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" + [[package]] name = "serde" version = "1.0.114" @@ -5563,10 +5758,10 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" dependencies = [ - "block-buffer", - "digest", + "block-buffer 0.7.3", + "digest 0.8.1", "fake-simd", - "opaque-debug", + "opaque-debug 0.2.3", ] [[package]] @@ -5581,10 +5776,23 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" dependencies = [ - "block-buffer", - "digest", + "block-buffer 0.7.3", + "digest 0.8.1", "fake-simd", - "opaque-debug", + "opaque-debug 0.2.3", +] + +[[package]] +name = "sha2" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpuid-bool", + "digest 0.9.0", + "opaque-debug 0.3.0", ] [[package]] @@ -5593,11 +5801,11 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf" dependencies = [ - "block-buffer", + "block-buffer 0.7.3", "byte-tools", - "digest", + "digest 0.8.1", "keccak", - "opaque-debug", + "opaque-debug 0.2.3", ] [[package]] @@ -5616,6 +5824,12 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210" + [[package]] name = "slab" version = "0.4.2" @@ -5681,11 +5895,32 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f" +[[package]] +name = "smol" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5" +dependencies = [ + "async-task", + "blocking", + "concurrent-queue", + "fastrand", + "futures-io", + "futures-util", + "libc", + "once_cell", + "scoped-tls 1.0.0", + "slab", + "socket2", + "wepoll-sys-stjepang", + "winapi 0.3.9", +] + [[package]] name = "snow" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0f91be479494dd92e69d9971bd23ed27037dd1c94fcf558f6c6e74e6afa654" +checksum = "32bf8474159a95551661246cda4976e89356999e3cbfef36f493dacc3fae1e8e" dependencies = [ "aes-gcm", "blake2", @@ -5694,7 +5929,7 @@ dependencies = [ "rand_core 0.5.1", "ring", "rustc_version", - "sha2", + "sha2 0.9.1", "subtle 2.2.3", "x25519-dalek", ] @@ -5711,26 +5946,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "soketto" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c9dab3f95c9ebdf3a88268c19af668f637a3c5039c2c56ff2d40b1b2d64a25b" -dependencies = [ - "base64 0.11.0", - "bytes 0.5.5", - "flate2", - "futures 0.3.5", - "http 0.2.1", - "httparse", - "log", - "rand 0.7.3", - "sha1", - "smallvec 1.4.1", - "static_assertions", - "thiserror", -] - [[package]] name = "soketto" version = "0.4.1" @@ -5739,6 +5954,7 @@ checksum = "85457366ae0c6ce56bf05a958aef14cd38513c236568618edbcd9a8c52cb80b0" dependencies = [ "base64 0.12.3", "bytes 0.5.5", + "flate2", "futures 0.3.5", "httparse", "log", @@ -5748,8 +5964,8 @@ dependencies = [ [[package]] name = "sp-allocator" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "log", @@ -5760,8 +5976,8 @@ dependencies = [ [[package]] name = "sp-api" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "hash-db", "parity-scale-codec", @@ -5775,8 +5991,8 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -5787,8 +6003,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "serde", @@ -5799,8 +6015,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -5810,10 +6026,21 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-authorship" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" +dependencies = [ + "parity-scale-codec", + "sp-inherents", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-block-builder" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "sp-api", @@ -5824,8 +6051,8 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "log", @@ -5834,6 +6061,7 @@ dependencies = [ "parking_lot 0.10.2", "sp-block-builder", "sp-consensus", + "sp-database", "sp-runtime", "sp-state-machine", ] @@ -5865,8 +6093,8 @@ dependencies = [ [[package]] name = "sp-chain-spec" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "serde", "serde_json", @@ -5874,8 +6102,8 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "futures 0.3.5", @@ -5890,6 +6118,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", + "sp-trie", "sp-utils", "sp-version", "substrate-prometheus-endpoint", @@ -5898,8 +6127,8 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "sp-api", @@ -5910,10 +6139,19 @@ dependencies = [ "sp-timestamp", ] +[[package]] +name = "sp-consensus-slots" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" +dependencies = [ + "parity-scale-codec", + "sp-runtime", +] + [[package]] name = "sp-core" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "base58", "blake2-rfc", @@ -5937,8 +6175,9 @@ dependencies = [ "rand 0.7.3", "regex", "schnorrkel", + "secrecy", "serde", - "sha2", + "sha2 0.8.2", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -5964,8 +6203,8 @@ dependencies = [ [[package]] name = "sp-database" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -5973,8 +6212,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "proc-macro2", "quote 1.0.7", @@ -5983,8 +6222,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "environmental", "parity-scale-codec", @@ -5994,8 +6233,8 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "finality-grandpa", "log", @@ -6010,8 +6249,8 @@ dependencies = [ [[package]] name = "sp-finality-tracker" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6020,8 +6259,8 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "parity-scale-codec", @@ -6032,8 +6271,8 @@ dependencies = [ [[package]] name = "sp-io" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "futures 0.3.5", "hash-db", @@ -6053,8 +6292,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "lazy_static", "sp-core", @@ -6064,8 +6303,8 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "sp-api", "sp-core", @@ -6074,8 +6313,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "backtrace", "log", @@ -6083,8 +6322,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "serde", "sp-core", @@ -6092,8 +6331,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "either", "hash256-std-hasher", @@ -6114,8 +6353,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "primitive-types", @@ -6129,8 +6368,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "Inflector", "proc-macro-crate", @@ -6141,8 +6380,8 @@ dependencies = [ [[package]] name = "sp-serializer" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "serde", "serde_json", @@ -6150,8 +6389,8 @@ dependencies = [ [[package]] name = "sp-session" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "sp-api", @@ -6163,8 +6402,8 @@ dependencies = [ [[package]] name = "sp-staking" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -6173,8 +6412,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "hash-db", "itertools 0.9.0", @@ -6194,13 +6433,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" [[package]] name = "sp-storage" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -6211,8 +6450,8 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6225,8 +6464,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "log", "rental", @@ -6235,8 +6474,8 @@ dependencies = [ [[package]] name = "sp-transaction-pool" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "derive_more", "futures 0.3.5", @@ -6246,13 +6485,12 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-runtime", - "sp-utils", ] [[package]] name = "sp-trie" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "hash-db", "memory-db", @@ -6265,8 +6503,8 @@ dependencies = [ [[package]] name = "sp-utils" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "futures 0.3.5", "futures-core", @@ -6277,8 +6515,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -6289,8 +6527,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6389,7 +6627,16 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" dependencies = [ - "generic-array", + "generic-array 0.12.3", +] + +[[package]] +name = "stream-cipher" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88" +dependencies = [ + "generic-array 0.14.3", ] [[package]] @@ -6461,21 +6708,21 @@ dependencies = [ "hmac", "pbkdf2", "schnorrkel", - "sha2", + "sha2 0.8.2", ] [[package]] name = "substrate-build-script-utils" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "platforms", ] [[package]] name = "substrate-frame-rpc-system" -version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "2.0.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -6497,8 +6744,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" -version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +version = "0.8.0-rc5" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" dependencies = [ "async-std", "derive_more", @@ -6512,7 +6759,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate/?tag=v2.0.0-rc4#00768a1f21a579c478fe5d4f51e1fa71f7db9fd4" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc5#e00d78cb1c354001d868fa66938a827a432dc530" [[package]] name = "subtle" @@ -6582,9 +6829,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.13.4" +version = "0.14.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac193374347e7c263c5f547524f36ff8ec6702d56c8799c8331d26dffe8c1e" +checksum = "2983daff11a197c7c406b130579bc362177aa54cf2cc1f34d6ac88fccaa6a5e1" dependencies = [ "cfg-if", "doc-comment", @@ -6746,7 +6993,7 @@ dependencies = [ "pbkdf2", "rand 0.7.3", "rustc-hash", - "sha2", + "sha2 0.8.2", "unicode-normalization", ] @@ -6929,9 +7176,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" +checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9" dependencies = [ "futures-core", "rustls", @@ -7117,12 +7364,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb230c24c741993b04cfccbabb45acff6f6480c5f00d3ed8794ea43db3a9d727" +checksum = "9e55f7ace33d6237e14137e386f4e1672e2a5c6bbc97fef9f438581a143971f0" dependencies = [ "hash-db", - "hashbrown 0.6.3", + "hashbrown 0.8.1", "log", "rustc-hex", "smallvec 1.4.1", @@ -7233,11 +7480,11 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "universal-hash" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0c900f2f9b4116803415878ff48b63da9edb268668e08cf9292d7503114a01" +checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" dependencies = [ - "generic-array", + "generic-array 0.14.3", "subtle 2.2.3", ] @@ -7246,12 +7493,6 @@ name = "unsigned-varint" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f67332660eb59a6f1eb24ff1220c9e8d01738a8503c6002e30bcfe4bd9f2b4a9" -dependencies = [ - "bytes 0.5.5", - "futures-io", - "futures-util", - "futures_codec 0.3.4", -] [[package]] name = "unsigned-varint" @@ -7260,7 +7501,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "669d776983b692a906c881fcd0cfb34271a48e197e4d6cb8df32b05bfc3d3fa5" dependencies = [ "bytes 0.5.5", - "futures_codec 0.4.1", + "futures-io", + "futures-util", + "futures_codec", ] [[package]] @@ -7325,6 +7568,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waker-fn" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7" + [[package]] name = "want" version = "0.2.0" @@ -7428,7 +7677,7 @@ dependencies = [ "js-sys", "parking_lot 0.9.0", "pin-utils", - "send_wrapper", + "send_wrapper 0.2.0", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -7493,7 +7742,7 @@ dependencies = [ "secp256k1", "serde", "serde_json", - "soketto 0.4.1", + "soketto", "tiny-keccak 2.0.2", "url 2.1.1", ] @@ -7526,6 +7775,15 @@ dependencies = [ "webpki", ] +[[package]] +name = "wepoll-sys-stjepang" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694" +dependencies = [ + "cc", +] + [[package]] name = "which" version = "3.1.1" diff --git a/bin/node/node/Cargo.toml b/bin/node/node/Cargo.toml index f60ad3ac0c..cea3b69152 100644 --- a/bin/node/node/Cargo.toml +++ b/bin/node/node/Cargo.toml @@ -25,110 +25,110 @@ default-features = false features = ["std"] [dependencies.sc-cli] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-rpc] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-core] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-executor] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-service] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-inherents] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-transaction-pool] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-transaction-pool] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-network] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-consensus-aura] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-consensus-aura] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-consensus] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" -[dependencies.grandpa] +[dependencies.sc-finality-grandpa] package = "sc-finality-grandpa" -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.grandpa-primitives] package = "sp-finality-grandpa" -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-consensus] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-client-api] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-runtime] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sc-basic-authorship] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.substrate-frame-rpc-system] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.frame-benchmarking] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.frame-benchmarking-cli] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [build-dependencies] @@ -136,13 +136,13 @@ vergen = "3.1.0" [build-dependencies.build-script-utils] package = "substrate-build-script-utils" -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [build-dependencies.frame-benchmarking-cli] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [features] diff --git a/bin/node/node/src/command.rs b/bin/node/node/src/command.rs index 9a23704dec..8a50ab1ad4 100644 --- a/bin/node/node/src/command.rs +++ b/bin/node/node/src/command.rs @@ -32,37 +32,42 @@ use crate::cli::{Cli, Subcommand}; use crate::service; +use crate::service::new_full_params; use bridge_node_runtime::Block; -use sc_cli::SubstrateCli; -use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; +use sc_cli::{ChainSpec, Role, RuntimeVersion, SubstrateCli}; +use sc_service::ServiceParams; impl SubstrateCli for Cli { - fn impl_name() -> &'static str { - "Bridge Node" + fn impl_name() -> String { + "Bridge Node".into() } - fn impl_version() -> &'static str { - env!("CARGO_PKG_VERSION") + fn impl_version() -> String { + env!("CARGO_PKG_VERSION").into() } - fn description() -> &'static str { - "Bridge Node" + fn description() -> String { + "Bridge Node".into() } - fn author() -> &'static str { - "Parity Technologies" + fn author() -> String { + "Parity Technologies".into() } - fn support_url() -> &'static str { - "https://github.com/paritytech/parity-bridges-common/" + fn support_url() -> String { + "https://github.com/paritytech/parity-bridges-common/".into() } fn copyright_start_year() -> i32 { 2019 } - fn executable_name() -> &'static str { - "bridge-node" + fn executable_name() -> String { + "bridge-node".into() + } + + fn native_runtime_version(_: &Box) -> &'static RuntimeVersion { + &bridge_node_runtime::VERSION } fn load_spec(&self, id: &str) -> Result, String> { @@ -97,11 +102,26 @@ pub fn run() -> sc_cli::Result<()> { } Some(Subcommand::Base(subcommand)) => { let runner = cli.create_runner(subcommand)?; - runner.run_subcommand(subcommand, |config| Ok(new_full_start!(config).0)) + runner.run_subcommand(subcommand, |config| { + let ( + ServiceParams { + client, + backend, + task_manager, + import_queue, + .. + }, + .., + ) = new_full_params(config)?; + Ok((client, backend, import_queue, task_manager)) + }) } None => { let runner = cli.create_runner(&cli.run)?; - runner.run_node(service::new_light, service::new_full, bridge_node_runtime::VERSION) + runner.run_node_until_exit(|config| match config.role { + Role::Light => service::new_light(config), + _ => service::new_full(config), + }) } } } diff --git a/bin/node/node/src/service.rs b/bin/node/node/src/service.rs index c32ecc3220..4607c51b50 100644 --- a/bin/node/node/src/service.rs +++ b/bin/node/node/src/service.rs @@ -17,12 +17,13 @@ //! Service and ServiceFactory implementation. Specialized wrapper over substrate service. use bridge_node_runtime::{self, opaque::Block, RuntimeApi}; -use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider, SharedVoterState, StorageAndProofProvider}; -use sc_client_api::ExecutorProvider; -use sc_consensus::LongestChain; +use sc_client_api::{ExecutorProvider, RemoteBackend}; use sc_executor::native_executor_instance; pub use sc_executor::NativeExecutor; -use sc_service::{error::Error as ServiceError, AbstractService, Configuration, ServiceBuilder}; +use sc_finality_grandpa::{ + FinalityProofProvider as GrandpaFinalityProofProvider, SharedVoterState, StorageAndProofProvider, +}; +use sc_service::{error::Error as ServiceError, Configuration, ServiceComponents, TaskManager}; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use sp_inherents::InherentDataProviders; use std::sync::Arc; @@ -36,137 +37,175 @@ native_executor_instance!( frame_benchmarking::benchmarking::HostFunctions, ); -/// Starts a `ServiceBuilder` for a full service. -/// -/// Use this macro if you don't actually need the full service, but just the builder in order to -/// be able to perform chain operations. -macro_rules! new_full_start { - ($config:expr) => {{ - use std::sync::Arc; - - let mut import_setup = None; - let inherent_data_providers = sp_inherents::InherentDataProviders::new(); - - let builder = sc_service::ServiceBuilder::new_full::< - bridge_node_runtime::opaque::Block, - bridge_node_runtime::RuntimeApi, - crate::service::Executor, - >($config)? - .with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))? - .with_transaction_pool(|builder| { - let pool_api = sc_transaction_pool::FullChainApi::new(builder.client().clone()); - Ok(sc_transaction_pool::BasicPool::new( - builder.config().transaction_pool.clone(), - std::sync::Arc::new(pool_api), - builder.prometheus_registry(), - )) - })? - .with_import_queue( - |_config, client, mut select_chain, _transaction_pool, spawn_task_handle, registry| { - let select_chain = select_chain - .take() - .ok_or_else(|| sc_service::Error::SelectChainRequired)?; - - let (grandpa_block_import, grandpa_link) = - grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain)?; - - let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new( - grandpa_block_import.clone(), - client.clone(), - ); - - let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>( - sc_consensus_aura::slot_duration(&*client)?, - aura_block_import, - Some(Box::new(grandpa_block_import.clone())), - None, - client, - inherent_data_providers.clone(), - spawn_task_handle, - registry, - )?; - - import_setup = Some((grandpa_block_import, grandpa_link)); - - Ok(import_queue) - }, - )? - .with_rpc_extensions(|builder| -> Result, _> { - use sc_rpc::DenyUnsafe; - use substrate_frame_rpc_system::{FullSystem, SystemApi}; - +type FullClient = sc_service::TFullClient; +type FullBackend = sc_service::TFullBackend; +type FullSelectChain = sc_consensus::LongestChain; + +#[allow(clippy::type_complexity)] +pub fn new_full_params( + config: Configuration, +) -> Result< + ( + sc_service::ServiceParams< + Block, + FullClient, + sc_consensus_aura::AuraImportQueue, + sc_transaction_pool::FullPool, + jsonrpc_core::IoHandler, + FullBackend, + >, + FullSelectChain, + sp_inherents::InherentDataProviders, + sc_finality_grandpa::GrandpaBlockImport, + sc_finality_grandpa::LinkHalf, + ), + ServiceError, +> { + let inherent_data_providers = sp_inherents::InherentDataProviders::new(); + + let (client, backend, keystore, task_manager) = sc_service::new_full_parts::(&config)?; + let client = Arc::new(client); + + let select_chain = sc_consensus::LongestChain::new(backend.clone()); + + let pool_api = sc_transaction_pool::FullChainApi::new(client.clone(), config.prometheus_registry()); + let transaction_pool = sc_transaction_pool::BasicPool::new_full( + config.transaction_pool.clone(), + std::sync::Arc::new(pool_api), + config.prometheus_registry(), + task_manager.spawn_handle(), + client.clone(), + ); + + let (grandpa_block_import, grandpa_link) = + sc_finality_grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain.clone())?; + + let aura_block_import = + sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(grandpa_block_import.clone(), client.clone()); + + let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>( + sc_consensus_aura::slot_duration(&*client)?, + aura_block_import, + Some(Box::new(grandpa_block_import.clone())), + None, + client.clone(), + inherent_data_providers.clone(), + &task_manager.spawn_handle(), + config.prometheus_registry(), + )?; + + let rpc_extensions_builder = { + use sc_rpc::DenyUnsafe; + use substrate_frame_rpc_system::{FullSystem, SystemApi}; + + let client = client.clone(); + let pool = transaction_pool.clone(); + + Box::new(move |_| { let mut io = jsonrpc_core::IoHandler::default(); io.extend_with(SystemApi::to_delegate(FullSystem::new( - builder.client().clone(), - builder.pool(), + client.clone(), + pool.clone(), DenyUnsafe::No, ))); - Ok(io) - })?; - (builder, import_setup, inherent_data_providers) - }}; + io + }) + }; + + let provider = client.clone() as Arc>; + let finality_proof_provider = Arc::new(GrandpaFinalityProofProvider::new(backend.clone(), provider)); + + let params = sc_service::ServiceParams { + backend, + client, + import_queue, + keystore, + task_manager, + transaction_pool, + config, + block_announce_validator_builder: None, + finality_proof_request_builder: None, + finality_proof_provider: Some(finality_proof_provider), + on_demand: None, + remote_blockchain: None, + rpc_extensions_builder, + }; + + Ok(( + params, + select_chain, + inherent_data_providers, + grandpa_block_import, + grandpa_link, + )) } /// Builds a new service for a full client. -pub fn new_full(config: Configuration) -> Result { - let role = config.role.clone(); - let force_authoring = config.force_authoring; - let name = config.network.node_name.clone(); - let disable_grandpa = config.disable_grandpa; +pub fn new_full(config: Configuration) -> Result { + let (params, select_chain, inherent_data_providers, block_import, grandpa_link) = new_full_params(config)?; - let (builder, mut import_setup, inherent_data_providers) = new_full_start!(config); - - let (block_import, grandpa_link) = import_setup - .take() - .expect("Link Half and Block Import are present for Full Services or setup failed before. qed"); + let (role, force_authoring, name, enable_grandpa, prometheus_registry, client, transaction_pool, keystore) = { + let sc_service::ServiceParams { + config, + client, + transaction_pool, + keystore, + .. + } = ¶ms; + + ( + config.role.clone(), + config.force_authoring, + config.network.node_name.clone(), + !config.disable_grandpa, + config.prometheus_registry().cloned(), + client.clone(), + transaction_pool.clone(), + keystore.clone(), + ) + }; - let service = builder - .with_finality_proof_provider(|client, backend| { - let provider = client as Arc>; - Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) - })? - .build_full()?; + let ServiceComponents { + task_manager, + network, + telemetry_on_connect_sinks, + .. + } = sc_service::build(params)?; if role.is_authority() { - let proposer = sc_basic_authorship::ProposerFactory::new( - service.client(), - service.transaction_pool(), - service.prometheus_registry().as_ref(), - ); - - let client = service.client(); - let select_chain = service.select_chain().ok_or(ServiceError::SelectChainRequired)?; + let proposer = + sc_basic_authorship::ProposerFactory::new(client.clone(), transaction_pool, prometheus_registry.as_ref()); let can_author_with = sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()); let aura = sc_consensus_aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _>( sc_consensus_aura::slot_duration(&*client)?, - client, + client.clone(), select_chain, block_import, proposer, - service.network(), + network.clone(), inherent_data_providers.clone(), force_authoring, - service.keystore(), + keystore.clone(), can_author_with, )?; // the AURA authoring task is considered essential, i.e. if it // fails we take down the service with it. - service.spawn_essential_task_handle().spawn_blocking("aura", aura); + task_manager.spawn_essential_handle().spawn_blocking("aura", aura); } // if the node isn't actively participating in consensus then it doesn't // need a keystore, regardless of which protocol we use below. let keystore = if role.is_authority() { - Some(service.keystore() as sp_core::traits::BareCryptoStorePtr) + Some(keystore as sp_core::traits::BareCryptoStorePtr) } else { None }; - let grandpa_config = grandpa::Config { + let grandpa_config = sc_finality_grandpa::Config { // FIXME #1578 make this available through chainspec gossip_duration: Duration::from_millis(333), justification_period: 512, @@ -176,7 +215,6 @@ pub fn new_full(config: Configuration) -> Result Result Result { - let inherent_data_providers = InherentDataProviders::new(); - - ServiceBuilder::new_light::(config)? - .with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))? - .with_transaction_pool(|builder| { - let fetcher = builder - .fetcher() - .ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; - - let pool_api = sc_transaction_pool::LightChainApi::new(builder.client().clone(), fetcher); - let pool = sc_transaction_pool::BasicPool::with_revalidation_type( - builder.config().transaction_pool.clone(), - Arc::new(pool_api), - builder.prometheus_registry(), - sc_transaction_pool::RevalidationType::Light, - ); - Ok(pool) - })? - .with_import_queue_and_fprb( - |_config, client, backend, fetcher, _select_chain, _tx_pool, spawn_task_handle, prometheus_registry| { - let fetch_checker = fetcher - .map(|fetcher| fetcher.checker().clone()) - .ok_or_else(|| "Trying to start light import queue without active fetch checker")?; - let grandpa_block_import = grandpa::light_block_import( - client.clone(), - backend, - &(client.clone() as Arc<_>), - Arc::new(fetch_checker), - )?; - let finality_proof_import = grandpa_block_import.clone(); - let finality_proof_request_builder = finality_proof_import.create_finality_proof_request_builder(); - - let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>( - sc_consensus_aura::slot_duration(&*client)?, - grandpa_block_import, - None, - Some(Box::new(finality_proof_import)), - client, - inherent_data_providers.clone(), - spawn_task_handle, - prometheus_registry, - )?; - - Ok((import_queue, finality_proof_request_builder)) - }, - )? - .with_finality_proof_provider(|client, backend| { - let provider = client as Arc>; - Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) - })? - .build_light() +pub fn new_light(config: Configuration) -> Result { + let (client, backend, keystore, task_manager, on_demand) = + sc_service::new_light_parts::(&config)?; + + let transaction_pool_api = Arc::new(sc_transaction_pool::LightChainApi::new( + client.clone(), + on_demand.clone(), + )); + let transaction_pool = sc_transaction_pool::BasicPool::new_light( + config.transaction_pool.clone(), + transaction_pool_api, + config.prometheus_registry(), + task_manager.spawn_handle(), + ); + + let grandpa_block_import = sc_finality_grandpa::light_block_import( + client.clone(), + backend.clone(), + &(client.clone() as Arc<_>), + Arc::new(on_demand.checker().clone()) as Arc<_>, + )?; + let finality_proof_import = grandpa_block_import.clone(); + let finality_proof_request_builder = finality_proof_import.create_finality_proof_request_builder(); + + let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>( + sc_consensus_aura::slot_duration(&*client)?, + grandpa_block_import, + None, + Some(Box::new(finality_proof_import)), + client.clone(), + InherentDataProviders::new(), + &task_manager.spawn_handle(), + config.prometheus_registry(), + )?; + + let finality_proof_provider = Arc::new(GrandpaFinalityProofProvider::new( + backend.clone(), + client.clone() as Arc<_>, + )); + + sc_service::build(sc_service::ServiceParams { + block_announce_validator_builder: None, + finality_proof_request_builder: Some(finality_proof_request_builder), + finality_proof_provider: Some(finality_proof_provider), + on_demand: Some(on_demand), + remote_blockchain: Some(backend.remote_blockchain()), + rpc_extensions_builder: Box::new(|_| ()), + transaction_pool: Arc::new(transaction_pool), + config, + client, + import_queue, + keystore, + backend, + task_manager, + }) + .map(|ServiceComponents { task_manager, .. }| task_manager) } diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 11f3a8f457..205932ca04 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -29,14 +29,14 @@ features = ["derive"] # Substrate Dependencies [dependencies.pallet-aura] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.pallet-balances] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" @@ -51,75 +51,75 @@ default-features = false path = "../../../modules/currency-exchange" [dependencies.frame-support] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.pallet-grandpa] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.pallet-randomness-collective-flip] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.pallet-sudo] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.pallet-session] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-system] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-system-rpc-runtime-api] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.pallet-timestamp] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.pallet-transaction-payment] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-executive] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" # Substrate Primitives [dependencies.sp-api] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-block-builder] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" @@ -134,75 +134,75 @@ default-features = false path = "../../../primitives/currency-exchange" [dependencies.sp-consensus-aura] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-core] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-inherents] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-io] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-offchain] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-session] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-staking] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-std] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-transaction-pool] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-version] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-benchmarking] optional = true -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" @@ -219,7 +219,7 @@ path = "../../../primitives/ethereum-poa" [build-dependencies.wasm-builder-runner] version = "1.0.5" -tag = 'v2.0.0-rc4' +tag = 'v2.0.0-rc5' package = "substrate-wasm-builder-runner" git = "https://github.com/paritytech/substrate/" diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 113f32f091..22abc50b6d 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -35,9 +35,6 @@ pub mod benches; pub mod kovan; pub mod rialto; -#[cfg(feature = "runtime-benchmarks")] -pub use benches as bridge; - use codec::{Decode, Encode}; use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList}; use sp_api::impl_runtime_apis; @@ -223,6 +220,8 @@ impl frame_system::Trait for Runtime { type OnKilledAccount = (); /// The data to be stored in an account. type AccountData = pallet_balances::AccountData; + /// Weight information for the extrinsics of this pallet. + type SystemWeightInfo = (); } impl pallet_aura::Trait for Runtime { @@ -349,6 +348,7 @@ impl pallet_timestamp::Trait for Runtime { type Moment = u64; type OnTimestampSet = Aura; type MinimumPeriod = MinimumPeriod; + type WeightInfo = (); } parameter_types! { @@ -363,6 +363,7 @@ impl pallet_balances::Trait for Runtime { type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; + type WeightInfo = (); } parameter_types! { @@ -398,6 +399,7 @@ impl pallet_session::Trait for Runtime { type SessionHandler = ::KeyTypeIdProviders; type Keys = SessionKeys; type DisabledValidatorsThreshold = (); + type WeightInfo = (); } pub struct ShiftSessionManager; @@ -464,7 +466,7 @@ construct_runtime!( System: frame_system::{Module, Call, Config, Storage, Event}, RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage}, Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent}, - Aura: pallet_aura::{Module, Config, Inherent(Timestamp)}, + Aura: pallet_aura::{Module, Config, Inherent}, Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event}, Balances: pallet_balances::{Module, Call, Storage, Config, Event}, TransactionPayment: pallet_transaction_payment::{Module, Storage}, @@ -650,14 +652,19 @@ impl_runtime_apis! { Grandpa::grandpa_authorities() } - fn submit_report_equivocation_extrinsic( - _equivocation_proof: fg_primitives::EquivocationProof< + fn submit_report_equivocation_unsigned_extrinsic( + equivocation_proof: fg_primitives::EquivocationProof< ::Hash, NumberFor, >, - _key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof, + key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof, ) -> Option<()> { - None + let key_owner_proof = key_owner_proof.decode()?; + + Grandpa::submit_unsigned_equivocation_report( + equivocation_proof, + key_owner_proof, + ) } fn generate_key_ownership_proof( @@ -737,8 +744,13 @@ impl_runtime_apis! { } } - add_benchmark!(params, batches, b"bridge-eth-poa", BridgeKovan); - add_benchmark!(params, batches, b"bridge-currency-exchange", BridgeCurrencyExchangeBench::); + add_benchmark!(params, batches, pallet_bridge_eth_poa, BridgeKovan); + add_benchmark!( + params, + batches, + pallet_bridge_currency_exchange, + BridgeCurrencyExchangeBench:: + ); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) diff --git a/modules/currency-exchange/Cargo.toml b/modules/currency-exchange/Cargo.toml index 23865b32bf..4c8116aca8 100644 --- a/modules/currency-exchange/Cargo.toml +++ b/modules/currency-exchange/Cargo.toml @@ -13,44 +13,44 @@ sp-currency-exchange = { path = "../../primitives/currency-exchange", default-fe # Substrate Based Dependencies [dependencies.frame-support] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-system] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-std] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-benchmarking] optional = true -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dev-dependencies.sp-core] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" [dev-dependencies.sp-io] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" [features] diff --git a/modules/currency-exchange/src/lib.rs b/modules/currency-exchange/src/lib.rs index 967fbb66cb..29ba94631e 100644 --- a/modules/currency-exchange/src/lib.rs +++ b/modules/currency-exchange/src/lib.rs @@ -362,6 +362,7 @@ mod tests { type OnNewAccount = (); type OnKilledAccount = (); type BaseCallFilter = (); + type SystemWeightInfo = (); } impl Trait for TestRuntime { diff --git a/modules/ethereum-contract/builtin/Cargo.toml b/modules/ethereum-contract/builtin/Cargo.toml index 73d7cd45a6..97b497f5ee 100644 --- a/modules/ethereum-contract/builtin/Cargo.toml +++ b/modules/ethereum-contract/builtin/Cargo.toml @@ -21,29 +21,29 @@ log = "0.4.11" bridge-node-runtime = { path = "../../../bin/node/runtime" } [dependencies.sp-blockchain] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" [dependencies.sp-finality-grandpa] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" [dependencies.sc-finality-grandpa] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" [dev-dependencies] hex = "0.4" [dev-dependencies.sp-core] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" diff --git a/modules/ethereum/Cargo.toml b/modules/ethereum/Cargo.toml index dbe32d6177..d2b17e0f63 100644 --- a/modules/ethereum/Cargo.toml +++ b/modules/ethereum/Cargo.toml @@ -14,39 +14,39 @@ primitives = { package = "sp-bridge-eth-poa", path = "../../primitives/ethereum- # Substrate Based Dependencies [dependencies.frame-support] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-system] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-std] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-io] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-benchmarking] optional = true -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" diff --git a/modules/ethereum/src/mock.rs b/modules/ethereum/src/mock.rs index 31717d53cc..be173512a7 100644 --- a/modules/ethereum/src/mock.rs +++ b/modules/ethereum/src/mock.rs @@ -69,6 +69,7 @@ impl frame_system::Trait for TestRuntime { type OnNewAccount = (); type OnKilledAccount = (); type BaseCallFilter = (); + type SystemWeightInfo = (); } parameter_types! { diff --git a/modules/substrate/Cargo.toml b/modules/substrate/Cargo.toml index ec5ec2a0e8..cec9e837eb 100644 --- a/modules/substrate/Cargo.toml +++ b/modules/substrate/Cargo.toml @@ -14,57 +14,57 @@ hash-db = { version = "0.15.2", default-features = false } # Substrate Based Dependencies [dependencies.frame-support] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.frame-system] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.pallet-session] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-core] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-finality-grandpa] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dependencies.sp-trie] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" # Dev Dependencies [dev-dependencies.sp-io] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate/" [dev-dependencies.sp-state-machine] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" [features] diff --git a/modules/substrate/src/lib.rs b/modules/substrate/src/lib.rs index 9afa0872a5..3403d91a5b 100644 --- a/modules/substrate/src/lib.rs +++ b/modules/substrate/src/lib.rs @@ -274,6 +274,7 @@ mod tests { type OnNewAccount = (); type OnKilledAccount = (); type BaseCallFilter = (); + type SystemWeightInfo = (); } impl Trait for Test {} diff --git a/primitives/currency-exchange/Cargo.toml b/primitives/currency-exchange/Cargo.toml index 198d4ad531..91052ca850 100644 --- a/primitives/currency-exchange/Cargo.toml +++ b/primitives/currency-exchange/Cargo.toml @@ -12,20 +12,20 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features = # Substrate Based Dependencies [dependencies.sp-api] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate.git" [dependencies.sp-std] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate.git" [dependencies.frame-support] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate.git" diff --git a/primitives/ethereum-poa/Cargo.toml b/primitives/ethereum-poa/Cargo.toml index f52fb42f1d..d77efda8a3 100644 --- a/primitives/ethereum-poa/Cargo.toml +++ b/primitives/ethereum-poa/Cargo.toml @@ -23,26 +23,26 @@ plain_hasher = { version = "0.2.2", default-features = false } # Substrate Based Dependencies [dependencies.sp-api] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate.git" [dependencies.sp-std] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate.git" [dependencies.sp-runtime] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate.git" [dependencies.sp-io] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' default-features = false git = "https://github.com/paritytech/substrate.git" diff --git a/relays/ethereum/Cargo.toml b/relays/ethereum/Cargo.toml index 972d9be945..e57a885d9d 100644 --- a/relays/ethereum/Cargo.toml +++ b/relays/ethereum/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] ansi_term = "0.12" -async-std = "=1.5.0" +async-std = "1.6.2" async-stream = "0.2.0" async-trait = "0.1.36" backoff = "0.2" @@ -43,38 +43,38 @@ features = ["http"] # Substrate Based Dependencies [dependencies.frame-system] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate/" [dependencies.pallet-transaction-payment] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.node-primitives] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-core] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-keyring] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.sp-runtime] -version = "2.0.0-rc4" -tag = 'v2.0.0-rc4' +version = "2.0.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.substrate-prometheus-endpoint] -version = "0.8.0-rc4" -tag = 'v2.0.0-rc4' +version = "0.8.0-rc5" +tag = 'v2.0.0-rc5' git = "https://github.com/paritytech/substrate.git" [dependencies.bridge-node-runtime]